webspicy 0.19.0 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 614e5904931375bd6f4df435d33736cde757e752d0d759fbc3af4e185b9cd9e4
-  data.tar.gz: 8d63e07e93809bd5139300e5206f0a3b3204e86d77faea60a29302e5787413d1
+  metadata.gz: d0bfd23b321b3e1216316e09c2b9e2d761a9e3179c62830d4b6a99b13042f4cc
+  data.tar.gz: 0661ba60f10ac2433bb5952d3c17141d880363e1d0c763836877a08b9673a8d1
 SHA512:
-  metadata.gz: 33d6a69e097e14a90f8b69edb4833a4a1325cec38513bf8f88d017b31847e08b310acce50dc7fb3d3cbdeefdff76b3497b489adbc2e965c7e8b12f0228a63524
-  data.tar.gz: 0d6cf55d54a6bb94b48511f9c178a1e5e673772749784b3c7c720d9413670dc1e93029cfa0687efd8fced6f91eb699ea5cae4ab15e40a674dea7843712dec114
+  metadata.gz: d276e4fb01cfd084e94917d6987b9e545c8c28edeaa082b55330ac3978f28d3c358e39f9a09ceda6f0aff59e55f9ff0fd989c2f9c247885d78a6d89a7a82f37d
+  data.tar.gz: bdfa965f896d9167432a8dbb4404720b9f278b590d031f92d8ad44c501be9a03e922a5bb58ae667644de803743210668cde3726ae0b901e6750f07ecb2718011

data/lib/webspicy.rb

@@ -33,8 +33,6 @@ module Webspicy
   HttpClient = Web::HttpClient
   RackTestClient = Web::RackTestClient
   Resource = Specification
-  Precondition = Specification::Precondition
-  Postcondition = Specification::Postcondition
   FileUpload = Specification::FileUpload
   Scope = Configuration::Scope
   Checker = Tester::FileChecker

data/lib/webspicy/specification.rb

@@ -94,8 +94,9 @@ module Webspicy
 end # module Webspicy
 require_relative 'specification/service'
 require_relative 'specification/condition'
-require_relative 'specification/precondition'
-require_relative 'specification/postcondition'
-require_relative 'specification/errcondition'
+require_relative 'specification/pre'
+require_relative 'specification/post'
+require_relative 'specification/err'
+require_relative 'specification/oldies'
 require_relative 'specification/test_case'
 require_relative 'specification/file_upload'

data/lib/webspicy/specification/condition.rb

@@ -1,11 +1,40 @@
 module Webspicy
   class Specification
     module Condition
+      extend Forwardable
 
       MATCH_ALL = "__all__"
 
       attr_accessor :matching_description
 
+      # Given a service and a condition, returns a Pre instance of there is a
+      # match, nil otherwise.
+      def self.match(service, condition)
+      end
+
+      # Bind the condition instance to a current tester.
+      def bind(tester)
+        @tester = tester
+        self
+      end
+      attr_reader :tester
+
+      def_delegators :@tester, *[
+        :config, :scope, :client,
+        :specification, :spec_file,
+        :service, :test_case,
+        :invocation, :result,
+        :reporter
+      ]
+
+      def sooner_or_later(*args, &bl)
+        Webspicy::Support.sooner_or_later(*args, &bl)
+      end
+
+      def fail!(msg)
+        raise Tester::Failure, msg
+      end
+
       def to_s
         if matching_description == MATCH_ALL
           self.class.name
@@ -14,10 +43,6 @@ module Webspicy
         end
       end
 
-      def sooner_or_later(*args, &bl)
-        Webspicy::Support.sooner_or_later(*args, &bl)
-      end
-
     end # module Condition
   end # class Specification
 end # module Webspicy

data/lib/webspicy/specification/err.rb

@@ -0,0 +1,18 @@
+module Webspicy
+  class Specification
+    module Err
+      include Condition
+
+      # Instrument the current test_case so as to prepare for errcondition
+      # check later
+      def instrument
+      end
+
+      # Check that the errcondition is met on last invocation & result
+      # of an counterexample
+      def check!
+      end
+
+    end # module Err
+  end # module Specification
+end # module Webspicy

