webspicy 0.15.2 → 0.15.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: efdf4060daab47d3319dd29b48ecd26013621e30f6c1d4f1c25b4f518ea7529c
-  data.tar.gz: 52841690093e5d2c6aa109fb9713ed8b61aad46b692372bd2bef4bc9eeb13c33
+  metadata.gz: d510f36443e5ef38eaabf4c09c6286c1e1aa556a9bb67fd5f5b67303b1faef4c
+  data.tar.gz: bb8b064c714f10bef673d6e61fa0fe71037d8b0e0f8479a4bdb874bbce5484e6
 SHA512:
-  metadata.gz: e6a7c5fae819129306949642fdb8dab129a490750988fd6ea5b7b65e1f54baec03736f5691487ee8d0008eee3688bd98a094260ef4dfa3f0538ca5fbcafda1e1
-  data.tar.gz: 06e2831456be2cd7fb2dd3ac3cf9135bef1e8ae8aa683977d9670a5724b090d2104b1e8d57b6f3f3d20b88ca72e4e7077d0c99fb47a1123e9c6d1634290beb3c
+  metadata.gz: dce79c2eba1d8fa74408280cabc8d06eee163fc4f1e8d5b8dfbfb1d4f167063dba68c54a0b1f18d4a72ac2ae88baa5f1a169f9f54b9073cce2c1174efd0b02a8
+  data.tar.gz: b0665863864804a9977c73f25eb22d12930cf623e0db3bf67ea07a15d81162434ecf0e5cf1c12007abba6a6d1ea37f8fdb91cb99afa82893fd4e0b15c7d98ec6

data/examples/restful/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    webspicy (0.15.2)
+    webspicy (0.15.3)
       finitio (>= 0.8.0)
       http (>= 2)
       mustermann (~> 1.0)

data/lib/webspicy/configuration.rb

@@ -249,36 +249,36 @@ module Webspicy
     # Installs a listener that will be called before all tests
     #
     # The `listener` must respond to `call`.
-    def before_all(&listener)
-      register_listener(:before_all, listener)
+    def before_all(l = nil, &listener)
+      register_listener(:before_all, l || listener)
     end
 
     # Installs a listener that will be called before each web service invocation.
     #
     # The `listener` must respond to `call`.
-    def before_each(&listener)
-      register_listener(:before_each, listener)
+    def before_each(l = nil, &listener)
+      register_listener(:before_each, l || listener)
     end
 
     # Installs a listener that will be called after all tests
     #
     # The `listener` must respond to `call`.
-    def after_all(&listener)
-      register_listener(:after_all, listener)
+    def after_all(l = nil, &listener)
+      register_listener(:after_all, l || listener)
     end
 
     # Installs a listener that will be called after each web service invocation.
     #
     # The `listener` must respond to `call`.
-    def after_each(&listener)
-      register_listener(:after_each, listener)
+    def after_each(l = nil, &listener)
+      register_listener(:after_each, l || listener)
     end
 
     # Installs a listener that will be called around each web service invocation.
     #
     # The `listener` must respond to `call`.
-    def around_each(&listener)
-      register_listener(:around_each, listener)
+    def around_each(l = nil, &listener)
+      register_listener(:around_each, l || listener)
     end
 
     # Installs a listener that will be called right after all precondition

data/lib/webspicy/resource/service.rb

@@ -51,8 +51,7 @@ module Webspicy
         preconditions.map{|pre|
           pre.counterexamples(self).map{|tc|
             tc = Webspicy.test_case(tc, Webspicy.current_scope)
-            tc.service = self
-            tc
+            tc.bind(self, true)
           }
         }.flatten
       end
@@ -107,13 +106,13 @@ module Webspicy
 
       def bind_examples
         (@raw[:examples] ||= []).each do |ex|
-          ex.service = self
+          ex.bind(self, false)
         end
       end
 
       def bind_counterexamples
         (@raw[:counterexamples] ||= []).each do |ex|
-          ex.service = self
+          ex.bind(self, true)
         end
       end
 

data/lib/webspicy/resource/service/invocation.rb

@@ -12,6 +12,32 @@ module Webspicy
 
         attr_reader :service, :test_case, :response, :client
 
