Skip to content

Commit e101b03

Browse files
committed
Convert 14 more message specs to lightweight_spec_helper
Add errors_on helper and VCAP::CloudController::Config stub to lightweight_spec_helper to enable more message spec conversions. Converted specs: - deployment_update_message_spec.rb - domain_create_message_spec.rb - droplet_copy_message_spec.rb - droplet_create_message_spec.rb - droplet_update_message_spec.rb - isolation_segment_create_message_spec.rb - isolation_segment_update_message_spec.rb - metadata_base_message_spec.rb - organization_quotas_list_message_spec.rb - service_brokers_list_message_spec.rb - space_quotas_list_message_spec.rb - update_environment_variables_message_spec.rb - users_list_message_spec.rb - validators/url_validator_spec.rb Now 70 message specs use lightweight_spec_helper (vs 82 on spec_helper).
1 parent 09b217d commit e101b03

15 files changed

Lines changed: 42 additions & 14 deletions

spec/lightweight_spec_helper.rb

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,21 @@
22
$LOAD_PATH.push(File.expand_path(File.join(__dir__, '..', 'lib')))
33

44
require 'active_support/all'
5+
require 'active_model'
56
require 'pry'
67
# So that specs using this helper don't fail with undefined constant error
78
module VCAP
89
module CloudController
10+
# Minimal Config stub for message validation specs
11+
class Config
12+
def self.config
13+
@config ||= new
14+
end
15+
16+
def get(*_keys)
17+
nil
18+
end
19+
end
920
end
1021
end
1122

@@ -34,3 +45,19 @@ def get(key)
3445
RSpec.configure do |rspec_config|
3546
rspec_config.expose_dsl_globally = false
3647
end
48+
49+
# errors_on helper from rspec-collection_matchers gem
50+
# Enables: expect(message.errors_on(:attribute)).to include("error message")
51+
# This extension is added when ActiveModel::Validations is loaded
52+
if defined?(ActiveModel::Validations)
53+
module ::ActiveModel::Validations
54+
def errors_on(attribute, options={})
55+
valid_args = [options[:context]].compact
56+
valid?(*valid_args)
57+
58+
[errors[attribute]].flatten.compact
59+
end
60+
61+
alias_method :error_on, :errors_on
62+
end
63+
end

spec/unit/messages/deployment_update_message_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
require 'spec_helper'
1+
require 'lightweight_spec_helper'
22
require 'messages/deployment_update_message'
33

44
module VCAP::CloudController

spec/unit/messages/domain_create_message_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
require 'spec_helper'
1+
require 'lightweight_spec_helper'
22
require 'messages/domain_create_message'
33

44
module VCAP::CloudController

spec/unit/messages/droplet_copy_message_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
require 'spec_helper'
1+
require 'lightweight_spec_helper'
22
require 'messages/droplet_copy_message'
33

44
module VCAP::CloudController

spec/unit/messages/droplet_create_message_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
require 'spec_helper'
1+
require 'lightweight_spec_helper'
22
require 'messages/droplet_create_message'
33

44
module VCAP::CloudController

spec/unit/messages/droplet_update_message_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
require 'spec_helper'
1+
require 'lightweight_spec_helper'
22
require 'messages/droplet_update_message'
33

44
module VCAP::CloudController

spec/unit/messages/isolation_segment_create_message_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
require 'spec_helper'
1+
require 'lightweight_spec_helper'
22
require 'messages/isolation_segment_create_message'
33

44
module VCAP::CloudController

spec/unit/messages/isolation_segment_update_message_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
require 'spec_helper'
1+
require 'lightweight_spec_helper'
22
require 'messages/isolation_segment_update_message'
33

44
module VCAP::CloudController

spec/unit/messages/metadata_base_message_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
require 'spec_helper'
1+
require 'lightweight_spec_helper'
22
require 'messages/metadata_base_message'
33

44
module VCAP::CloudController

spec/unit/messages/organization_quotas_list_message_spec.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
require 'spec_helper'
1+
require 'lightweight_spec_helper'
2+
require 'messages/organization_quotas_list_message'
23

34
module VCAP::CloudController
45
RSpec.describe OrganizationQuotasListMessage do

0 commit comments

Comments
 (0)