data/lib/webspicy/specification/oldies.rb

@@ -0,0 +1,4 @@
+require_relative 'oldies/precondition'
+require_relative 'oldies/postcondition'
+require_relative 'oldies/errcondition'
+require_relative 'oldies/bridge'

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

@@ -0,0 +1,29 @@
+module Webspicy
+  class Specification
+    module Oldies
+      class Bridge
+        include Condition
+
+        def initialize(target)
+          @target = target
+        end
+        attr_reader :target
+
+        def instrument
+          target.instrument(test_case, client)
+        end
+
+        def check!
+          target.check(invocation)
+        end
+
+        def to_s
+          "#{target} (backward compatibility bridge)"
+        end
+
+      end # class Bridge
+    end # module Errcondition
+  end # module Specification
+  Precondition = Specification::Precondition
+  Postcondition = Specification::Postcondition
+end # module Webspicy

data/lib/webspicy/specification/{errcondition.rb → oldies/errcondition.rb}

@@ -1,8 +1,13 @@
 module Webspicy
   class Specification
+    # Deprecated, use Err instead
     module Errcondition
       include Condition
 
+      def bind(tester)
+        Oldies::Bridge.new(self).bind(tester)
+      end
+
       def self.match(service, descr)
       end
 

data/lib/webspicy/specification/{postcondition.rb → oldies/postcondition.rb}

@@ -1,8 +1,13 @@
 module Webspicy
   class Specification
+    # Deprecated, use Post instead
     module Postcondition
       include Condition
 
+      def bind(tester)
+        Oldies::Bridge.new(self).bind(tester)
+      end
+
       def self.match(service, descr)
       end
 

data/lib/webspicy/specification/{precondition.rb → oldies/precondition.rb}

@@ -1,8 +1,13 @@
 module Webspicy
   class Specification
+    # Deprecated, use Pre instead
     module Precondition
       include Condition
 
+      def bind(tester)
+        Oldies::Bridge.new(self).bind(tester)
+      end
+
       def self.match(service, pre)
       end
 
@@ -16,5 +21,3 @@ module Webspicy
     end # module Precondition
   end # class Specification
 end # module Webspicy
-require_relative 'precondition/global_request_headers'
-require_relative 'precondition/robust_to_invalid_input'

data/lib/webspicy/specification/post.rb

@@ -0,0 +1,20 @@
+module Webspicy
+  class Specification
+    module Post
+      include Condition
+
+      # Instrument the current test_case so as to prepare for postcondition
+      # check later
+      def instrument
+      end
+
+      # Check that the postcondition is met on last invocation & result
+      # of an example
+      def check!
+      end
+
+    end # module Post
+  end # module Specification
+end # module Webspicy
+require_relative "post/missing_condition_impl"
+require_relative "post/unexpected_condition_impl"

data/lib/webspicy/specification/post/missing_condition_impl.rb

@@ -0,0 +1,15 @@
+module Webspicy
+  class Specification
+    module Postcondition
+      class MissingConditionImpl
+        include Post
+
+        def check
+          msg = matching_description.gsub(/\(x\)/, "<!>")
+          raise "#{msg} (not instrumented)"
+        end
+
+      end # class MissingConditionImpl
+    end # module Postcondition
+  end # class Specification
+end # module Webspicy

data/lib/webspicy/specification/post/unexpected_condition_impl.rb

@@ -0,0 +1,15 @@
+module Webspicy
+  class Specification
+    module Postcondition
+      class UnexpectedConditionImpl
+        include Post
+
+        def check
+          msg = matching_description.gsub(/\( \)/, "<x>")
+          raise "#{msg} (is instrumented)"
+        end
+
+      end # class UnexpectedConditionImpl
+    end # module Postcondition
+  end # class Specification
+end # module Webspicy

data/lib/webspicy/specification/pre.rb

@@ -0,0 +1,19 @@
+module Webspicy
+  class Specification
+    module Pre
+      include Condition
+
+      # Instrument the current test_case so as to meet the precondition
+      def instrument
+      end
+
+      # Provide counterexamples of this precondition for a given service.
+      def counterexamples(service)
+        []
+      end
+
+    end # module Pre
+  end # class Specification
+end # module Webspicy
+require_relative 'pre/global_request_headers'
+require_relative 'pre/robust_to_invalid_input'

