From 5c9abd1bdb935129ba301daf28c8e24946625068 Mon Sep 17 00:00:00 2001 From: Jon Rowe Date: Thu, 7 Aug 2025 10:32:47 +0100 Subject: [PATCH 1/2] Updated for rubocop formatting --- lib/rspec/active_model/mocks/mocks.rb | 1 + spec/rspec/active_model/mocks/mock_model_spec.rb | 2 ++ spec/support/ar_classes.rb | 3 +++ 3 files changed, 6 insertions(+) diff --git a/lib/rspec/active_model/mocks/mocks.rb b/lib/rspec/active_model/mocks/mocks.rb index 8cfe696..cd0844f 100644 --- a/lib/rspec/active_model/mocks/mocks.rb +++ b/lib/rspec/active_model/mocks/mocks.rb @@ -103,6 +103,7 @@ def mock_model(string_or_model_class, stubs={}) 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+ diff --git a/spec/rspec/active_model/mocks/mock_model_spec.rb b/spec/rspec/active_model/mocks/mock_model_spec.rb index d936aa0..b3f2e15 100644 --- a/spec/rspec/active_model/mocks/mock_model_spec.rb +++ b/spec/rspec/active_model/mocks/mock_model_spec.rb @@ -519,6 +519,7 @@ def self.===(_other) 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 = ())) @@ -532,6 +533,7 @@ def self.===(_other) 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 = ())) diff --git a/spec/support/ar_classes.rb b/spec/support/ar_classes.rb index 6d05540..19c27c7 100644 --- a/spec/support/ar_classes.rb +++ b/spec/support/ar_classes.rb @@ -41,6 +41,7 @@ class NonActiveRecordModel class MockableModel < ActiveRecord::Base extend Connections + has_one :associated_model end @@ -54,6 +55,7 @@ class SubMockableModel < MockableModel class AssociatedModel < ActiveRecord::Base extend Connections + belongs_to :mockable_model belongs_to :nonexistent_model, :class_name => "Other" end @@ -61,5 +63,6 @@ class AssociatedModel < ActiveRecord::Base class AlternatePrimaryKeyModel < ActiveRecord::Base self.primary_key = :my_id extend Connections + attr_accessor :my_id end From b0fa869a1ee9b7e202d4bd3d72def55adda44853 Mon Sep 17 00:00:00 2001 From: Jon Rowe Date: Thu, 7 Aug 2025 10:33:51 +0100 Subject: [PATCH 2/2] Updated rule name --- .rubocop_rspec_base.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.rubocop_rspec_base.yml b/.rubocop_rspec_base.yml index 82140fa..300b4ca 100644 --- a/.rubocop_rspec_base.yml +++ b/.rubocop_rspec_base.yml @@ -84,7 +84,7 @@ Style/PercentLiteralDelimiters: # We have too many special cases where we allow generator methods or prefer a # prefixed predicate due to it's improved readability. -Naming/PredicateName: +Naming/PredicatePrefix: Enabled: false # On 1.8 `proc` is `lambda`, so we use `Proc.new` to ensure we get real procs on all supported versions.