rspec-active_record 0.3.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c5ad41304f6920ed624516d64b1cc856c4567a0db969ef490629c8da1054db7
-  data.tar.gz: 7ea8fc44c23be87bb25775c57b44bda372d888c6335d3f28f6a72cf9989f9990
+  metadata.gz: a7a6ee8d2f8e4e3230227c54f7b6ac9484820e2d7316b7a286529f7b96fcf168
+  data.tar.gz: 7544437ce608ee8190a98631c3a9ac81839e9a137f598826383e90950e8d7ea8
 SHA512:
-  metadata.gz: bfd6f12aa10981c36fe9d848811179b65059b78b5d7e2aaf2524137fd49e51b09eaa6074fbc936581a241e9696bcb14ec6dcfb621c6281c606177502083cedf8
-  data.tar.gz: ac6e27b7102b3fff1f7cee6916907a8728b2a2b381a1be0a869903f3ea224fa2e7c98e18534e41766e27c0de0a3687c47e5b940d94680944fe00f50ee76f881c
+  metadata.gz: e6e48ae2fef14172a456daa012eea9eeb94f53ddabb54db89e5b469f6d51c68b55386374b58836358d311d1fb77353bbffc4768927123de75968882bf2ce2b4f
+  data.tar.gz: acdf577a588b6da64e5233ab0c875cbbc38d8896218f24ef2f298928c5697b4b5fb6271671910a32f1358c82e263600a30270b36a729afcf37e11c833bfcf613

data/.rubocop.yml

@@ -1,5 +1,9 @@
 AllCops:
   TargetRubyVersion: 2.6
+  NewCops: enable
+
+Layout/LineLength:
+  Max: 120
 
 Metrics/BlockLength:
   Exclude:
@@ -9,6 +13,10 @@ Metrics/BlockLength:
 Metrics/MethodLength:
   Enabled: false
 
+Naming/PredicatePrefix:
+  AllowedMethods:
+    - does_not_match?
+
 Style/StringLiterals:
   Enabled: true
   EnforcedStyle: double_quotes
@@ -16,6 +24,3 @@ Style/StringLiterals:
 Style/StringLiteralsInInterpolation:
   Enabled: true
   EnforcedStyle: double_quotes
-
-Layout/LineLength:
-  Max: 120

data/CHANGELOG.md

@@ -1,4 +1,12 @@
 ## [Unreleased]
+## [0.5.0] - 2026-10-26
+
+- Implement `change_record.attributes`, which allows shortening `change_record.from`.
+
+## [0.4.0] - 2026-10-02
+
+- Allow `create_record.matching` to take multiple attribute hashes
+- Fix query cache causing issues between differently structured tables
 
 ## [0.3.2] - 2025-03-12
 

data/Gemfile

@@ -4,3 +4,10 @@ source "https://rubygems.org"
 
 # Specify your gem's dependencies in rspec-active_record.gemspec
 gemspec
+
+gem "bump"
+gem "database_cleaner-active_record"
+gem "rake"
+gem "rspec"
+gem "rubocop"
+gem "sqlite3"

data/README.md

@@ -43,6 +43,8 @@ You can also make sure that attributes match, if it fails you'll get RSpec diff
 
 ```ruby
 expect { User.create!(name: "RSpec User") }.to create_record(User).matching(name: "RSpec User")
+expect { User.create!([{name: "RSpec User"}, {name: "Test User"}]) }
+  .to create_record(User).matching({name: "RSpec User"}, {name: "Test User"})
 ```    
 
 You can also achieve similar results using a scope, but not that in this case you won't see a diff:
@@ -64,6 +66,14 @@ expect { user.update!(name: "RSpec User") }.to change_record(user).from(name: "I
 expect { user.name = "RSpec User" }.to not_change_record(user).from(name: "Initial Name")
 ```
 
+Use `attributes` to take the initial values from the record, equivalent to
+`from(name: user.name, id: user.id)`:
+```ruby
+expect { user.update!(name: "RSpec User", email: "user@example.com") }
+  .to change_record(user).attributes(:name, :email)
+expect { user.name = "RSpec User" }.to not_change_record(user).attributes(:name, :id)
+```
+
 ### destroy_record
 
 Check that code destroys a record:

data/lib/rspec/active_record/change_record.rb

@@ -18,15 +18,20 @@ module RSpec
         self
       end
 
+      # Use the record's current values as the initial attributes
+      def attributes(*names)
+        from(names.index_with { |name| @record.public_send(name) })
+      end
+
       def matches?(block)
         @from_diff = diff_unless_match(@record, @from)
-        @to_pre_match = !does_not_match_attributes?(@record, @to)
+        @to_pre_match = !not_match_attributes?(@record, @to)
 
         block.call
         @updated_record = @record.class.base_class.find(@record.id)
 
         @to_diff = diff_unless_match(@updated_record, @to)
-        @from_post_match = !does_not_match_attributes?(@updated_record, @from)
+        @from_post_match = !not_match_attributes?(@updated_record, @from)
 
         (@from || @to) && !@from_diff && !@to_pre_match && !@to_diff && !@from_post_match
       end
@@ -60,7 +65,7 @@ module RSpec
         elsif @to_diff
           "expected to change #{format_record} to #{format_hash(@to)} but did not#{@to_diff}"
         else
-          "please specify from or to for change_record"
+          "please specify attributes, from or to for change_record"
         end
       end
 
@@ -68,7 +73,7 @@ module RSpec
         if @to
           "negative matcher for change_record with to is not supported"
         elsif @from.blank?
-          "negative matcher for change_record without from is not supported"
+          "negative matcher for change_record without attributes or from is not supported"
         elsif @from_diff
           "expected #{format_record} to match #{format_hash(@from)} initially but it did not#{@from_diff}"
         elsif !@from_post_match
@@ -92,7 +97,7 @@ module RSpec
         RSpec::Matchers::BuiltIn::HaveAttributes.new(attributes).matches?(record)
       end
 
-      def does_not_match_attributes?(record, attributes)
+      def not_match_attributes?(record, attributes)
         return true unless attributes
 
         RSpec::Matchers::BuiltIn::HaveAttributes.new(attributes).does_not_match?(record)

data/lib/rspec/active_record/create_record.rb

@@ -8,11 +8,12 @@ module RSpec
 
       def initialize(scope)
         @scope = scope
+        @attributes = []
         super()
       end
 
       # Make sure that created record matches attributes
-      def matching(attributes)
+      def matching(*attributes)
         @attributes = attributes
         self
       end
@@ -44,22 +45,26 @@ module RSpec
 
         @new_records = @scope.where.not(@scope.primary_key => existing_ids).to_a
 
-        match_times? && match_attributes? && @new_records.present?
+        match_times? && @attributes.all? { |attrs| match_attributes?(attrs) } && @new_records.present?
       end
 
       def description
+        match_messages = @attributes.map do |attrs|
+          " matching #{format_hash(attrs)}"
+        end
+
         message = "create #{scope_name}"
         message += " #{@times} time#{"s" if @times != 1}" if @times
-        message += " matching #{format_hash(@attributes)}" if @attributes
+        message += match_messages.join(",")
         improve_hash_formatting message
       end
 
       def failure_message
         failure = "expected to #{description} but"
-        if !match_times?
-          "#{failure} created #{@new_records.size}"
-        else
+        if match_times?
           add_diff "#{failure} did not"
+        else
+          "#{failure} created #{@new_records.size}"
         end
       end
 
@@ -70,7 +75,9 @@ module RSpec
       private
 
       def add_diff(message)
-        message += "\n\n#{DiffForMultipleRecords.new(@attributes, @new_records).call}" if @attributes
+        @attributes.each do |attrs|
+          message += "\n\n#{DiffForMultipleRecords.new(attrs, @new_records).call}" unless match_attributes?(attrs)
+        end
         message
       end
 
@@ -78,9 +85,8 @@ module RSpec
         @times.nil? || @times == @new_records.size
       end
 
-      def match_attributes?
-        @attributes.nil? ||
-          @new_records.any? { |record| RSpec::Matchers::BuiltIn::HaveAttributes.new(@attributes).matches?(record) }
+      def match_attributes?(attrs)
+        @new_records.any? { |record| RSpec::Matchers::BuiltIn::HaveAttributes.new(attrs).matches?(record) }
       end
 
       def scope_name

data/lib/rspec/active_record/stub_models.rb

@@ -40,6 +40,7 @@ module RSpec
       # Creates temporary table. Only works correctly if DDL transactions are enabled.
       # Takes same arguments as `create_table` in ActiveRecord migration.
       def create_temporary_table(*args, **options, &block)
+        ::ActiveRecord::Base.connection.clear_cache!
         ::ActiveRecord::Base.connection.create_table(*args, **options, &block)
       end
     end

data/lib/rspec/active_record/version.rb

@@ -2,6 +2,6 @@
 
 module RSpec
   module ActiveRecord
-    VERSION = "0.3.2"
+    VERSION = "0.5.0"
   end
 end

data/lib/rspec/active_record.rb

@@ -45,7 +45,7 @@ module RSpec
 
     # Allows matching that code inside a block destroyed specific record.
     # @param record [ActiveRecord::Base] Model that should be destroyed
-    # @return [ChangeRecord]
+    # @return [DestroyRecord]
     # @example Block destroyed record
     #   expect { user.destroy! }.to destroy_record(user)
     def destroy_record(record)

data/rspec-active_record.gemspec

@@ -14,6 +14,7 @@ Gem::Specification.new do |spec|
   spec.license = "MIT"
   spec.required_ruby_version = ">= 2.6.0"
 
+  spec.metadata["rubygems_mfa_required"] = "true"
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = spec.homepage
   spec.metadata["changelog_uri"] = "#{spec.homepage}/CHANGELOG.md"
@@ -33,12 +34,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency "rspec-expectations"
   spec.add_dependency "rspec-mocks"
 
-  spec.add_development_dependency "database_cleaner-active_record"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
-  spec.add_development_dependency "rubocop"
-  spec.add_development_dependency "sqlite3"
-
   # For more information and examples about making a new gem, check out our
   # guide at: https://bundler.io/guides/creating_gem.html
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-active_record
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Andrius Chamentauskas
@@ -51,76 +51,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: database_cleaner-active_record
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: RSpec matchers to check when ActiveRecord objects are created/updated/destroyed
 email:
 - andrius.chamentauskas@gmail.com
@@ -150,6 +80,7 @@ homepage: https://github.com/andriusch/rspec-active_record
 licenses:
 - MIT
 metadata:
+  rubygems_mfa_required: 'true'
   homepage_uri: https://github.com/andriusch/rspec-active_record
   source_code_uri: https://github.com/andriusch/rspec-active_record
   changelog_uri: https://github.com/andriusch/rspec-active_record/CHANGELOG.md
@@ -167,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 4.0.19
 specification_version: 4
 summary: RSpec matchers for ActiveRecord
 test_files: []