data/lib/webspicy/specification/{precondition → pre}/global_request_headers.rb

@@ -1,8 +1,8 @@
 module Webspicy
   class Specification
-    module Precondition
+    module Pre
       class GlobalRequestHeaders
-        include Precondition
+        include Pre
 
         DEFAULT_OPTIONS = {}
 
@@ -22,7 +22,7 @@ module Webspicy
           end
         end
 
-        def instrument(test_case, client)
+        def instrument
           extra = headers.reject{|k|
             test_case.headers.has_key?(k)
           }
@@ -30,6 +30,6 @@ module Webspicy
         end
 
       end # class GlobalRequestHeaders
-    end # module Precondition
+    end # module Pre
   end # class Specification
 end # module Webspicy

data/lib/webspicy/specification/{precondition → pre}/robust_to_invalid_input.rb

@@ -1,8 +1,8 @@
 module Webspicy
   class Specification
-    module Precondition
+    module Pre
       class RobustToInvalidInput
-        include Precondition
+        include Pre
 
         def self.match(service, pre)
           self.new
@@ -49,7 +49,7 @@ module Webspicy
                 status: Support::StatusRange.str("4xx")
               },
               :assert => []
-            })]            
+            })]
           else
             []
           end
@@ -63,6 +63,6 @@ module Webspicy
         end
 
       end # class RobustToInvalidInput
-    end # module Precondition
+    end # module Pre
   end # class Specification
 end # module Webspicy

data/lib/webspicy/specification/service.rb

@@ -112,16 +112,37 @@ module Webspicy
         # Because we want pre & post to be able to match in all cases
         # we need at least one condition
         descriptions = [Condition::MATCH_ALL] if descriptions.empty?
