webspicy 0.20.1 → 0.20.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 576301cb14f9cc4abcb10c8638e7b7994397e3bd91c0f3e48fea49ff356dc81d
-  data.tar.gz: e19dc03f7daa686ec2c97f9f83b28249a7ccf16de852b5844bf68cf99291944e
+  metadata.gz: '0039cf2e5ebbb990cc29c6ed76e4eabf941feeb031f4761d30e120f32e31a41f'
+  data.tar.gz: c743e9f1650e7d9a09bef50d54e2e35e261761b085456d4bd8b4f7a6060f5304
 SHA512:
-  metadata.gz: e85cdd2ad61ed8b3e4a7d0362cd6543d6107ff4bbdba3586a3145c911e6d76d17a96347c28b56283804979ffea0a33ab47ba5426074450bc25b51ad78819c316
-  data.tar.gz: 3eb380f55e3f444f0cdd4268c00ef434b6f68ccca8cb10a3486be837a3d096dfd929d23b69d8ab872929995532491b9e3e41f1d44e2bff71ab078df10324a660
+  metadata.gz: d9a039f3919a201378847ab7db291dcd72a345d594d11900e941f65c6c9e211825851778c4dea9969c2dc1ed88d80ae177af03f977e9437eba15471acd111127
+  data.tar.gz: 61347ee21583f15bb966e279221604fe6b7f89c2a2833bc7dfa92d062ff238b2f26949b89674c97eb651d09d435610d5bf5689bf8596b4ed75a6ea4e4a1a981c

data/lib/webspicy/specification/oldies/bridge.rb

@@ -10,11 +10,14 @@ module Webspicy
         attr_reader :target
 
         def instrument
+          return unless target.respond_to?(:instrument)
           target.instrument(test_case, client)
         end
 
         def check!
-          target.check(invocation)
+          return unless target.respond_to?(:check)
+          res = target.check(invocation)
+          res ? fail!(res) : nil
         end
 
         def to_s

data/lib/webspicy/specification/service.rb

@@ -10,6 +10,9 @@ module Webspicy
       end
       attr_accessor :specification
 
+      # Deprecated
+      alias :resource :specification
+
       def self.info(raw)
         new(raw)
       end

data/lib/webspicy/specification/test_case.rb

@@ -28,6 +28,9 @@ module Webspicy
         service.specification
       end
 
+      # Deprecated
+      alias :resource :specification
+
       def self.info(raw)
         new(raw)
       end

data/lib/webspicy/tester.rb

@@ -61,6 +61,11 @@ module Webspicy
       end
     end
 
+    def bind_condition(c)
+      c = Specification::Oldies::Bridge.new(c) unless c.respond_to?(:bind)
+      c.bind(self)
+    end
+
   protected
 
     def run_config
@@ -176,7 +181,7 @@ module Webspicy
     end
 
     def instrument_one(condition)
-      condition.bind(self).instrument
+      bind_condition(condition).instrument
     rescue ArgumentError
       raise "#{condition.class} implements old PRE/POST contract"
     end

data/lib/webspicy/tester/assertions.rb

@@ -40,7 +40,7 @@ module Webspicy
         actual_size(target, path) == expected
       end
 
-      def actual_size(target, path) 
+      def actual_size(target, path)
         target = extract_path(target, path)
         respond_to!(target, :size).size
       end
@@ -68,7 +68,7 @@ module Webspicy
         an_array(target).find { |t| t[:id] == id }
       end
 
-      def idFD(element, expected) 
+      def idFD(element, expected)
         expected.keys.all? do |k|
           value_equal(expected[k], element[k])
         end

data/lib/webspicy/tester/result.rb

@@ -96,13 +96,13 @@ module Webspicy
 
       def check_postconditions!
         service.postconditions.each do |c|
-          check_one! Result::PostconditionMet.new(self, c.bind(tester))
+          check_one! Result::PostconditionMet.new(self, tester.bind_condition(c))
         end
       end
 
       def check_errconditions!
         service.errconditions.each do |c|
-          check_one! Result::ErrconditionMet.new(self, c.bind(tester))
+          check_one! Result::ErrconditionMet.new(self, tester.bind_condition(c))
         end
       end
 

data/lib/webspicy/version.rb

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

data/lib/webspicy/web/invocation.rb

@@ -53,6 +53,7 @@ module Webspicy
       alias :loaded_body :loaded_output
 
       def output
+        return loaded_output unless is_structured_output?
         schema = is_expected_success? ? service.output_schema : service.error_schema
         begin
           schema.dress(loaded_output)

metadata

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