webspicy 0.20.4 → 0.20.9

data/lib/webspicy/support/colorize.rb

@@ -5,7 +5,7 @@ module Webspicy
       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
 

data/lib/webspicy/tester.rb

@@ -38,12 +38,12 @@ module Webspicy
       rescue FailFast
       end
       reporter.report
-      reporter.find(Reporter::ErrorCount).report
+      reporter.find(Reporter::SuccessOrNot).report
     end
 
     def call!
       res = call
-      abort("KO") unless res == 0
+      abort("KO") unless reporter.find(Reporter::SuccessOrNot).success?
     end
 
     def find_and_call(method, url, mutation)
@@ -98,7 +98,7 @@ module Webspicy
     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
@@ -149,6 +149,8 @@ module Webspicy
     end
 
     def call_test_case_target
+      @invocation = nil
+      @invocation_error = nil
       reporter.before_invocation
       @invocation = client.call(test_case)
       reporter.invocation_done

data/lib/webspicy/tester/fakesmtp.rb

@@ -30,7 +30,7 @@ module Webspicy
       end
 
       def last_email
-        emails.last
+        emails.first
       end
 
     end # class Fakesmtp

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

@@ -7,7 +7,7 @@ module Webspicy
         @reporter << Reporter::FileProgress.new
         @reporter << Reporter::Exceptions.new
         @reporter << Reporter::FileSummary.new
-        @reporter << Reporter::ErrorCount.new
+        @reporter << Reporter::SuccessOrNot.new
       end
 
       def run_scope

data/lib/webspicy/tester/reporter.rb

@@ -80,7 +80,6 @@ module Webspicy
     end # class Reporter
   end # class Tester
 end # module Webspicy
-require_relative 'reporter/error_count'
 require_relative 'reporter/progress'
 require_relative 'reporter/summary'
 require_relative 'reporter/documentation'
@@ -88,3 +87,5 @@ require_relative 'reporter/exceptions'
 require_relative 'reporter/composite'
 require_relative 'reporter/file_progress'
 require_relative 'reporter/file_summary'
+require_relative 'reporter/success_or_not'
+require_relative 'reporter/junit_xml_file'

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

@@ -7,8 +7,10 @@ module Webspicy
           INDENT = "  ".freeze
 
           def spec_file_line(spec_file)
-            relative_path = Path(spec_file).relative_to(config.folder)
-            colorize_section(">> #{relative_path}", config)
+            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)
@@ -49,12 +51,16 @@ module Webspicy
         end
 
         def before_service
-          io.puts spec_file_line(spec_file)
-          io.puts
-          io.flush
+          @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/exceptions.rb

@@ -15,7 +15,7 @@ module Webspicy
           @spec_file_errors << spec_file_error_line(spec_file, e)
         end
 
-        def after_each_done
+        def test_case_done
           @failed_results << result unless result.success?
         end
 
@@ -24,6 +24,8 @@ module Webspicy
           report_failed_results
         end
 
+      private
+
         def report_spec_file_errors
           return if spec_file_errors.empty?
           io.puts

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