-        conditions.map{|c|
+        mapping = {}
+        instances = conditions.map{|c|
           instance = nil
           descr = descriptions.find do |d|
             instance = c.match(self, d)
           end
-          if instance && instance.respond_to?(:matching_description=)
-            instance.matching_description = descr
-          end
-          instance
+          instance.tap{|i|
+            mapping[descr] ||= i if i
+            i.matching_description = descr if i.respond_to?(:matching_description=)
+          }
         }.compact
+        mapped = descriptions
+          .select{|d| mapping[d] }
+          .map{|d| mapping[d] }
+        unmapped = descriptions
+          .reject{|d| mapping[d] }
+          .select{|d| d.strip =~ /^(\(\w+\))?\(x\)/ }
+          .map{|d|
+            Postcondition::MissingConditionImpl.new.tap{|mc|
+              mc.matching_description = d
+            }
+          }
+        unexpected = descriptions
+          .select{|d| mapping[d] }
+          .select{|d| d.strip =~ /^(\(\w+\))?\( \)/ }
+          .map{|d|
+            Postcondition::UnexpectedConditionImpl.new.tap{|mc|
+              mc.matching_description = d
+            }
+          }
+        mapped + unmapped + unexpected
       end
 
       def bind_examples

data/lib/webspicy/support.rb

@@ -3,18 +3,28 @@ module Webspicy
 
     SORL_OPTS = { max: 5, wait: 0.05, raise: false }
 
-    def sooner_or_later(opts = nil)
+    def sooner_or_later(opts = nil, &bl)
       opts = SORL_OPTS.merge(opts || {})
       left, wait_ms = opts[:max], opts[:wait]
-      until (r = yield) || left == 0
+      r = _sooner_or_later(&bl)
+      until (r && !r.is_a?(Tester::Failure)) || left == 0
         sleep(wait_ms)
         wait_ms, left = wait_ms*2, left - 1
+        r = _sooner_or_later(&bl)
       end
+      raise r if r.is_a?(Tester::Failure)
       raise TimeoutError, "Timeout on sooner-or-later" if r.nil? && opts[:raise]
       r
     end
     module_function :sooner_or_later
 
+    def _sooner_or_later(&bl)
+      bl.call
+    rescue Tester::Failure => ex
+      ex
+    end
+    module_function :_sooner_or_later
+
   end # module Support
 end # module Webspicy
 require_relative 'support/data_object'

data/lib/webspicy/tester.rb

@@ -1,5 +1,6 @@
 module Webspicy
   class Tester
+    extend Forwardable
 
     class FailFast < Exception; end
 
@@ -13,14 +14,19 @@ module Webspicy
       @service = nil
       @test_case = nil
       @invocation = nil
+      @invocation_error = nil
       @reporter = default_reporter
     end
     attr_reader :config, :scope, :hooks, :client
     attr_reader :specification, :spec_file
     attr_reader :service, :test_case
-    attr_reader :invocation, :result
+    attr_reader :invocation, :invocation_error, :result
     attr_reader :reporter
 
+    def_delegators :@config, *[
+      :world
+    ]
+
     def failfast?
       config.failfast
     end
@@ -44,7 +50,18 @@ module Webspicy
       reporter.find(Reporter::ErrorCount).report
     end
 
-  private
+    def find_and_call(method, url, mutation)
+      unless tc = scope.find_test_case(method, url)
+        raise Error, "No such service `#{method} #{url}`"
+      end
+      mutated = tc.mutate(mutation)
+      fork_tester(test_case: mutated) do |t|
+        instrumented = t.instrument_test_case
+        t.client.call(instrumented)
+      end
+    end
+
+  protected
 
     def run_config
       config.each_scope do |scope|
@@ -52,13 +69,13 @@ module Webspicy
         @hooks = Support::Hooks.for(scope.config)
         @client = scope.get_client
         reporter.before_all
-        @hooks.fire_before_all(@scope, @client)
+        @hooks.fire_before_all(self)
         reporter.before_all_done
         reporter.before_scope
         run_scope
         reporter.scope_done
         reporter.after_all
-        @hooks.fire_after_all(@scope, @client)
+        @hooks.fire_after_all(self)
         reporter.after_all_done
       end
     end
@@ -107,35 +124,79 @@ module Webspicy
     end
 
     def run_test_case
-      hooks.fire_around(test_case, client) do
+      hooks.fire_around(self) do
         reporter.before_each
-        hooks.fire_before_each(test_case, client)
+        hooks.fire_before_each(self)
         reporter.before_each_done
 
         reporter.before_instrument
-        client.instrument(test_case)
+        instrument_test_case
         reporter.instrument_done
 
-        reporter.before_invocation
-        @invocation = client.call(test_case)
-        reporter.invocation_done
+        call_test_case_target
 
         reporter.before_assertions
         check_invocation
         reporter.assertions_done
 
         reporter.after_each
-        hooks.fire_after_each(test_case, @invocation, client)
+        hooks.fire_after_each(self)
         reporter.after_each_done
 
         raise FailFast if !result.success? and failfast?
       end
     end
 
+    def call_test_case_target
+      reporter.before_invocation
+      @invocation = client.call(test_case)
+      reporter.invocation_done
+    rescue *PASSTHROUGH_EXCEPTIONS
+      raise
+    rescue => ex
+      @invocation_error = ex
+      reporter.invocation_done
+    end
+
+    def instrument_test_case
+      service = test_case.service
+      service.preconditions.each do |pre|
+        instrument_one(pre)
+      end
+      service.postconditions.each do |post|
+        instrument_one(post)
+      end if test_case.example?
+      service.errconditions.each do |err|
+        instrument_one(err)
+      end if test_case.counterexample?
+      config.listeners(:instrument).each do |i|
+        i.call(self)
+      end
+      test_case
+    end
+
+    def instrument_one(condition)
+      condition.bind(self).instrument
+    rescue ArgumentError
+      raise "#{condition.class} implements old PRE/POST contract"
+    end
+
     def check_invocation
       @result = Result.from(self)
     end
 
+    def fork_tester(binding = {})
+      yield dup.tap{|t|
+        binding.each_pair do |k,v|
+          t.send(:"#{k}=", v)
+        end
+      }
+    end
+
+  private
+
+    attr_writer :test_case
+
   end # class Tester
 end # module Webspicy
 require_relative 'tester/reporter'

data/lib/webspicy/tester/client.rb

@@ -12,32 +12,6 @@ module Webspicy
         :config
       ]
 
