spectre-core 1.14.0 → 1.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4bf64674e85ed8358b24a20cb06d453531cb4af450c1670dee4712bcc51fd18
-  data.tar.gz: 8647deb255849902fc577c846e14c3e03636dde92619915b1d216d78eef9c73c
+  metadata.gz: 3ec3e298c4efb325f628370a3855a110136cba4a9d7f870db90d95a5b39c9e8a
+  data.tar.gz: fde6391319206d2f8d603b02be31f0f5bb72d424fcb25541b9be0597670ce49a
 SHA512:
-  metadata.gz: ab929ce12105b08fb0e0f3180040233c2f748ec6037e71c3b59281083a8a9156b152cb07c0713e56e8d723d2c836671f37a505c6497fae48d7717eeca6008f34
-  data.tar.gz: acc709c87e6f5d5132f5a5ad01c4478b893479e847a5f38c2edc8fc793d411390bde9173edde3e2712e95258de5056f24511b5a2a67c51378fe39f78f4721e29
+  metadata.gz: 5fdb065d1ce08d8c4e78e164bc1caad26ed03d50f4cf6199398699859cb9a81a00260b6e3af785de4a7852aa45da1ae61a2977b0b92bbb5c0c832e6079178cce
+  data.tar.gz: ce6b95998d3e3145876bc1d7bb8fe06ce941f1327a6a283557e9944447ffba888c3012124c474d0321f5e9eb91914b53fbdd285255f947db34dd783e084446b5

data/lib/spectre/assertion.rb

@@ -10,7 +10,7 @@ module Spectre
     class ::Object
       def should_be(value)
         evaluate(value, "#{self} should be #{value}") do |x|
-          self.equal? x
+          self.to_s == x.to_s
         end
       end
 
@@ -128,7 +128,9 @@ module Spectre
 
     class ::String
       def should_be(val)
-        raise AssertionFailure.new("'#{self.trim}' should be '#{val.to_s.trim}'", val, self) unless self == val
+        evaluate(val, "'#{self}' should be '#{val}'") do |x|
+          self.to_s == x.to_s
+        end
       end
 
       def should_be_empty
@@ -136,29 +138,37 @@ module Spectre
       end
 
       def should_not_be(val)
-        raise AssertionFailure.new("'#{self.trim}' should not be '#{val.to_s.trim}'", val, self) unless self != val
+        evaluate(value, "'#{self}' should not be '#{value}'") do |x|
+          self.to_s != x.to_s
+        end
       end
 
       def should_not_be_empty
         raise AssertionFailure.new('Text should not be empty', 'nothing', self) unless not self.empty?
       end
 
-      def should_contain(value)
-        evaluate(value, "'#{self.trim}' should contain #{value.to_s}") do |x|
+      def should_contain(val)
+        evaluate(val, "'#{self.trim}' should contain '#{val.to_s}'") do |x|
           self.include? x.to_s
         end
       end
 
       def should_not_contain(val)
-        raise AssertionFailure.new("'#{self.trim}' should not contain '#{val.trim}'", val, self) if self.include? val
+        evaluate(val, "'#{self}' should not contain '#{val}'") do |x|
+          not self.include? x.to_s
+        end
       end
 
       def should_match(regex)
-        raise AssertionFailure.new("'#{self.trim}' should match '#{val}'", regex, self) unless self.match(regex)
+        evaluate(regex, "'#{self.trim}' should match /#{regex}/") do |x|
+          self.match(x)
+        end
       end
 
       def should_not_match(regex)
-        raise AssertionFailure.new("'#{self.trim}' should not match '#{val}'", regex, self) if self.match(regex)
+        evaluate(regex, "'#{self.trim}' should not match '#{regex}'") do |x|
+          not self.match(x)
+        end
       end
 
       alias :| :or

data/lib/spectre.rb

@@ -2,7 +2,7 @@ module Spectre
   module Version
     MAJOR = 1
     MINOR = 14
-    TINY  = 0
+    TINY  = 1
   end
 
   VERSION = [Version::MAJOR, Version::MINOR, Version::TINY].compact * '.'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spectre-core
 version: !ruby/object:Gem::Version
-  version: 1.14.0
+  version: 1.14.1
 platform: ruby
 authors:
 - Christian Neubauer