webspicy 0.19.0 → 0.20.4

data/lib/webspicy/tester/reporter.rb

@@ -66,6 +66,11 @@ module Webspicy
         }
       end
 
+      def find(kind)
+        return self if self.is_a?(kind)
+        raise "Missing reporter #{kind}"
+      end
+
     protected
 
       def plural(word, count)

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

@@ -4,61 +4,84 @@ module Webspicy
       class Documentation < Reporter
 
         module Helpers
+          INDENT = "  ".freeze
+
+          def spec_file_line(spec_file)
+            relative_path = Path(spec_file).relative_to(config.folder)
+            colorize_section(">> #{relative_path}", config)
+          end
+
           def spec_file_error_line(spec_file, ex)
-            str = colorize_highlight(spec_file.to_s)
-            str += "\n  " + colorize_error("X  #{ex.message}")
+            str = ""
+            str += colorize_error(INDENT + "X  #{ex.message}", config)
             if ex.root_cause && ex.root_cause != ex
-              str += "\n    " + colorize_error("#{ex.root_cause.message}")
+              str += "\n"
+              str += INDENT + colorize_error("#{ex.root_cause.message}", config)
             end
             str
           end
 
           def service_line(service, test_case)
-            str = service.to_s + ", " + test_case.to_s
-            str = colorize_highlight(str)
+            str = "#{service}, #{test_case}"
+            str = colorize_highlight(str, config)
           end
 
           def check_success_line(check)
-            "  " + colorize_success("v") + "  " + check.behavior
+            INDENT + colorize_success("v  " + check.behavior, config)
           end
 
           def check_failure_line(check, ex)
-            "  " + colorize_error("F  " + ex.message)
+            INDENT + colorize_error("F  " + ex.message, config)
           end
 
           def check_error_line(check, ex)
-            "  " + colorize_error("E  " + ex.message)
+            INDENT + colorize_error("E  " + ex.message, config)
           end
         end
         include Helpers
 
         def spec_file_error(e)
+          io.puts spec_file_line(spec_file)
+          io.puts
           io.puts spec_file_error_line(spec_file, e)
           io.puts
+          io.flush
+        end
+
+        def before_service
+          io.puts spec_file_line(spec_file)
+          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/error_count.rb

@@ -5,18 +5,22 @@ module Webspicy
 
         def initialize(*args, &bl)
           super
-          @error_count = 0
+          @errors = Hash.new{|h,k| 0 }
         end
+        attr_reader :errors
 
-        def on_error(*args, &bl)
-          @error_count += 1
+        [
+          :spec_file_error,
+          :check_error,
+          :check_failure
+        ].each do |meth|
+          define_method(meth) do |*args, &bl|
+            @errors[meth] += 1
+          end
         end
-        alias :spec_file_error :on_error
-        alias :check_failure   :on_error
-        alias :check_error     :on_error
 
         def report
-          @error_count
+          @errors.values.inject(0){|memo,x| memo+x }
         end
 
       end # class ErrorCount

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

@@ -4,16 +4,19 @@ module Webspicy
       class FileProgress < Reporter
 
         def spec_file_error(e)
-          io.print colorize_error("X")
+          io.print colorize_error("X", config)
+          io.flush
         end
 
         def spec_file_done
-          io.print colorize_success(".")
+          io.print colorize_success(".", config)
+          io.flush
         end
 
         def report
           io.puts
           io.puts
+          io.flush
         end
 
       end # class FileProgress

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

@@ -22,12 +22,13 @@ module Webspicy
           msg = "#{plural('spec file', spec_files_count)}, "\
                 "#{plural('error', errors_count)}"
           if success?
-            msg = colorize_success(msg)
+            msg = colorize_success(msg, config)
           else
-            msg = colorize_error(msg)
+            msg = colorize_error(msg, config)
           end
           io.puts(msg)
           io.puts
+          io.flush
         end
 
       private

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

@@ -4,22 +4,24 @@ module Webspicy
       class Progress < Reporter
 
         def spec_file_error(e)