-      def find_and_call(method, url, mutation)
-        unless tc = scope.find_test_case(method, url)
-          raise Error, "No such service `#{method} #{url}`"
-        end
-        mutated = tc.mutate(mutation)
-        instrumented = instrument(mutated)
-        call(instrumented)
-      end
-
-      def instrument(test_case)
-        service = test_case.service
-        service.preconditions.each do |pre|
-          pre.instrument(test_case, self) if pre.respond_to?(:instrument)
-        end
-        service.postconditions.each do |post|
-          post.instrument(test_case, self) if post.respond_to?(:instrument)
-        end if test_case.example?
-        service.errconditions.each do |post|
-          post.instrument(test_case, self) if post.respond_to?(:instrument)
-        end if test_case.counterexample?
-        config.listeners(:instrument).each do |i|
-          i.call(test_case, self)
-        end
-        test_case
-      end
-
     end # class Client
   end # class Tester
 end # module Webspicy

data/lib/webspicy/tester/fakeses.rb

@@ -0,0 +1,41 @@
+require 'base64'
+
+module Webspicy
+  class Tester
+    class Fakeses
+      include Webspicy::Support::World::Item
+
+      DEFAULT_OPTIONS = {
+        endpoint: "http://fake-ses/_/api"
+      }
+
+      def initialize(options = {})
+        @options = DEFAULT_OPTIONS.merge(options)
+      end
+      attr_reader :options
+
+      def endpoint
+        options[:endpoint]
+      end
+
+      def clear!
+        res = HTTP.post("#{endpoint}/reset")
+      end
+
+      def emails
+        res = HTTP.get("#{endpoint}/emails")
+        JSON.parse(res.body).map{|data| Email.new(data) }
+      end
+
+      def emails_count
+        emails.length
+      end
+
+      def last_email
+        emails.last
+      end
+
+    end # class Fakeses
+  end # class Tester
+end # module Websipcy
+require_relative 'fakeses/email'

data/lib/webspicy/tester/fakeses/email.rb

@@ -0,0 +1,38 @@
+module Webspicy
+  class Tester
+    class Fakeses
+      class Email
+
+        def initialize(data)
+          @data = data
+        end
+        attr_reader :data
+
+        def from
+          data["body"]["Source"]
+        end
+
+        def to
+          data["body"]
+            .each_pair
+            .select{|(k,v)|
+              k =~ /Destinations.member/
+            }
+            .map{|(k,v)| v }
+        end
+
+        def subject
+          rx = /^Subject:\s*(.*)$/
+          raw_data
+            .each_line
+            .find{|l| l =~ rx }[rx, 1]
+        end
+
+        def raw_data
+          @raw_data ||= Base64.decode64(data["body"]["RawMessage.Data"])
+        end
+
+      end # class Email
+    end # class Fakeses
+  end # class Tester
+end # module Webspicy

data/lib/webspicy/tester/fakesmtp.rb

@@ -0,0 +1,39 @@
+module Webspicy
+  class Tester
+    class Fakesmtp
+      include Webspicy::Support::World::Item
+
+      DEFAULT_OPTIONS = {
+        endpoint: "http://fakesmtp"
+      }
+
+      def initialize(options = {})
+        @options = DEFAULT_OPTIONS.merge(options)
+      end
+      attr_reader :options
+
+      def endpoint
+        options[:endpoint]
+      end
+
+      def clear!
+        res = HTTP.delete("#{endpoint}/emails")
+      end
+
+      def emails
+        res = HTTP.get("#{endpoint}/emails")
+        JSON.parse(res.body).map{|data| Email.new(data) }
+      end
+
+      def emails_count
+        emails.length
+      end
+
+      def last_email
+        emails.last
+      end
+
+    end # class Fakesmtp
+  end # class Tester
+end # module Webspicy
+require_relative 'fakesmtp/email'

data/lib/webspicy/tester/fakesmtp/email.rb

@@ -0,0 +1,27 @@
+module Webspicy
+  class Tester
+    class Fakesmtp
+      class Email
+
+        def initialize(data)
+          @data = data
+        end
+        attr_reader :data
+
+        def from
+          @from ||= data["headerLines"]
+            .select{|h| h["key"] == "from" }
+            .map{|h| h["line"][/From:\s*(.*)$/, 1] }
+            .first
+        end
+
+        def to
+          @to ||= data["headerLines"]
+            .select{|h| h["key"] == "to" }
+            .map{|h| h["line"][/To:\s*(.*)$/, 1] }
+        end
+
+      end # class Email
+    end # class Fakesmtp
+  end # class Tester
+end # module Webspicy

data/lib/webspicy/tester/reporter/documentation.rb

@@ -35,30 +35,37 @@ module Webspicy
         def spec_file_error(e)
           io.puts spec_file_error_line(spec_file, e)
           io.puts
+          io.flush
         end
 
         def before_test_case
           io.puts service_line(service, test_case)
+          io.flush
         end
 
         def check_success(check)
           io.puts check_success_line(check)
+          io.flush
         end
 
         def check_failure(check, ex)
           io.puts check_failure_line(check, ex)
+          io.flush
         end
 
         def check_error(check, ex)
           io.puts check_error_line(check, ex)
+          io.flush
         end
 
         def test_case_done
           io.puts
+          io.flush
         end
 
         def service_done
           io.puts
+          io.flush
         end
 
       end # class Documentation

data/lib/webspicy/tester/reporter/exceptions.rb

@@ -33,6 +33,7 @@ module Webspicy
             io.puts e
           end
           io.puts
+          io.flush
         end
 
         def report_failed_results
@@ -52,6 +53,7 @@ module Webspicy
             io.puts
           end
           io.puts
+          io.flush
         end
 
       end # class Exceptions

data/lib/webspicy/tester/reporter/file_progress.rb

@@ -5,15 +5,18 @@ module Webspicy
 
         def spec_file_error(e)
           io.print colorize_error("X")
+          io.flush
         end
 
         def spec_file_done
           io.print colorize_success(".")
+          io.flush
         end
 
         def report
           io.puts
           io.puts
+          io.flush
         end
 
       end # class FileProgress

data/lib/webspicy/tester/reporter/file_summary.rb

@@ -28,6 +28,7 @@ module Webspicy
           end
           io.puts(msg)
           io.puts
+          io.flush
         end
 
       private

data/lib/webspicy/tester/reporter/progress.rb

@@ -15,11 +15,13 @@ module Webspicy
           elsif result.error?
             io.print colorize_error("E")
           end
+          io.flush
         end
 
         def report
           io.puts
           io.puts
+          io.flush
         end
 
       end # class Progress

data/lib/webspicy/tester/reporter/summary.rb

@@ -48,6 +48,7 @@ module Webspicy
           end
           io.puts(msg)
           io.puts
+          io.flush
         end
 
       private

data/lib/webspicy/tester/result.rb

@@ -5,26 +5,28 @@ module Webspicy
 
       def initialize(tester)
         @tester = tester
+        @scope = tester.scope
+        @client = tester.client
+        @specification = tester.specification
+        @service = tester.service
+        @test_case = tester.test_case
         @invocation = tester.invocation
         @assertions = []
         @failures = []
         @errors = []
-        check!
+        if @invocation
+          check!
+        else
+          @errors << [InvocationSuceeded.new(self), tester.invocation_error]
+        end
       end
-      attr_reader :tester, :invocation
+      attr_reader :tester, :scope, :client
+      attr_reader :specification, :service, :test_case, :invocation
       attr_reader :assertions, :failures, :errors
 
       def_delegators :@tester, *[
-        :reporter
-      ]
-
-      def_delegators :@invocation, *[
         :config,
-        :scope,
-        :client,
-        :specification,
-        :service,
-        :test_case
+        :reporter
       ]
 
       def self.from(tester)
@@ -94,13 +96,13 @@ module Webspicy
 
       def check_postconditions!
         service.postconditions.each do |c|
