webspicy 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ee44fbfe2ca04541a590d8d5cac3afc54e8bb92
-  data.tar.gz: b92cf71bf4ab3715918f544706f84a1f580ec59a
+  metadata.gz: 2a450b7c37c1dd58a30dcb2bc1e9317509f1d5e5
+  data.tar.gz: 6f471bbb4aea22f92564c22f720e6eaf50ff5937
 SHA512:
-  metadata.gz: 2478429f74cdf469a7182054bd6f9b110b2460bfbb7f6c8631dc3f554ff9c1c5e7dcfde9da928fd05316b5d71c3495daad6650e83802f7bc742eb582a3400586
-  data.tar.gz: 941daafd12fffa3d700b3bd4023ca009027fb229f9e13193582fda47bef18764f3cebb51c5995574b6436b40bf60e84294c9632257dfa475914dc365688c74bb
+  metadata.gz: 4bf135af59ee9a2b9dff46a9849b2b2539bf612728d88c719835ed5012c101ae8f0b8b8c1ba4d00010f8db93c42aeb48200e9ccf2b086d133d492bb43bfb7ac1
+  data.tar.gz: 65d79ba0f514277d7bc52e81b3cd92d311708fc58bd570476ab03cc7e4d78ef51e1780a06accc59fbeb686ac17d88fac10e80f6347100ff0f38c23b46d2ee33d

data/lib/webspicy/tester/asserter.rb

@@ -13,48 +13,62 @@ module Webspicy
         @assertions = AssertionsClass.new
       end
 
+      def includes(path, expected = NO_ARG)
+        path, expected = '', path if expected == NO_ARG
+        unless @assertions.includes(@target, path, expected)
+          _! "Expected #{_s(@target, path)} to include #{expected}"
+        end
+      end
+
+      def notIncludes(path, expected = NO_ARG)
+        path, expected = '', path if expected == NO_ARG
+        unless @assertions.notIncludes(@target, path, expected)
+          _! "Expected #{_s(@target, path)} not to include #{expected}"
+        end
+      end
+
       def exists(path = '')
         unless @assertions.exists(@target, path)
-          _! "Expected #{_s(@target)} to exists"
+          _! "Expected #{_s(@target, path)} to exists"
         end
       end
 
       def notExists(path = '')
         unless @assertions.notExists(@target, path)
-          _! "Expected #{_s(@target)} not to exists"
+          _! "Expected #{_s(@target, path)} not to exists"
         end
       end
 
       def empty(path = '')
         unless @assertions.empty(@target, path)
-          _! "Expected #{_s(@target)} to be empty"
+          _! "Expected #{_s(@target, path)} to be empty"
         end
       end
 
       def notEmpty(path = '')
         unless @assertions.notEmpty(@target, path)
-          _! "Expected #{_s(@target)} to be non empty"
+          _! "Expected #{_s(@target, path)} to be non empty"
         end
       end
 
       def size(path, expected = NO_ARG)
         path, expected = '', path if expected == NO_ARG
         unless @assertions.size(@target, path, expected)
-          _! "Expected #{_s(@target)} to have a size of #{expected}"
+          _! "Expected #{_s(@target, path)} to have a size of #{expected}"
         end
       end
 
       def idIn(path, *expected)
         path, expected = '', [path]+expected unless path.is_a?(String)
         unless @assertions.idIn(@target, path, expected)
-          _! "Expected #{_s(@target)} to have ids #{expected.join(',')}"
+          _! "Expected #{_s(@target, path)} to have ids #{expected.join(',')}"
         end
       end
 
       def idNotIn(path, *expected)
         path, expected = '', [path]+expected unless path.is_a?(String)
         unless @assertions.idNotIn(@target, path, expected)
-          _! "Expected #{_s(@target)} to not have ids #{expected.join(',')}"
+          _! "Expected #{_s(@target, path)} to not have ids #{expected.join(',')}"
         end
       end
 
@@ -64,27 +78,27 @@ module Webspicy
           id, path = path, ''
         end
         unless @assertions.idFD(@target, path, id, expected)
-          _! "Expected #{_s(@target)} to meet FD #{expected.inspect}"
+          _! "Expected #{_s(@target, path)} to meet FD #{expected.inspect}"
         end
       end
 
       def pathFD(path, expected)
         unless @assertions.pathFD(@target, path, expected)
-          _! "Expected #{_s(@target)} to meet FD #{expected.inspect}"
+          _! "Expected #{_s(@target, path)} to meet FD #{expected.inspect}"
         end
       end
 
       def match(path, expected = NO_ARG)
         path, expected = '', path if expected == NO_ARG
         unless @assertions.match(@target, path, expected)
-          _! "Expected #{_s(@target)} to match #{expected.inspect}"
+          _! "Expected #{_s(@target, path)} to match #{expected.inspect}"
         end
       end
 
       def notMatch(path, expected = NO_ARG)
         path, expected = '', path if expected == NO_ARG
         unless @assertions.notMatch(@target, path, expected)
-          _! "Expected #{_s(@target)} not to match #{expected.inspect}"
+          _! "Expected #{_s(@target, path)} not to match #{expected.inspect}"
         end
       end
 
@@ -94,8 +108,11 @@ module Webspicy
         DateTime.parse(str)
       end
 
-      def _s(target)
-        target.inspect[0..25]
+      def _s(target, path)
+        result = @assertions.extract_path(target, path)
+        result = result.to_json
+        result = result[0..25] + "..." if result.size>25
+        result
       end
 
       def _!(msg)

data/lib/webspicy/tester/assertions.rb

@@ -6,6 +6,16 @@ module Webspicy
 
       NO_ARG = Object.new
 
+      def includes(target, path, expected = NO_ARG)
+        path, expected = '', path if expected == NO_ARG
+        target = extract_path(target, path)
+        an_array(target).include?(expected)
+      end
+
+      def notIncludes(target, path, expected = NO_ARG)
+        not self.includes(target, path, expected)
+      end
+
       def exists(target, path = NO_ARG)
         target = extract_path(target, path)
         not target.nil?
@@ -77,7 +87,7 @@ module Webspicy
         !match(target, path, rx)
       end
 
-    private
+    public
 
       def extract_path(target, path = NO_ARG)
         return target if path.nil? or path==NO_ARG or path.empty?
@@ -87,6 +97,8 @@ module Webspicy
         end
       end
 
+    private
+
       def respond_to!(target, method)
         unless target.respond_to?(method)
           raise InvalidArgError, "Expecting instance responding to #{method}"

data/lib/webspicy/version.rb

@@ -2,7 +2,7 @@ module Webspicy
   module Version
     MAJOR = 0
     MINOR = 9
-    TINY  = 0
+    TINY  = 1
   end
   VERSION = "#{Version::MAJOR}.#{Version::MINOR}.#{Version::TINY}"
 end

data/spec/unit/tester/test_assertions.rb

@@ -18,6 +18,16 @@ module Webspicy
         expect(extract_path(target, 'baz/0/foo')).to eql("world")
       end
 
+      it 'has an includes() assertion' do
+        expect(includes [], 1).to be(false)
+        expect(includes [5, 1], 1).to be(true)
+      end
+
+      it 'has an notIcludes() assertion' do
+        expect(notIncludes [], 1).to be(true)
+        expect(notIncludes [5, 1], 1).to be(false)
+      end
+
       it 'has an exists() assertion' do
         expect(exists nil).to be(false)
         expect(exists []).to be(true)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: webspicy
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Bernard Lambeau