-          io.print colorize_error("X")
+          io.print colorize_error("X", config)
         end
 
         def after_each_done
           if result.success?
-            io.print colorize_success(".")
+            io.print colorize_success(".", config)
           elsif result.failure?
-            io.print colorize_error("F")
+            io.print colorize_error("F", config)
           elsif result.error?
-            io.print colorize_error("E")
+            io.print colorize_error("E", config)
           end
+          io.flush
         end
 
         def report
           io.puts
           io.puts
+          io.flush
         end
 
       end # class Progress

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

@@ -9,18 +9,21 @@ module Webspicy
           @examples_count = 0
           @counterexamples_count = 0
           @assertions_count = 0
+          #
+          @spec_file_errors_count = 0
           @errors_count = 0
           @failures_count = 0
         end
         attr_reader :spec_files_count, :examples_count, :counterexamples_count
-        attr_reader :assertions_count, :errors_count, :failures_count
+        attr_reader :assertions_count
+        attr_reader :spec_file_errors_count, :errors_count, :failures_count
 
         def before_spec_file
           @spec_files_count += 1
         end
 
         def spec_file_error(e)
-          @errors_count += 1
+          @spec_file_errors_count += 1
         end
 
         def after_each_done
@@ -42,18 +45,17 @@ module Webspicy
                 "#{plural('error', errors_count)}, "\
                 "#{plural('failure', failures_count)}"
           if success?
-            msg = colorize_success(msg)
+            msg = colorize_success(msg, config)
           else
-            msg = colorize_error(msg)
+            msg = colorize_error(msg, config)
           end
           io.puts(msg)
           io.puts
+          io.flush
         end
 
-      private
-
         def success?
-          @errors_count == 0 && @failures_count == 0
+          @spec_file_errors_count == 0 && @errors_count == 0 && @failures_count == 0
         end
 
       end # class Summary

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, tester.bind_condition(c))
         end
       end
 
       def check_errconditions!
         service.errconditions.each do |c|
-          check_one! Result::ErrconditionMet.new(self, c)
+          check_one! Result::ErrconditionMet.new(self, tester.bind_condition(c))
         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,9 +18,7 @@ module Webspicy
         end
 
         def call
-          if err = post.check(invocation)
-            _! err
-          end
+          post.check!
         end
 
       end # class ErrconditionMet

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

@@ -12,6 +12,7 @@ module Webspicy
         end
 
         def call
+          return unless invocation.is_structured_output?
           output = invocation.loaded_body
           service.error_schema.dress(output)
         rescue Finitio::TypeError => ex

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/output_schema_met.rb

@@ -12,6 +12,7 @@ module Webspicy
         end
 
         def call
+          return unless invocation.is_structured_output?
           output = invocation.loaded_body
           service.output_schema.dress(output)
         rescue Finitio::TypeError => ex

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

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

data/lib/webspicy/version.rb

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

data/lib/webspicy/web/invocation.rb

@@ -36,11 +36,14 @@ module Webspicy
         response.body.to_s
       end
 
-      def loaded_output
+      def is_structured_output?
         ct = response.content_type || test_case.expected_content_type
         ct = ct.mime_type if ct.respond_to?(:mime_type)
-        case ct
-        when %r{json}
+        ct =~ /json/
+      end
+
+      def loaded_output
+        if is_structured_output?
           raise "Body empty while expected" if raw_output.empty?
           @loaded_output ||= ::JSON.parse(response.body)
         else
@@ -50,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)

data/spec/blackbox/commandline.yml

@@ -0,0 +1,24 @@
+---
+command:
+  webspicy {options} {args}
+
+examples:
+
+- description: |-
+    when called on a passing path
+  args:
+  - ./fixtures/passing/config.rb
+  assert:
+    exit_code:
+      0
+    stdout: |-
+      GET /, when requested
+        v  It has a 200 response status
+        v  It has a `Content-Type: application/json` response header
+        v  Its output meets the expected data schema
+        v  Assert notEmpty
+        v  Assert pathFD('', :hello => "World" )
+
+
+      1 spec file, 1 example, 0 counterexample
+      5 assertions, 0 error, 0 failure