+        def errors
+          @errors ||= begin
+            errs = [
+              [:expected_status_unmet, true],
+              [:expected_content_type_unmet, !test_case.is_expected_status?(204)],
+              [:expected_headers_unmet, test_case.has_expected_headers?],
+              [:expected_schema_unmet, !test_case.is_expected_status?(204)],
+              [:assertions_unmet, test_case.has_assertions?],
+              [:postconditions_unmet, test_case.service.has_postconditions? && !test_case.counterexample?],
+              [:expected_error_unmet, test_case.has_expected_error?]
+            ].map do |(expectation,only_if)|
+              next unless only_if
+              begin
+                self.send(expectation)
+              rescue => ex
+                ex.message
+              end
+            end
+            errs.compact
+          end
+        end
+
+        def has_error?
+          !errors.empty?
+        end
+
         ### Getters on response
 
         def response_code

data/lib/webspicy/resource/service/test_case.rb

@@ -5,8 +5,20 @@ module Webspicy
 
         def initialize(raw)
           @raw = raw
+          @counterexample = nil
+        end
+        attr_reader :service
+        attr_reader :counterexample
+
+        def bind(service, counterexample)
+          @service = service
+          @counterexample = counterexample
+          self
+        end
+
+        def counterexample?
+          !!@counterexample
         end
-        attr_accessor :service
 
         def resource
           service.resource

data/lib/webspicy/scope.rb

@@ -48,20 +48,20 @@ module Webspicy
 
     def each_example(service)
       service.examples.select(&to_filter_proc(config.test_case_filter)).each{|e|
-        yield(expand_example(service, e), false)
+        yield(expand_example(service, e))
       }
     end
 
     def each_counterexamples(service, &bl)
       service.counterexamples.select(&to_filter_proc(config.test_case_filter)).each{|e|
-        yield(expand_example(service, e), true)
+        yield(expand_example(service, e))
       } if config.run_counterexamples?
     end
 
     def each_generated_counterexamples(service, &bl)
       Webspicy.with_scope(self) do
         service.generated_counterexamples.select(&to_filter_proc(config.test_case_filter)).each{|e|
-          yield(expand_example(service, e), true)
+          yield(expand_example(service, e))
         }
       end if config.run_counterexamples?
     end
@@ -128,8 +128,7 @@ module Webspicy
         h1 = service.default_example.to_info
         h2 = example.to_info
         ex = Resource::Service::TestCase.new(merge_maps(h1, h2))
-        ex.service = service
-        ex
+        ex.bind(service, example.counterexample?)
       end
 
       def merge_maps(h1, h2)

data/lib/webspicy/tester.rb

@@ -45,16 +45,16 @@ module Webspicy
 
     def rspec_service!(on, service, client, scope)
       on.describe service do
-        scope.each_testcase(service) do |test_case, counterexample|
+        scope.each_testcase(service) do |test_case|
           describe test_case do
-            include_examples 'a successful test case invocation', client, test_case, counterexample
+            include_examples 'a successful test case invocation', client, test_case
           end
         end
       end
     end
 
     def rspec_config!
-      RSpec.shared_examples "a successful test case invocation" do |client, test_case, counterexample|
+      RSpec.shared_examples "a successful test case invocation" do |client, test_case|
 
         around(:each) do |example|
           client.around(test_case) do
@@ -63,7 +63,8 @@ module Webspicy
             client.instrument(test_case)
             @invocation = client.call(test_case)
             example.run
-            client.after(test_case)
+            client.after(test_case, @invocation)
+            @invocation
           end
         end
 
@@ -73,24 +74,8 @@ module Webspicy
 
         it 'works' do
           raise "Test not ran" unless invocation.done?
-          fails = [
-            [:expected_status_unmet, true],
-            [:expected_content_type_unmet, !test_case.is_expected_status?(204)],
-            [:expected_headers_unmet, test_case.has_expected_headers?],
-            [:expected_schema_unmet, !test_case.is_expected_status?(204)],
-            [:assertions_unmet, test_case.has_assertions?],
-            [:postconditions_unmet, test_case.service.has_postconditions? && !counterexample],
-            [:expected_error_unmet, test_case.has_expected_error?]
-          ].map do |(expectation,only_if)|
-            next unless only_if
-            begin
-              invocation.send(expectation)
-            rescue => ex
-              ex.message
-            end
-          end
-          fails = fails.compact
-          raise "\n* " + fails.join("\n* ") + "\n" unless fails.empty?
+          errors = invocation.errors
+          raise "\n* " + errors.join("\n* ") + "\n" unless errors.empty?
         end
       end
     end

data/lib/webspicy/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webspicy
 version: !ruby/object:Gem::Version
-  version: 0.15.2
+  version: 0.15.3
 platform: ruby
 authors:
 - Bernard Lambeau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-28 00:00:00.000000000 Z
+date: 2020-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake