rspec-activemodel-mocks 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c03088fe7611777d052655997f79e7394142634a18c47f12ef2b62d21c1225d
-  data.tar.gz: 59d467700bd06b7246d40282f73bf9f374574c951455f3400e7ec47e3e0dedc5
+  metadata.gz: a94dd2b6d61f1431637636ffc999a67abdd92e70d51de9daea7844fb4e706c7d
+  data.tar.gz: 6f5ee85b061eec9923b3d29c9256b3a0ad0eb38e6cc5b5b23c04ac2f51c849ee
 SHA512:
-  metadata.gz: 19ddf1bdf625c89ae9908c504af7ba69204d9e07dcaffddf7baafc4401fcd5b90a1c0e9b747b63be4bf05e10017976dd63a9c3c435626344469a05542d401282
-  data.tar.gz: fddd4cf43f973358d3b04762aaedebcc629a7e714bbcf0e82f13f875e6fb6f5c3eb2bf4b328c7227ea55c1b03e12e047420b92463277e47e5a284f551eabfad6
+  metadata.gz: 209174dc5f015e1b1b9b80061659875032802ee616365534381df1c9bf7d7abdaa1c0a6aaba58499ab957216d270b8aae2e7efaf5e8e9a6ab6251724f41fb191
+  data.tar.gz: 59637b95cc2ba2fc1fc303b4df514a979e6945d8b0cfdfc120db91153b245aba6048e14b87415f79c75a79faba08086fe3b25f7ec74b10bda9ecb7fdb9fbd3c6

data/lib/rspec/active_model/mocks/mocks.rb

@@ -61,6 +61,9 @@ module RSpec::ActiveModel::Mocks
       # alternative to record['id']
       alias_method :_read_attribute, :[]
 
+      # Rails>7.1 added read_attribute for external usage similar to record['id']
+      alias_method :read_attribute, :[]
+
       # Returns the opposite of `persisted?`
       def new_record?
         !persisted?
@@ -94,6 +97,8 @@ module RSpec::ActiveModel::Mocks
     #   * A String representing a Class that extends ActiveModel::Naming
     #   * A Class that extends ActiveModel::Naming
     def mock_model(string_or_model_class, stubs={})
+      @__rspec_active_model_mocks ||= Hash.new { |h, k| h[k] = [] }
+
       if String === string_or_model_class
         if Object.const_defined?(string_or_model_class)
           model_class = Object.const_get(string_or_model_class)
@@ -101,6 +106,7 @@ module RSpec::ActiveModel::Mocks
           model_class = Object.const_set(string_or_model_class, Class.new do
             # rubocop:disable  Style/SingleLineMethods
             extend ::ActiveModel::Naming
+
             def self.primary_key; :id; end
 
             # For detection of being a valid association in 7+
@@ -137,9 +143,10 @@ It received #{model_class.inspect}
       double("#{model_class.name}_#{stubs[:id]}", stubs).tap do |m|
         if model_class.method(:===).owner == Module && !stubs.key?(:===)
           allow(model_class).to receive(:===).and_wrap_original do |original, other|
-            m === other || original.call(other)
+            @__rspec_active_model_mocks[model_class].include?(other) || original.call(other)
           end
         end
+        @__rspec_active_model_mocks[model_class] << m
         msingleton = class << m; self; end
         msingleton.class_eval do
           include ActiveModelInstanceMethods
@@ -173,8 +180,11 @@ It received #{model_class.inspect}
         end unless stubs.key?(:has_attribute?)
 
         msingleton.__send__(:define_method, :respond_to?) do |method_name, *args|
+          return true if __model_class_has_column?(method_name)
+
           include_private = args.first || false
-          __model_class_has_column?(method_name) ? true : super(method_name, include_private)
+
+          super(method_name, include_private)
         end unless stubs.key?(:respond_to?)
 
         msingleton.__send__(:define_method, :method_missing) do |missing_m, *a, &b|

data/lib/rspec/active_model/mocks/version.rb

@@ -3,7 +3,7 @@ module RSpec
   module ActiveModel
     module Mocks
       module Version
-        STRING = '1.2.0'
+        STRING = '1.3.0'
       end
     end
   end

data/spec/rspec/active_model/mocks/mock_model_spec.rb

@@ -209,6 +209,19 @@ describe "mock_model(RealModel)" do
       end
       # rubocop:enable Lint/LiteralAsCondition
     end
+
+    it "works for multiple mocks of the same model" do
+      foo = mock_model(MockableModel)
+      bar = mock_model(MockableModel)
+      baz = mock_model(MockableModelNoPrimaryKey)
+      quz = mock_model(MockableModel)
+
+      expect(MockableModel === foo).to be(true)
+      expect(MockableModel === bar).to be(true)
+      expect(MockableModel === baz).to be(false)
+      expect(MockableModelNoPrimaryKey === baz).to be(true)
+      expect(MockableModel === quz).to be(true)
+    end
   end
 
   describe "#kind_of?" do
@@ -469,6 +482,44 @@ describe "mock_model(RealModel)" do
     end
   end
 
+  describe "attribute access methods" do
+    it "supports [] method with symbol" do
+      model = mock_model(MockableModel, :name => "John", :age => 25)
+      expect(model[:name]).to eq("John")
+      expect(model[:age]).to eq(25)
+    end
+
+    it "supports [] method with string" do
+      model = mock_model(MockableModel, :name => "John", :age => 25)
+      expect(model["name"]).to eq("John")
+      expect(model["age"]).to eq(25)
+    end
+
+    it "supports read_attribute method with symbol" do
+      model = mock_model(MockableModel, :name => "John", :age => 25)
+      expect(model.read_attribute(:name)).to eq("John")
+      expect(model.read_attribute(:age)).to eq(25)
+    end
+
+    it "supports read_attribute method with string" do
+      model = mock_model(MockableModel, :name => "John", :age => 25)
+      expect(model.read_attribute("name")).to eq("John")
+      expect(model.read_attribute("age")).to eq(25)
+    end
+
+    it "supports _read_attribute method with symbol" do
+      model = mock_model(MockableModel, :name => "John", :age => 25)
+      expect(model._read_attribute(:name)).to eq("John")
+      expect(model._read_attribute(:age)).to eq(25)
+    end
+
+    it "supports _read_attribute method with string" do
+      model = mock_model(MockableModel, :name => "John", :age => 25)
+      expect(model._read_attribute("name")).to eq("John")
+      expect(model._read_attribute("age")).to eq(25)
+    end
+  end
+
   describe "ActiveModel Lint tests" do
     # rubocop:disable Lint/EmptyExpression,Metrics/BlockNesting
     begin
@@ -506,6 +557,7 @@ describe "mock_model(RealModel)" do
             ERR
           end
           include Test::Unit::Assertions
+
           if defined?((Test::Unit::AutoRunner.need_auto_run = ()))
             Test::Unit::AutoRunner.need_auto_run = false
           elsif defined?((Test::Unit.run = ()))
@@ -519,6 +571,7 @@ describe "mock_model(RealModel)" do
       else
         require 'test/unit/assertions'
         include Test::Unit::Assertions
+
         if defined?((Test::Unit::AutoRunner.need_auto_run = ()))
           Test::Unit::AutoRunner.need_auto_run = false
         elsif defined?((Test::Unit.run = ()))

data/spec/rspec/active_model/mocks/stub_model_spec.rb

@@ -181,5 +181,18 @@ describe "stub_model" do
       end
       # rubocop:enable Lint/LiteralAsCondition
     end
+
+    it "works for multiple mocks of the same model" do
+      foo = stub_model(MockableModel)
+      bar = stub_model(MockableModel)
+      baz = stub_model(MockableModelNoPrimaryKey)
+      qux = stub_model(MockableModel)
+
+      expect(MockableModel === foo).to be(true)
+      expect(MockableModel === bar).to be(true)
+      expect(MockableModel === baz).to be(false)
+      expect(MockableModelNoPrimaryKey === baz).to be(true)
+      expect(MockableModel === qux).to be(true)
+    end
   end
 end

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+require 'logger'
 require 'rspec/active_model/mocks'
 require 'active_record'
 

data/spec/support/ar_classes.rb

@@ -41,6 +41,7 @@ end
 
 class MockableModel < ActiveRecord::Base
   extend Connections
+
   has_one :associated_model
 end
 
@@ -54,6 +55,7 @@ end
 
 class AssociatedModel < ActiveRecord::Base
   extend Connections
+
   belongs_to :mockable_model
   belongs_to :nonexistent_model, :class_name => "Other"
 end
@@ -61,5 +63,6 @@ end
 class AlternatePrimaryKeyModel < ActiveRecord::Base
   self.primary_key = :my_id
   extend Connections
+
   attr_accessor :my_id
 end

metadata

@@ -1,22 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: rspec-activemodel-mocks
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - David Chelimsky
 - Andy Lindeman
 - Thomas Holmes
-autorequire:
 bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIF1TCCA72gAwIBAgIJAPXjfUbCjdXUMA0GCSqGSIb3DQEBBQUAMIGAMQswCQYD
+  MIIFvjCCA6agAwIBAgIJAPXjfUbCjdXVMA0GCSqGSIb3DQEBCwUAMIGAMQswCQYD
   VQQGEwJVUzETMBEGA1UECAwKV2FzaGluZ3RvbjEQMA4GA1UEBwwHU2VhdHRsZTEO
   MAwGA1UECgwFUlNwZWMxEzARBgNVBAMMCnJzcGVjLmluZm8xJTAjBgkqhkiG9w0B
-  CQEWFnJzcGVjQGdvb2dsZWdyb3Vwcy5jb20wHhcNMTQxMjIzMDkzNTIyWhcNMjQx
-  MjIyMDkzNTIyWjCBgDELMAkGA1UEBhMCVVMxEzARBgNVBAgMCldhc2hpbmd0b24x
+  CQEWFnJzcGVjQGdvb2dsZWdyb3Vwcy5jb20wHhcNMjUwMjA2MTE0NjU2WhcNMjYw
+  MjA2MTE0NjU2WjCBgDELMAkGA1UEBhMCVVMxEzARBgNVBAgMCldhc2hpbmd0b24x
   EDAOBgNVBAcMB1NlYXR0bGUxDjAMBgNVBAoMBVJTcGVjMRMwEQYDVQQDDApyc3Bl
   Yy5pbmZvMSUwIwYJKoZIhvcNAQkBFhZyc3BlY0Bnb29nbGVncm91cHMuY29tMIIC
   IjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAsSmjgcHaKlD0jizRJowi2bGI
@@ -30,22 +29,21 @@ cert_chain:
   Xeh3EVdWY3vMB1pkhPwlsenpcmj5gOzrd54lELOVbCGHCf48iSqeflY2Lhe0pvzK
   blXCJBDmtrebvus291rM/dHcbEfK1SVd5Wut/n131iouf6dnNCFskFygDcgBbthC
   gpEMqf80lEmhX59VUsm0Pv6OEo+ZPHBvXPiJA6DShQh9t3YtpwyA8uVDMbT/i32u
-  2FUsqZbbJcCmkBrGposCAwEAAaNQME4wHQYDVR0OBBYEFPPvQ5XT0Nvuhi6k+hrW
-  Vv35J+TeMB8GA1UdIwQYMBaAFPPvQ5XT0Nvuhi6k+hrWVv35J+TeMAwGA1UdEwQF
-  MAMBAf8wDQYJKoZIhvcNAQEFBQADggIBAIqbQSWH2aAF537DKwAMB8nMFsoe24MD
-  gtuQAyjTtbH+QBE4N2RdQF/sU7Y3PYR7nqdrCsYc3RxyqM5XXi7I3IYdpfe1RuxY
-  +pyPzVQsPPDhMlJlCrwJsADnxlpxZlAgxYSLKOan55ihscaAWA90wqRUrf/ZJM36
-  8LWCPVn5teIt5aaxZWX68RMxa+AXvpbtJOBwXLkIFk3apD8CX4DhelIdw67DbkUe
-  ghUd/u62qrnqBTVgditt7OoWIZjzh24/Fda5d0MxZyvLILGOrf5bN4cTbe/q9Cid
-  Xrik7Upm+mu3y3yQIfrw85xybHq6iNXyYHvCdSrFfCIKrGpd/0CAdmYnJlx59Fk/
-  UbD3Eyx4psBSkU+WKO0Uf+3zNI7N/nVeNIwU/Ft+l8l7/K+427656c+ZGWDO0Gt/
-  BeEOSTDKP7qQ1T+JvMrBcBQo+i0cnRT10J1aoV90BhxsvWTRizIbugbaqR6Tq3bj
-  Akt00cIlNSplL6DenIAKSh5kF7s0tRD0tC3bNkZmNjNGkdoGEcUODEpTB3RHKKiu
-  e6k2Jg6m00z5vGFQhOnROG/QaUzMA3A3mFBe1RHFo07xd0pFeoeWL3vF69Gx9Jwp
-  ZsVDj6a7lH3cNqtWXZxrb2wO38qV5AkYj8SQK7Hj3/Yui9myUX3crr+PdetazSqQ
-  F3MdtaDehhjC
+  2FUsqZbbJcCmkBrGposCAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
+  HQYDVR0OBBYEFPPvQ5XT0Nvuhi6k+hrWVv35J+TeMA0GCSqGSIb3DQEBCwUAA4IC
+  AQBGBr0ll2yLrkO6IeK5Q7qZFnANaUCKfi6Of9VztZJXgKAU5KAQxyOidGktoA5N
+  lp+bFKudRkW8jSehqoNaNBdSZ9Bc07EGMXIhUFJZF9rq7Z2SKPwUm6EaSsBK13QR
+  U4K6wuaw5ZJSFzklapoGOJRGnFlnNtlhNFY6+tTwCeblwZbcuYGyGY8+Rg7GbyVl
+  3Tr4Gi1aS/qG/MDXKdE8HWm39dmaAMdbw6dg1VBd0JrX2VqH7xvE1dM/D3OlKrNp
+  gNFRNJig3Y8qPjocZR0cGkhgZoC9wribWxHSNawZm4CoV3fja2HNx9QyM7BaB+as
+  yuqAiBbA7vBcyc8nKATip3mxbyXYXoDD7nmO8JCPP7O/WsgG+U/B2a0kPdvYFoxE
+  Q0Js3GtFCuMvL+0rifqdxBOLtu0Pw9q4RvToTJIl2IR6eTgCb82B1hw9qKf7PjuL
+  BoEsYjjDhGw6FZvcJG8O6uj7aB+z4aF21YR74UGL7sq/RIPNNez5JI95jTGfqCPy
+  6yo0w3zja3yg28QK3Fj+tbOHeSLv9SDQWi/1jiPprGzbxGvbVvjvX11YZc46vkmY
+  AwP+qZPPf97FXXZGEGIYhhHpnj+Ltx9nCetRPiZ4rvYBcXgCWVQSg6eiEofrMwn/
+  AKMCABhZ1Y2eATsfMgdkmIZk7JIPZiSi6eUxPiCMP9M/pw==
   -----END CERTIFICATE-----
-date: 2023-12-10 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -130,7 +128,6 @@ metadata:
   mailing_list_uri: https://groups.google.com/forum/#!forum/rspec
   source_code_uri: https://github.com/rspec/rspec-activemodel-mocks
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options:
 - "--charset=UTF-8"
 require_paths:
@@ -146,10 +143,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
-signing_key:
+rubygems_version: 3.6.7
 specification_version: 4
-summary: rspec-activemodel-mocks-1.2.0
+summary: rspec-activemodel-mocks-1.3.0
 test_files:
 - features/mocks/mock_model.feature
 - features/mocks/stub_model.feature