webspicy 0.20.1 → 0.20.6

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

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

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

@@ -4,9 +4,9 @@ module Webspicy
       class UnexpectedConditionImpl
         include Post
 
-        def check
+        def check!
           msg = matching_description.gsub(/\( \)/, "<x>")
-          raise "#{msg} (is instrumented)"
+          fail!("#{msg} (is instrumented)")
         end
 
       end # class UnexpectedConditionImpl

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
@@ -18,10 +21,6 @@ module Webspicy
         specification.config
       end
 
-      def method
-        @raw[:method]
-      end
-
       def description
         @raw[:description]
       end
@@ -65,7 +64,7 @@ module Webspicy
       def generated_counterexamples
         preconditions.map{|pre|
           pre.counterexamples(self).map{|tc|
-            tc = Webspicy.test_case(tc, Webspicy.current_scope)
+            tc = config.factory.test_case(tc, Webspicy.current_scope)
             tc.bind(self, true)
           }
         }.flatten

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
@@ -40,10 +43,6 @@ module Webspicy
         @raw[:seeds]
       end
 
-      def headers
-        @raw[:headers] ||= {}
-      end
-
       def metadata
         @raw[:metadata] ||= {}
       end
@@ -52,47 +51,10 @@ module Webspicy
         @raw[:tags] ||= []
       end
 
-      def dress_params
-        @raw.fetch(:dress_params){ true }
-      end
-      alias :dress_params? :dress_params
-
-      def params
-        @raw[:params] || {}
-      end
-
-      def body
-        @raw[:body]
-      end
-
-      def file_upload
-        @raw[:file_upload]
-      end
-
-      def located_file_upload
-        file_upload ? file_upload.locate(specification) : nil
-      end
-
       def expected
         @raw[:expected] || {}
       end
 
-      def expected_content_type
-        expected[:content_type]
-      end
-
-      def expected_status
-        expected[:status]
-      end
-
-      def is_expected_status?(status)
-        expected_status === status
-      end
-
-      def has_expected_status?
-        not expected[:status].nil?
-      end
-
       def expected_error
         expected[:error]
       end
@@ -101,14 +63,6 @@ module Webspicy
         !expected_error.nil?
       end
 
-      def expected_headers
-        expected[:headers] || {}
-      end
-
-      def has_expected_headers?
-        !expected_headers.empty?
-      end
-
       def assert
         @raw[:assert] || []
       end

data/lib/webspicy/support/colorize.rb

@@ -3,11 +3,17 @@ module Webspicy
     module Colorize
 
       def colorize(str, kind, config = nil)
+        return str if config && !config.colorize
         color = (config || self.config).colors[kind]
-        ColorizedString[str].colorize(color)
+        Paint[str, color]
       end
       module_function :colorize
 
+      def colorize_section(str, cfg = nil)
+        colorize(str, :section, cfg)
+      end
+      module_function :colorize_section
+
       def colorize_highlight(str, cfg = nil)
         colorize(str, :highlight, cfg)
       end

data/lib/webspicy/tester.rb

@@ -15,7 +15,7 @@ module Webspicy
       @test_case = nil
       @invocation = nil
       @invocation_error = nil
-      @reporter = default_reporter
+      @reporter = @config.reporter
     end
     attr_reader :config, :scope, :hooks, :client
     attr_reader :specification, :spec_file
@@ -31,15 +31,6 @@ module Webspicy
       config.failfast
     end
 
-    def default_reporter
-      @reporter = Reporter::Composite.new
-      #@reporter << Reporter::Progress.new
-      @reporter << Reporter::Documentation.new
-      @reporter << Reporter::Exceptions.new
-      @reporter << Reporter::Summary.new
-      @reporter << Reporter::ErrorCount.new
-    end
-
     def call
       reporter.init(self)
       begin
@@ -50,6 +41,11 @@ module Webspicy
       reporter.find(Reporter::ErrorCount).report
     end
 
+    def call!
+      res = call
+      abort("KO") unless res == 0
+    end
+
     def find_and_call(method, url, mutation)
       unless tc = scope.find_test_case(method, url)
         raise Error, "No such service `#{method} #{url}`"
@@ -61,6 +57,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
@@ -68,19 +69,15 @@ module Webspicy
         @scope = scope
         @hooks = Support::Hooks.for(scope.config)
         @client = scope.get_client
-        reporter.before_all
-        @hooks.fire_before_all(self)
-        reporter.before_all_done
-        reporter.before_scope
         run_scope
-        reporter.scope_done
-        reporter.after_all
-        @hooks.fire_after_all(self)
-        reporter.after_all_done
       end
     end
 
     def run_scope
+      reporter.before_all
+      hooks.fire_before_all(self)
+      reporter.before_all_done
+      reporter.before_scope
       scope.each_specification_file do |spec_file|
         @specification = load_specification(spec_file)
         if @specification
@@ -92,12 +89,16 @@ module Webspicy
           raise FailFast
         end
       end
+      reporter.scope_done
+      reporter.after_all
+      hooks.fire_after_all(self)
+      reporter.after_all_done
     end
 
     def load_specification(spec_file)
       @spec_file = spec_file
       reporter.before_spec_file
-      Webspicy.specification(spec_file.load, spec_file, scope)
+      config.factory.specification(spec_file.load, spec_file, scope)
     rescue *PASSTHROUGH_EXCEPTIONS
       raise
     rescue Exception => e
@@ -176,7 +177,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/fakesmtp/email.rb

@@ -21,6 +21,19 @@ module Webspicy
             .map{|h| h["line"][/To:\s*(.*)$/, 1] }
         end
 
+        def reply_to
+          @reply_to ||= data["headerLines"]
+            .select{|h| h["key"] == "reply-to" }
+            .map{|h| h["line"][/Reply-To:\s*(.*)$/, 1] }
+        end
+
+        def subject
+          @subject ||= data["headerLines"]
+            .select{|h| h["key"] == "subject" }
+            .map{|h| h["line"][/Subject:\s*(.*)$/, 1] }
+            .first
+        end
+
       end # class Email
     end # class Fakesmtp
   end # class Tester

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,41 +4,63 @@ module Webspicy
       class Documentation < Reporter
 
         module Helpers
+          INDENT = "  ".freeze
+
+          def spec_file_line(spec_file)
+            path = Path(spec_file).expand_path
+            path = path.relative_to(config.folder)
+            path = spec_file if path.to_s.start_with?(".")
+            colorize_section(">> #{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
+          @spec_file_line_printed = false
+        end
+
         def before_test_case
+          unless @spec_file_line_printed
+            io.puts spec_file_line(spec_file)
+            io.puts
+            io.flush
+            @spec_file_line_printed = true
+          end
           io.puts service_line(service, test_case)
           io.flush
         end

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

@@ -4,12 +4,12 @@ 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
 

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

@@ -22,9 +22,9 @@ 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

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

@@ -4,16 +4,16 @@ 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