easytest 0.5.2 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a95c7799e7ef8d865ab340077539fe1025fdc390733417dfc1e1563acef4a0c2
-  data.tar.gz: db722ee94a1805cee7db8381b2f892f7eb7dd5ac5ddf44ae0f36f85f9f6280c3
+  metadata.gz: b604c00c58f93e811ba779e0581b57b8eed7df6ef57504bea9239083663af42c
+  data.tar.gz: 8912feb299336ea7e242d1f7349fca2cb089af40f751f6c4478c535594eb6269
 SHA512:
-  metadata.gz: dfa65af3175c00de2306f78a3698940ba2cc0080d5de9f95b626e75f6630ecae5f80225683176aeac261f2f3e6eb2b6ca488e080b6570ff46785d7219e832626
-  data.tar.gz: 36cc84ea3f72fe2cda5f12084471a75694205ee86522abd45e7220b9926c19e2efa1061778b617c15c18d371ef37ce5e2dbdb9e82128b6cc55ecf1bb9a195017
+  metadata.gz: 0f423c20fe3812b906a37498275cd46c5fe5ac9996b8296f0c3ae7e8889d8a73f643310a82d2e2ffbaee48c393f5a94debe3c2e20b71c1d0710fe1f16491009c
+  data.tar.gz: 267b8496e9faea80de95d311bb5d1abb48959499b9765ff37cf588e600950f6a8a5e20b13a21af90818180ad8509d5d7ca74cd1962dc3b3e5eb0fe541f43e8f5

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 All notable changes to this project will be documented in this file.
 
+## 0.6.0
+
+- Add `to_contain_exactly` matcher.
+- Allow `to_raise` to receive the second argument.
+
 ## 0.5.2
 
 - Fix `homepage` in gemspec.

data/lib/easytest/expectation.rb

@@ -45,12 +45,16 @@ module Easytest
       Matcher::Match.new(actual: actual, expected: expected, negate: negate).match!
     end
 
-    def to_raise(expected)
+    def to_contain_exactly(*expected_items)
+      Matcher::ContainExactly.new(actual: actual, expected: expected_items, negate: negate).match!
+    end
+
+    def to_raise(expected, with_message = nil)
       raise FatalError, "`to_raise` requires a block like `expect { ... }.to_raise`" unless block
       raise FatalError, "`not.to_raise` can cause a false positive, so use `to_raise_nothing` instead" if negate?
       raise FatalError, "`to_raise` requires a Class, String, or Regexp" unless [Class, String, Regexp].any? { expected.is_a? _1 }
 
-      Matcher::Raise.new(actual: block, expected: expected, negate: negate).match!
+      Matcher::Raise.new(actual: block, expected: expected, negate: negate, with_message: with_message).match!
     end
 
     def to_raise_nothing

data/lib/easytest/matcher/contain_exactly.rb

@@ -0,0 +1,13 @@
+module Easytest
+  module Matcher
+    class ContainExactly < Base
+      def match?
+        (actual.to_a - expected).empty?
+      end
+
+      def message
+        "contain exactly"
+      end
+    end
+  end
+end

data/lib/easytest/matcher/raise.rb

@@ -1,13 +1,20 @@
 module Easytest
   module Matcher
     class Raise < Base
+      attr_reader :with_message
+
+      def initialize(**kwargs)
+        @with_message = kwargs.delete(:with_message)
+        super(**kwargs)
+      end
+
       def match?
         begin
           actual.call
           false
         rescue => error
           @raised_error = error
-          match_error?(actual: error, expected: expected)
+          match_error?(error)
         end
       end
 
@@ -21,14 +28,19 @@ module Easytest
 
       private
 
-      def match_error?(actual:, expected:)
+      def match_error?(error)
         case expected
         when Class
-          actual.class == expected
+          matched = error.class == expected
+          if with_message
+            matched && error.message.match?(with_message)
+          else
+            matched
+          end
         when String
-          actual.message == expected
+          error.message == expected
         when Regexp
-          actual.message.match? expected
+          error.message.match? expected
         else
           false
         end

data/lib/easytest/version.rb

@@ -1,3 +1,3 @@
 module Easytest
-  VERSION = "0.5.2"
+  VERSION = "0.6.0"
 end

data/lib/easytest.rb

@@ -15,6 +15,7 @@ require_relative "easytest/utils"
 require_relative "easytest/matcher/base"
 require_relative "easytest/matcher/be"
 require_relative "easytest/matcher/be_a"
+require_relative "easytest/matcher/contain_exactly"
 require_relative "easytest/matcher/equal"
 require_relative "easytest/matcher/false"
 require_relative "easytest/matcher/include"

data/sig/easytest.rbs

@@ -43,8 +43,12 @@ module Easytest
     # Expect to match the given object.
     def to_match: (untyped expected) -> void
 
+    # Expect to contain all the given items regardless of order.
+    def to_contain_exactly: (*untyped expected_items) -> void
+
     # Expect to raise the given exception or an exception with the given message.
-    def to_raise: ((Class | String | Regexp) expected) -> void
+    def to_raise: (Class expected, ?(String | Regexp) with_message) -> void
+                | ((String | Regexp) expected) -> void
 
     # Expect to raise nothing.
     def to_raise_nothing: () -> void

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easytest
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.0
 platform: ruby
 authors:
 - Masafumi Koba
@@ -45,6 +45,7 @@ files:
 - lib/easytest/matcher/base.rb
 - lib/easytest/matcher/be.rb
 - lib/easytest/matcher/be_a.rb
+- lib/easytest/matcher/contain_exactly.rb
 - lib/easytest/matcher/equal.rb
 - lib/easytest/matcher/false.rb
 - lib/easytest/matcher/include.rb