rspec-activerecord-expectations 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 202f92144b220ec281763d132152aa1bf3cced42d09273d3c050c8c41dab2018
-  data.tar.gz: f4e4e5f4fce4c3db060c3ea1fcb6752d876fd8b41cc0337dc81308c6acfceb08
+  metadata.gz: 0ed8bce8c2576663b3d187efc7ae064c239c9ab8f3e6dacae592563ea4c484fb
+  data.tar.gz: 9e67c875fd8dcab13a8e0ed56b34f842519f1af4f0037f5c8955970cc82f2850
 SHA512:
-  metadata.gz: fdbccf8e60640748b4eabc666355ac175455f0338a21a157d41eaee48f82361f45c4c921ec94ee2f3df5b9a274c72a1de868d4f7dfe5d3e2ff4480fbc08981ef
-  data.tar.gz: d330ce04fee3e846d0591cd4f0c34599e3501715e291f7ad7956a226e7ca7d91638892a09e566f567e13daaf2287d7da95869e4c99e849043a459e7afcc599e0
+  metadata.gz: 0ea389afd2110fbaca8c2215507874e1fed2ad1e1f5dae167baaf532d56f91bcfa3f7458a88a71e6ce2de341160ba0fe3f3a25c786641204ebda1f3fe2db707c
+  data.tar.gz: 9ace14690c79ee0ca1e5c9a3841a9769d58b315685e811b253d393c2a5858294153cf1b0e88471b584112391b351173163cd4d6326920654e35d3aac83c6cf77

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## [1.1.0] - 2020-12-30
+- Add matchers for less_than_or_equal_to, greater_than
+
 ## [1.0.1] - 2020-12-30
 - Pin all the dependencies to a proper working subset
 - Expand testing to many rails / ruby combinations

data/README.md

@@ -93,9 +93,20 @@ performance regression.
 
 ## Supported Matchers
 
+Listed along with their aliases.
+
 ```ruby
+expect {}.to execute.less_than(20).queries
 expect {}.to execute.fewer_than(20).queries
-expect {}.to execute.less_than(20).queries    # alias for fewer_than
+
+expect {}.to execute.less_than_or_equal_to(20).queries
+expect {}.to execute.at_most(20).queries
+
+expect {}.to execute.greater_than(20).queries
+expect {}.to execute.more_than(20).queries
+
+expect {}.to execute.greater_than_or_equal_to(20).queries
+expect {}.to execute.at_least(20).queries
 ```
 
 ## Future Planned Functionality
@@ -103,17 +114,16 @@ expect {}.to execute.less_than(20).queries    # alias for fewer_than
 This gem still has lots of future functionality. See below.
 
 ```ruby
-expect {}.to execute.more_than(20).activerecord_queries
-expect {}.to execute.fewer_than(20).insert_queries
 expect {}.to execute.exactly(5).queries
-expect {}.to execute.at_least(5).handrolled_queries
 
-expect {}.to execute.less_than(20).delete_queries
-expect {}.to execute.less_than(20).load_queries
-expect {}.to execute.less_than(20).schema_queries
-expect {}.to execute.less_than(20).exists_queries
-expect {}.to execute.less_than(20).queries
-expect {}.to execute.less_than(20).queries_of_type("Audited::Audit Load")
+expect {}.to execute.at_least(2).activerecord_queries
+expect {}.to execute.at_least(2).insert_queries
+expect {}.to execute.at_least(2).delete_queries
+expect {}.to execute.at_least(2).load_queries
+expect {}.to execute.at_least(2).schema_queries
+expect {}.to execute.at_least(2).exists_queries
+expect {}.to execute.at_least(2).queries_of_type("Audited::Audit Load")
+expect {}.to execute.at_least(2).hand_rolled_queries
 
 expect {}.not_to rollback_transaction.exactly(5).times
 expect {}.not_to commit_transaction.once
@@ -126,8 +136,7 @@ expect {}.to delete.exactly(2).of_any_type
 
 expect {}.not_to repeatedly_load(Audited::Audit)
 
-at_least, more_than, at_most, less_than, lteq?
-exactly(1) => once?
+expect {}.to execute.at_least(1).query
 ```
 
 - ignore transactionals (begin / rollback)

data/lib/rspec/activerecord/expectations/matchers/query_count.rb

@@ -26,12 +26,33 @@ module RSpec::ActiveRecord::Expectations
 
       # COMPARISON TYPES
 
-      def fewer_than(n)
+      def less_than(n)
         @comparison   = n
-        @match_method = method(:match_fewer_than)
+        @match_method = method(:compare_less_than)
         self
       end
-      alias_method :less_than, :fewer_than
+      alias_method :fewer_than, :less_than
+
+      def less_than_or_equal_to(n)
+        @comparison   = n
+        @match_method = method(:compare_less_than_or_equal_to)
+        self
+      end
+      alias_method :at_most, :less_than_or_equal_to
+
+      def greater_than(n)
+        @comparison   = n
+        @match_method = method(:compare_greater_than)
+        self
+      end
+      alias_method :more_than, :greater_than
+
+      def greater_than_or_equal_to(n)
+        @comparison   = n
+        @match_method = method(:compare_greater_than_or_equal_to)
+        self
+      end
+      alias_method :at_least, :greater_than_or_equal_to
 
       # TARGET QUERY TYPES
 
@@ -44,7 +65,7 @@ module RSpec::ActiveRecord::Expectations
 
       # MATCHERS
 
-      def match_fewer_than
+      def compare_less_than
         count = @collector.queries_of_type(@query_type)
 
         @failure_message = "expected block to execute fewer than #{@comparison} queries, but it executed #{count}"
@@ -52,6 +73,35 @@ module RSpec::ActiveRecord::Expectations
 
         count < @comparison
       end
+
+      def compare_less_than_or_equal_to
+        count = @collector.queries_of_type(@query_type)
+
+        # boy this negated operator is confusing. don't use that plz.
+        @failure_message = "expected block to execute at most #{@comparison} queries, but it executed #{count}"
+        @failure_message_when_negated = "expected block not to execute any less than #{@comparison} queries, but it executed #{count}"
+
+        count <= @comparison
+      end
+
+      def compare_greater_than
+        count = @collector.queries_of_type(@query_type)
+
+        @failure_message = "expected block to execute greater than #{@comparison} queries, but it executed #{count}"
+        @failure_message_when_negated = "expected block not to execute greater than #{@comparison} queries, but it executed #{count}"
+
+        count > @comparison
+      end
+
+      def compare_greater_than_or_equal_to
+        count = @collector.queries_of_type(@query_type)
+
+        # see above, negating this matcher is so confusing.
+        @failure_message = "expected block to execute at least #{@comparison} queries, but it executed #{count}"
+        @failure_message_when_negated = "expected block not to execute any more than #{@comparison} queries, but it executed #{count}"
+
+        count >= @comparison
+      end
     end
   end
 end

data/rspec-activerecord-expectations.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "rspec-activerecord-expectations"
-  spec.version       = '1.0.1'
+  spec.version       = '1.1.0'
   spec.authors       = ["Joseph Mastey"]
   spec.email         = ["hello@joemastey.com"]
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-activerecord-expectations
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Joseph Mastey