@@ -0,0 +1,151 @@
+module Webspicy
+  class Tester
+    class Reporter
+      class JunitXmlFile < Reporter
+
+        TPL = <<~XML
+          <?xml version="1.0" encoding="UTF-8"?>
+          <testsuites
+            disabled="{{counts.disabled}}"
+            errors="{{counts.errors}}"
+            failures="{{counts.failures}}"
+            tests="{{counts.total}}"
+            time="{{time}}s"
+          >
+            {{#testsuites}}
+              <testsuite
+                name="{{name}}"
+                tests="{{counts.total}}"
+                errors="{{counts.errors}}"
+                failures="{{counts.failures}}"
+                time="{{time}}s"
+              >
+                {{#testcases}}
+                  <testcase
+                    name="{{name}}"
+                    assertions="{{assert}}"
+                    classname="{{classname}}"
+                    status=""
+                    time="{{time}}s"
+                  >
+                    {{#errors}}
+                      <error
+                        message="{{message}}"
+                        type="{{type}}"
+                      ></error>
+                    {{/errors}}
+                    {{#failures}}
+                      <failure
+                        message="{{message}}"
+                        type="{{type}}"
+                        ></failure>
+                    {{/failures}}
+                  </testcase>
+                {{/testcases}}
+              </testsuite>
+            {{/testsuites}}
+          </testsuites>
+        XML
+
+        def initialize(path_or_io = STDOUT)
+          @path_or_io = path_or_io
+          path_or_io.parent.mkdir_p if path_or_io.is_a?(Path)
+        end
+
+        attr_reader :template_data, :timer_all, :timer_specification, :timer_testcase
+
+        def before_all
+          @timer_all = Time.now
+          @template_data = OpenStruct.new({
+            counts: Hash.new{|h,k| h[k] = 0 },
+            testsuites: []
+          })
+        end
+
+        def after_all
+          template_data.time = Time.now - timer_all
+        end
+
+        def before_specification
+          @timer_specification = Time.now
+          template_data.testsuites << OpenStruct.new({
+            :name => specification.name,
+            :counts => Hash.new{|h,k| h[k] = 0 },
+            :testcases => []
+          })
+        end
+
+        def specification_done
+          template_data.testsuites[-1].time = Time.now - timer_specification
+        end
+
+        def spec_file_error(e)
+          template_data.testsuites[-1].testcases << OpenStruct.new({
+            :name => "Specification can be loaded",
+            :assert => 1,
+            :classname => "Webspicy.Specification",
+            :failures => [],
+            :errors => [OpenStruct.new({
+              :type => e.class,
+              :message => e.message
+            })]
+          })
+        end
+
+        def before_test_case
+          @timer_testcase = Time.now
+          template_data.testsuites[-1].testcases << OpenStruct.new({
+            :name => test_case.description,
+            :assert => test_case.assert.length,
+            :classname => test_case.class.name.to_s.gsub(/::/, "."),
+            :failures => [],
+            :errors => [],
+          })
+          template_data.counts[:total] += 1
+          template_data.testsuites[-1].counts[:total] += 1
+        end
+
+        def test_case_done
+          template_data.testsuites[-1].testcases[-1].time = Time.now - timer_testcase
+        end
+
+        def check_failure(check, ex)
+          template_data.testsuites[-1].testcases[-1].failures << OpenStruct.new({
+            :type => check.class.name,
+            :message => ex.message
+          })
+          template_data.counts[:failures] += 1
+          template_data.testsuites[-1].counts[:failures] += 1
+        end
+
+        def check_error(check, ex)
+          template_data.testsuites[-1].testcases[-1].errors << OpenStruct.new({
+            :type => check.class.name,
+            :message => ex.message
+          })
+          template_data.counts[:errors] += 1
+          template_data.testsuites[-1].counts[:errors] += 1
+        end
+
+        def report
+          require 'mustache'
+          with_io do |io|
+            io << Mustache.render(TPL, template_data)
+          end
+        end
+
+      private
+
+        def with_io(&bl)
+          case io = @path_or_io
+          when IO, StringIO
+            bl.call(io)
+          else
+            Path(io).open('w', &bl)
+          end
+        end
+
+      end # class JunitXmlFile
+    end # class Reporter
+  end # class Tester
+end # module Webspicy

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

@@ -7,7 +7,7 @@ module Webspicy
           io.print colorize_error("X", config)
         end
 
-        def after_each_done
+        def test_case_done
           if result.success?
             io.print colorize_success(".", config)
           elsif result.failure?

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

@@ -0,0 +1,14 @@
+module Webspicy
+  class Tester
+    class Reporter
+      class SuccessOrNot < Summary
+
+        def report
+          total_error_count
+        end
+
+      end # class SuccessOrNot
+      ErrorCount = SuccessOrNot # for backward compatibility
+    end # class Reporter
+  end # class Tester
+end # module Webspicy

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

@@ -26,7 +26,7 @@ module Webspicy
           @spec_file_errors_count += 1
         end
 
-        def after_each_done
+        def test_case_done
           if tester.test_case.counterexample?
             @counterexamples_count += 1
           else
@@ -54,8 +54,12 @@ module Webspicy
           io.flush
         end
 
+        def total_error_count
+          @spec_file_errors_count + @errors_count + @failures_count
+        end
+
         def success?
-          @spec_file_errors_count == 0 && @errors_count == 0 && @failures_count == 0
+          total_error_count == 0
         end
 
       end # class Summary

data/lib/webspicy/tester/result.rb

@@ -18,6 +18,7 @@ module Webspicy
           check!
         else
           @errors << [InvocationSuceeded.new(self), tester.invocation_error]
+          reporter.check_error(*errors.first)
         end
       end
       attr_reader :tester, :scope, :client

data/lib/webspicy/version.rb

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

data/lib/webspicy/web.rb

@@ -1,3 +1,49 @@
+module Webspicy
+  module Web
+
+    require_relative 'web/specification'
+
+    FORMALDOC = Finitio.system(Path.dir/("web/formaldoc.fio"))
+
+    def specification(raw, file = nil, scope = Webspicy.default_scope)
+      raw = YAML.load(raw) if raw.is_a?(String)
+      Webspicy.with_scope(scope) do
+        r = FORMALDOC["Specification"].dress(raw)
+        r.config = scope.config
+        r.located_at!(file) if file
+        r
+      end
+    rescue Finitio::Error => ex
+      handle_finitio_error(ex)
+    end
+    module_function :specification
+
+    def service(raw, scope = Webspicy.default_scope)
+      Webspicy.with_scope(scope) do
+        FORMALDOC["Service"].dress(raw)
+      end
+    rescue Finitio::Error => ex
+      handle_finitio_error(ex)
+    end
+    module_function :service
+
+    def test_case(raw, scope = Webspicy.default_scope)
+      Webspicy.with_scope(scope) do
+        FORMALDOC["TestCase"].dress(raw)
+      end
+    rescue Finitio::Error => ex
+      handle_finitio_error(ex)
+    end
+    module_function :test_case
+
+    def handle_finitio_error(ex)
+      puts ex.root_cause.message
+      raise ex
+    end
+    module_function :handle_finitio_error
+
+  end # module Web
+end # module Webspicy
 require_relative 'web/client'
 require_relative 'web/invocation'
 require_relative 'web/mocker'

data/lib/webspicy/{formaldoc.fio → web/formaldoc.fio}

@@ -1,23 +1,17 @@
 @import finitio/data
+@import webspicy/shared
 
 Method =
     String( s | s =~ /^(GET|POST|POST_FORM|PUT|DELETE|PATCH|PUT|OPTIONS)$/ )
 
-Tag = String( s | s.length > 0 )
-
-Schema =
-    .Finitio::System <fio> String
-      \( s | ::Webspicy.schema(s) )
-      \( s | raise "Unsupported"  )
-
 FileUpload =
-    .Webspicy::FileUpload <info> {
+    .Webspicy::Web::Specification::FileUpload <info> {
         path         :  String
         content_type :  String
         param_name   :? String
     }
 
-Specification = .Webspicy::Specification
+Specification = .Webspicy::Web::Specification
   <info> {
     name: String
     url: String
@@ -41,7 +35,7 @@ Specification = .Webspicy::Specification
   }
 
 Service =
-    .Webspicy::Specification::Service <info> {
+    .Webspicy::Web::Specification::Service <info> {
         method          :  Method
         description     :  String
         preconditions   :? [String]|String
@@ -57,7 +51,7 @@ Service =
     }
 
 TestCase =
-    .Webspicy::Specification::TestCase <info> {
+    .Webspicy::Web::Specification::TestCase <info> {
         description      :? String
         dress_params     :? Boolean
         params           :? Params
@@ -77,8 +71,6 @@ TestCase =
         tags             :? [Tag]
     }
 
-Params = .Array|.Hash
-
 StatusRange = .Webspicy::Support::StatusRange
   <int> Integer
   <str> String(s | s =~ /^\dxx$/ )