From 98ef8f67da54640ab6ce5dc53f2ad466d116cec2 Mon Sep 17 00:00:00 2001 From: Elliot Winkler Date: Sat, 3 Sep 2016 21:35:13 -0600 Subject: [PATCH] Don't require ActiveResource tests under Rails 5 --- .../unit/helpers/active_resource_builder.rb | 4 ++-- spec/support/unit/helpers/rails_versions.rb | 6 ++++++ .../validate_presence_of_matcher_spec.rb | 14 ++++++++------ spec/unit_spec_helper.rb | 5 ++++- 4 files changed, 20 insertions(+), 9 deletions(-) diff --git a/spec/support/unit/helpers/active_resource_builder.rb b/spec/support/unit/helpers/active_resource_builder.rb index b3b490d3..ea60d70b 100644 --- a/spec/support/unit/helpers/active_resource_builder.rb +++ b/spec/support/unit/helpers/active_resource_builder.rb @@ -1,8 +1,8 @@ -require 'active_resource' - module UnitTests module ActiveResourceBuilder def self.configure_example_group(example_group) + require 'active_resource' + example_group.include ActiveResourceBuilder example_group.after do diff --git a/spec/support/unit/helpers/rails_versions.rb b/spec/support/unit/helpers/rails_versions.rb index 7df93f65..5ac1562c 100644 --- a/spec/support/unit/helpers/rails_versions.rb +++ b/spec/support/unit/helpers/rails_versions.rb @@ -1,5 +1,7 @@ module UnitTests module RailsVersions + extend self + def self.configure_example_group(example_group) example_group.include(self) example_group.extend(self) @@ -16,6 +18,10 @@ module UnitTests def rails_4_x? rails_version =~ '~> 4.0' end + j + def rails_lte_4? + rails_version <= 4 + end def rails_gte_4_1? rails_version >= 4.1 diff --git a/spec/unit/shoulda/matchers/active_model/validate_presence_of_matcher_spec.rb b/spec/unit/shoulda/matchers/active_model/validate_presence_of_matcher_spec.rb index 9495bdf1..ec0086c0 100644 --- a/spec/unit/shoulda/matchers/active_model/validate_presence_of_matcher_spec.rb +++ b/spec/unit/shoulda/matchers/active_model/validate_presence_of_matcher_spec.rb @@ -291,12 +291,14 @@ raising a validation exception on failure. end end - context 'an active_resource model' do - context 'with the validation context' do - it 'does not raise an exception' do - expect { - expect(active_resource_model).to validate_presence_of(:attr) - }.to_not raise_exception + if rails_lte_4? + context 'an active_resource model' do + context 'with the validation context' do + it 'does not raise an exception' do + expect { + expect(active_resource_model).to validate_presence_of(:attr) + }.to_not raise_exception + end end end end diff --git a/spec/unit_spec_helper.rb b/spec/unit_spec_helper.rb index 63f61b46..ba99e6b0 100644 --- a/spec/unit_spec_helper.rb +++ b/spec/unit_spec_helper.rb @@ -12,7 +12,6 @@ end RSpec.configure do |config| UnitTests::ActiveModelHelpers.configure_example_group(config) UnitTests::ActiveModelVersions.configure_example_group(config) - UnitTests::ActiveResourceBuilder.configure_example_group(config) UnitTests::ClassBuilder.configure_example_group(config) UnitTests::ControllerBuilder.configure_example_group(config) UnitTests::I18nFaker.configure_example_group(config) @@ -25,6 +24,10 @@ RSpec.configure do |config| UnitTests::ColumnTypeHelpers.configure_example_group(config) UnitTests::ValidationMatcherScenarioHelpers.configure_example_group(config) + if UnitTests::RailsVersions.rails_lte_4? + UnitTests::ActiveResourceBuilder.configure_example_group(config) + end + config.include UnitTests::Matchers config.infer_spec_type_from_file_location!