easytest 0.5.2 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a95c7799e7ef8d865ab340077539fe1025fdc390733417dfc1e1563acef4a0c2
-  data.tar.gz: db722ee94a1805cee7db8381b2f892f7eb7dd5ac5ddf44ae0f36f85f9f6280c3
+  metadata.gz: 5f45ff0adb716aa609a9fce9fd5eaefab60b8d56e4b2708a26b56d63189c3b78
+  data.tar.gz: 93b56e1770e0cd3a7d233580eddbd72737e56de4c5ebe405f244c6ca300f1ab9
 SHA512:
-  metadata.gz: dfa65af3175c00de2306f78a3698940ba2cc0080d5de9f95b626e75f6630ecae5f80225683176aeac261f2f3e6eb2b6ca488e080b6570ff46785d7219e832626
-  data.tar.gz: 36cc84ea3f72fe2cda5f12084471a75694205ee86522abd45e7220b9926c19e2efa1061778b617c15c18d371ef37ce5e2dbdb9e82128b6cc55ecf1bb9a195017
+  metadata.gz: 14fe72a70136f6aeca4f044bee8c4616d6b3ac8ee32f43bb46b1c888dd70823e73574204c32a91dd48b5df73233e217adfc9b19d6a05c2181a4df2974a4cdb1b
+  data.tar.gz: 90bd1e9e0c2e30905e1c2b4875c29fdc93b861da2ae26cd3df8441bdd5b5bb973b27a9830fe9c5597593ca398362ebeb2b26e96dcb65d0f4a93c1ae76a56e7ac

data/CHANGELOG.md

@@ -2,6 +2,16 @@
 
 All notable changes to this project will be documented in this file.
 
+## 0.7.0
+
+- Add `to_be_empty` matcher.
+- Avoid unstable `Enumerable#sort_by` method.
+
+## 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

@@ -14,15 +14,15 @@ module Easytest
     end
 
     def to_be_nil
-      Matcher::Nil.new(actual: actual, negate: negate).match!
+      Matcher::Nil.new(actual: actual, expected: nil, negate: negate).match!
     end
 
     def to_be_true
-      Matcher::True.new(actual: actual, negate: negate).match!
+      Matcher::True.new(actual: actual, expected: true, negate: negate).match!
     end
 
     def to_be_false
-      Matcher::False.new(actual: actual, negate: negate).match!
+      Matcher::False.new(actual: actual, expected: false, negate: negate).match!
     end
 
     def to_be_a(expected)
@@ -37,6 +37,10 @@ module Easytest
       Matcher::InstanceOf.new(actual: actual, expected: expected, negate: negate).match!
     end
 
+    def to_be_empty
+      Matcher::Empty.new(actual: actual, expected: nil, negate: negate).match!
+    end
+
     def to_include(expected)
       Matcher::Include.new(actual: actual, expected: expected, negate: negate).match!
     end
@@ -45,12 +49,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/empty.rb

@@ -0,0 +1,13 @@
+module Easytest
+  module Matcher
+    class Empty < Base
+      def match?
+        actual.empty?
+      end
+
+      def message
+        "empty"
+      end
+    end
+  end
+end

data/lib/easytest/matcher/false.rb

@@ -1,10 +1,6 @@
 module Easytest
   module Matcher
     class False < Base
-      def initialize(actual:, negate:)
-        super(actual: actual, expected: false, negate: negate)
-      end
-
       def match?
         actual == expected
       end

data/lib/easytest/matcher/nil.rb

@@ -1,10 +1,6 @@
 module Easytest
   module Matcher
     class Nil < Base
-      def initialize(actual:, negate:)
-        super(actual: actual, expected: nil, negate: negate)
-      end
-
       def match?
         actual.nil?
       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/matcher/true.rb

@@ -1,10 +1,6 @@
 module Easytest
   module Matcher
     class True < Base
-      def initialize(actual:, negate:)
-        super(actual: actual, expected: true, negate: negate)
-      end
-
       def match?
         actual == expected
       end

data/lib/easytest/runner.rb

@@ -24,7 +24,6 @@ module Easytest
 
         reports = []
 
-
         cases_per_file.each do |c|
           if include_only_case && !c.only?
             c.skip!
@@ -56,19 +55,7 @@ module Easytest
           puts "#{Rainbow(" FAIL ").bright.bg(:red)} #{link}"
         end
 
-        reports
-          .sort_by do |result, _|
-            case result
-            when :skipped, :todo
-              0
-            else
-              1
-            end
-          end
-          .each do |result, report|
-            puts report.gsub(/^/, "  ").gsub(/^\s+$/, "")
-            puts "" if result == :failed
-          end
+        print_reports(reports)
       end
 
       if no_tests?
@@ -109,6 +96,20 @@ module Easytest
       total_count == 0
     end
 
+    def print_reports(reports)
+      unexecuted = [:skipped, :todo]
+      indent = "  "
+
+      reports.each do |result, report|
+        puts Utils.indent_text(report, indent) if unexecuted.include?(result)
+      end
+
+      reports.each do |result, report|
+        puts Utils.indent_text(report, indent) unless unexecuted.include?(result)
+        puts "" if result == :failed
+      end
+    end
+
     def elapsed_time
       Time.now - start_time
     end

data/lib/easytest/utils.rb

@@ -20,5 +20,9 @@ module Easytest
     def pluralize(singular, count)
       count == 1 ? singular : "#{singular}s"
     end
+
+    def indent_text(text, indent_string)
+      text.gsub(/^(.+)/, "#{indent_string}\\1")
+    end
   end
 end

data/lib/easytest/version.rb

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

data/lib/easytest.rb

@@ -15,6 +15,8 @@ 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/empty"
 require_relative "easytest/matcher/equal"
 require_relative "easytest/matcher/false"
 require_relative "easytest/matcher/include"

data/sig/easytest.rbs

@@ -37,14 +37,21 @@ module Easytest
     # Expect to be an instance of the given class (module).
     def to_be_instance_of: (Module expected) -> void
 
+    # Expect to be empty.
+    def to_be_empty: () -> void
+
     # Expect to include the given object.
     def to_include: (untyped expected) -> void
 
     # 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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: easytest
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.7.0
 platform: ruby
 authors:
 - Masafumi Koba
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-10-07 00:00:00.000000000 Z
+date: 2022-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -45,6 +45,8 @@ 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/empty.rb
 - lib/easytest/matcher/equal.rb
 - lib/easytest/matcher/false.rb
 - lib/easytest/matcher/include.rb