Merge pull request #56 from rspec/rails-7-builds

Add Rails 7 support

Author: JonRowe

.github/workflows/ci.yml

@@ -23,6 +23,34 @@ jobs:
       fail-fast: false
       matrix:
        include:
+         # Rails 7.1 builds >= 2.7
+         - ruby: 3.2
+           env:
+             RAILS_VERSION: '~> 7.1.0'
+         - ruby: 3.1
+           env:
+             RAILS_VERSION: '~> 7.1.0'
+         - ruby: '3.0'
+           env:
+             RAILS_VERSION: '~> 7.1.0'
+         - ruby: 2.7
+           env:
+             RAILS_VERSION: '~> 7.1.0'
+
+         # Rails 7.0 builds >= 2.7
+         - ruby: 3.2
+           env:
+             RAILS_VERSION: '~> 7.0.0'
+         - ruby: 3.1
+           env:
+             RAILS_VERSION: '~> 7.0.0'
+         - ruby: '3.0'
+           env:
+             RAILS_VERSION: '~> 7.0.0'
+         - ruby: 2.7
+           env:
+             RAILS_VERSION: '~> 7.0.0'
+
          # Rails 6.1 builds >= 2.5
          - ruby: 3.1
            env:

Gemfile

@@ -64,3 +64,7 @@ else
 end
 
 gem "i18n", '< 0.7.0' if RUBY_VERSION < '1.9.3'
+
+if RUBY_VERSION < '2.0.0'
+  gem 'cucumber', "< 3"
+end

cucumber.yml

@@ -1,3 +1,3 @@
-default: --require features --format progress --tags ~@wip
-pretty:  --require features --format pretty   --tags ~@wip
+default: --require features --format progress --tags not(@wip)
+pretty:  --require features --format pretty   --tags not(@wip)
 wip:     --require features --tags @wip

lib/rspec/active_model/mocks/mocks.rb

@@ -99,6 +99,13 @@ def mock_model(string_or_model_class, stubs = {})
           model_class = Object.const_set(string_or_model_class, Class.new do
             extend ::ActiveModel::Naming
             def self.primary_key; :id; end
+
+            # For detection of being a valid association in 7+
+            def self.<(other); other == ActiveRecord::Base; end
+            def self._reflect_on_association(_other); nil; end
+            def self.composite_primary_key?; false; end
+            def self.has_query_constraints?; false; end
+            def self.param_delimiter; "-"; end
           end)
         end
       else

rspec-activemodel-mocks.gemspec

@@ -46,7 +46,7 @@ Gem::Specification.new do |s|
     s.add_development_dependency "rake",     "~> 13.0.0"
   end
 
-  s.add_development_dependency 'cucumber', '~> 1.3'
+  s.add_development_dependency 'cucumber', '>= 1.3'
   s.add_development_dependency 'aruba',    '~> 0.4.11'
   s.add_development_dependency 'ZenTest',  '~> 4.11.2'
   s.add_development_dependency(%q<activerecord>,  [">= 3.0"])