-          check_one! Result::PostconditionMet.new(self, c)
+          check_one! Result::PostconditionMet.new(self, c.bind(tester))
         end
       end
 
       def check_errconditions!
         service.errconditions.each do |c|
-          check_one! Result::ErrconditionMet.new(self, c)
+          check_one! Result::ErrconditionMet.new(self, c.bind(tester))
         end
       end
 
@@ -130,6 +132,7 @@ module Webspicy
   end # class Tester
 end # module Webspicy
 require_relative "result/check"
+require_relative "result/invocation_succeeded"
 require_relative "result/response_status_met"
 require_relative "result/response_header_met"
 require_relative "result/output_schema_met"

data/lib/webspicy/tester/result/errcondition_met.rb

@@ -18,7 +18,7 @@ module Webspicy
         end
 
         def call
-          if err = post.check(invocation)
+          if err = post.check!
             _! err
           end
         end

data/lib/webspicy/tester/result/invocation_succeeded.rb

@@ -0,0 +1,13 @@
+module Webspicy
+  class Tester
+    class Result
+      class InvocationSuceeded < Check
+
+        def initialize(result)
+          super(result)
+        end
+
+      end # class InvocationSuceeded
+    end # class Result
+  end # class Tester
+end # module Webspicy

data/lib/webspicy/tester/result/postcondition_met.rb

@@ -18,7 +18,7 @@ module Webspicy
         end
 
         def call
-          if err = post.check(invocation)
+          if err = post.check!
             _! err
           end
         end

data/lib/webspicy/version.rb

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

data/spec/unit/specification/{precondition → pre}/test_global_request_headers.rb

@@ -2,16 +2,21 @@ require 'spec_helper'
 
 module Webspicy
   class Specification
-    module Precondition
+    module Pre
       describe GlobalRequestHeaders do
         let(:gbr){
           GlobalRequestHeaders.new('Accept' => 'application/json')
         }
 
+        def instrument(tc)
+          t = OpenStruct.new(test_case: tc)
+          gbr.bind(t).instrument
+        end
+
         describe "instrument" do
           it 'injects the headers' do
             tc = TestCase.new({})
-            gbr.instrument(tc, nil)
+            instrument(tc)
             expect(tc.headers['Accept']).to eql("application/json")
           end
 
@@ -21,7 +26,7 @@ module Webspicy
                 'Content-Type' => 'text/plain'
               }
             })
-            gbr.instrument(tc, nil)
+            instrument(tc)
             expect(tc.headers['Content-Type']).to eql("text/plain")
             expect(tc.headers['Accept']).to eql("application/json")
           end
@@ -32,7 +37,7 @@ module Webspicy
                 'Accept' => 'text/plain'
               }
             })
-            gbr.instrument(tc, nil)
+            instrument(tc)
             expect(tc.headers['Accept']).to eql("text/plain")
           end
         end

data/spec/unit/specification/test_condition.rb

@@ -15,6 +15,24 @@ module Webspicy
           expect(x).to eql(nil)
         end
 
+        it 'supports the block raising a Failure' do
+          expect {
+            sooner_or_later(max: 2){
+              raise Tester::Failure
+            }
+          }.to raise_error(Tester::Failure)
+        end
+
+        it 'catches Failure occuring before successes' do
+          seen = 0
+          x = sooner_or_later(max: 2){
+              seen += 1
+            raise Tester::Failure if seen == 1
+            12
+          }
+          expect(x).to eql(12)
+        end
+
         it 'can raise for us' do
           expect{
             sooner_or_later(max: 1, raise: true){ nil }

data/spec/unit/tester/fakeses/test_email.rb

@@ -0,0 +1,40 @@
+require 'spec_helper'
+require 'webspicy/tester/fakeses'
+module Webspicy
+  class Tester
+    class Fakeses
+      describe Email do
+
+        DATA = Base64.encode64 <<~J
+          From: Webspicy <noreply@webspicy.io>
+          To: someone@world.com
+          Subject: Hey world, hello!
+        J
+
+        DATA = JSON.parse <<~J
+        {
+          "id": "1782605f-da34-9c02-6a38-d7e101029cbf",
+          "body": {
+            "Source": "noreply@webspicy.io",
+            "Destinations.member.1": "someone@world.com",
+            "RawMessage.Data": "#{DATA.gsub /\n/, ''}",
+            "Action": "SendRawEmail",
+            "Version": "2010-12-01"
+          }
+        }
+        J
+
+        subject{
+          Email.new(DATA)
+        }
+
+        it 'works as expected' do
+          expect(subject.from).to eql("noreply@webspicy.io")
+          expect(subject.to).to eql(["someone@world.com"])
+          expect(subject.subject).to eql("Hey world, hello!")
+        end
+
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webspicy
 version: !ruby/object:Gem::Version
-  version: 0.19.0
+  version: 0.20.0
 platform: ruby
 authors:
 - Bernard Lambeau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-09 00:00:00.000000000 Z
+date: 2021-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -222,12 +222,19 @@ files:
 - lib/webspicy/formaldoc.fio
 - lib/webspicy/specification.rb
 - lib/webspicy/specification/condition.rb
-- lib/webspicy/specification/errcondition.rb
+- lib/webspicy/specification/err.rb
 - lib/webspicy/specification/file_upload.rb
-- lib/webspicy/specification/postcondition.rb
-- lib/webspicy/specification/precondition.rb
-- lib/webspicy/specification/precondition/global_request_headers.rb
-- lib/webspicy/specification/precondition/robust_to_invalid_input.rb
+- lib/webspicy/specification/oldies.rb
+- lib/webspicy/specification/oldies/bridge.rb
+- lib/webspicy/specification/oldies/errcondition.rb
+- lib/webspicy/specification/oldies/postcondition.rb
+- lib/webspicy/specification/oldies/precondition.rb
+- lib/webspicy/specification/post.rb
+- lib/webspicy/specification/post/missing_condition_impl.rb
+- lib/webspicy/specification/post/unexpected_condition_impl.rb
+- lib/webspicy/specification/pre.rb
+- lib/webspicy/specification/pre/global_request_headers.rb
+- lib/webspicy/specification/pre/robust_to_invalid_input.rb
 - lib/webspicy/specification/service.rb
 - lib/webspicy/specification/test_case.rb
 - lib/webspicy/support.rb
@@ -241,6 +248,10 @@ files:
 - lib/webspicy/tester/assertions.rb
 - lib/webspicy/tester/client.rb
 - lib/webspicy/tester/failure.rb
+- lib/webspicy/tester/fakeses.rb
+- lib/webspicy/tester/fakeses/email.rb
+- lib/webspicy/tester/fakesmtp.rb
+- lib/webspicy/tester/fakesmtp/email.rb
 - lib/webspicy/tester/file_checker.rb
 - lib/webspicy/tester/invocation.rb
 - lib/webspicy/tester/reporter.rb
@@ -257,6 +268,7 @@ files:
 - lib/webspicy/tester/result/check.rb
 - lib/webspicy/tester/result/errcondition_met.rb
 - lib/webspicy/tester/result/error_schema_met.rb
+- lib/webspicy/tester/result/invocation_succeeded.rb
 - lib/webspicy/tester/result/output_schema_met.rb
 - lib/webspicy/tester/result/postcondition_met.rb
 - lib/webspicy/tester/result/response_header_met.rb
@@ -278,7 +290,7 @@ files:
 - spec/unit/configuration/scope/test_each_specification.rb
 - spec/unit/configuration/scope/test_expand_example.rb
 - spec/unit/configuration/scope/test_to_real_url.rb
-- spec/unit/specification/precondition/test_global_request_headers.rb
+- spec/unit/specification/pre/test_global_request_headers.rb
 - spec/unit/specification/service/test_dress_params.rb
 - spec/unit/specification/test_case/test_mutate.rb
 - spec/unit/specification/test_condition.rb
@@ -294,6 +306,7 @@ files:
 - spec/unit/support/world/fixtures/yaml.yml
 - spec/unit/support/world/test_world.rb
 - spec/unit/test_configuration.rb
+- spec/unit/tester/fakeses/test_email.rb
 - spec/unit/tester/test_asserter.rb
 - spec/unit/tester/test_assertions.rb
 - spec/unit/web/mocker/test_mocker.rb