webspicy 0.15.3 → 0.15.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d510f36443e5ef38eaabf4c09c6286c1e1aa556a9bb67fd5f5b67303b1faef4c
-  data.tar.gz: bb8b064c714f10bef673d6e61fa0fe71037d8b0e0f8479a4bdb874bbce5484e6
+  metadata.gz: e8b9e1294df7f1eebb306f79f9fc39230a29217a8578b686ab3c9664e542466a
+  data.tar.gz: c5c07c651e3790c4016c7ffa5647f8b1bc78311b86bcef2a16e3a127be588bbd
 SHA512:
-  metadata.gz: dce79c2eba1d8fa74408280cabc8d06eee163fc4f1e8d5b8dfbfb1d4f167063dba68c54a0b1f18d4a72ac2ae88baa5f1a169f9f54b9073cce2c1174efd0b02a8
-  data.tar.gz: b0665863864804a9977c73f25eb22d12930cf623e0db3bf67ea07a15d81162434ecf0e5cf1c12007abba6a6d1ea37f8fdb91cb99afa82893fd4e0b15c7d98ec6
+  metadata.gz: 21e6a2e43bf83a096cd0d77b94a1677d142599cc8f7842cf69202ef489bb4fe8b5c3266460c8ab758ee77d6a0cca6100aa9e5cc9bf34cc18ccf45d427de41cac
+  data.tar.gz: 62bb90f71538abd9132d7925ae861f2f80c1def589246e6838f5f39ea9cf8e15cb75c5cbd315d88a54b0a410decbc5743c1ec1a5686485c6d84a1753ca89382a

data/examples/restful/Gemfile.lock

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

data/lib/webspicy.rb

@@ -14,6 +14,7 @@ module Webspicy
   ### Load library
   ###
 
+  require 'webspicy/support'
   require 'webspicy/configuration'
   require 'webspicy/file_upload'
   require 'webspicy/scope'

data/lib/webspicy/configuration.rb

@@ -11,6 +11,7 @@ module Webspicy
       @postconditions = []
       @listeners = Hash.new{|h,k| h[k] = [] }
       @rspec_options = default_rspec_options
+      @run_examples = default_run_examples
       @run_counterexamples = default_run_counterexamples
       @file_filter = default_file_filter
       @service_filter = default_service_filter
@@ -94,6 +95,23 @@ module Webspicy
       !children.empty?
     end
 
+    # Sets whether examples have to be ran or not.
+    def run_examples=(run_examples)
+      @run_examples = run_examples
+    end
+    attr_reader :run_examples
+
+    # Whether counter examples must be ran or not.
+    def run_examples?
+      @run_examples
+    end
+
+    # Returns the defaut value for run_examples
+    def default_run_examples
+      ENV['ROBUST'].nil? || (ENV['ROBUST'] != 'only')
+    end
+    private :default_run_examples
+
     # Sets whether counter examples have to be ran or not.
     def run_counterexamples=(run_counterexamples)
       @run_counterexamples = run_counterexamples

data/lib/webspicy/formaldoc.fio

@@ -51,7 +51,7 @@ TestCase =
         requester        :? String
         metadata         :? { ...: .Object }
         expected         :? {
-            status       :? Integer
+            status       :? StatusRange
             content_type :? String|Nil
             error        :? String
             headers      :? .Hash
@@ -61,3 +61,7 @@ TestCase =
     }
 
 Params = .Array|.Hash
+
+StatusRange = .Webspicy::Support::StatusRange
+  <int> Integer
+  <str> String(s | s =~ /^\dxx$/ )

data/lib/webspicy/mocker.rb

@@ -57,7 +57,7 @@ module Webspicy
 
     def best_status_code(service)
       if ex = service.examples.first
-        ex.expected_status || 200
+        (ex.expected_status && ex.expected_status.to_i) || 200
       else
         200
       end

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

@@ -53,7 +53,7 @@ module Webspicy
         end
 
         def is_expected_success?
-          test_case.expected_status >= 200 && test_case.expected_status < 300
+          test_case.expected_status.to_i >= 200 && test_case.expected_status.to_i < 300
         end
 
         def is_success?
@@ -73,7 +73,7 @@ module Webspicy
         def expected_status_unmet
           expected = test_case.expected_status
           got = response.status
-          expected == got ? nil : "#{expected} != #{got}"
+          expected === got ? nil : "#{expected} != #{got}"
         end
 
         def meets_expected_status?
@@ -89,7 +89,7 @@ module Webspicy
           if ect.nil?
             got.nil? ? nil : "#{ect} != #{got}"
           else
-            ect.to_s == got.to_s ? nil : "#{ect} != #{got}"
+            got.to_s.start_with?(ect.to_s) ? nil : "#{ect} != #{got}"
           end
         end
 

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

@@ -82,7 +82,7 @@ module Webspicy
         end
 
         def is_expected_status?(status)
-          expected_status == status
+          expected_status === status
         end
 
         def expected_error

data/lib/webspicy/scope.rb

@@ -49,7 +49,7 @@ module Webspicy
     def each_example(service)
       service.examples.select(&to_filter_proc(config.test_case_filter)).each{|e|
         yield(expand_example(service, e))
-      }
+      } if config.run_examples?
     end
 
     def each_counterexamples(service, &bl)

data/lib/webspicy/support.rb

@@ -0,0 +1 @@
+require_relative 'support/status_range'

data/lib/webspicy/support/status_range.rb

@@ -0,0 +1,46 @@
+module Webspicy
+  module Support
+    class StatusRange
+
+      def initialize(range)
+        @range = range
+      end
+      attr_reader :range
+
+      def self.int(i)
+        new(i..i)
+      end
+
+      def to_int
+        @range.first
+      end
+
+      def self.str(s)
+        from = s[/^(\d)/,1].to_i * 100
+        new(from...from+100)
+      end
+
+      def to_str
+        "#{@range.first/100}xx"
+      end
+
+      def to_i
+        @range.first
+      end
+
+      def ===(status)
+        range === status
+      end
+
+      def ==(other)
+        other.is_a?(StatusRange) && self.range == other.range
+      end
+      alias :eql? :==
+
+      def hash
+        @range.hash
+      end
+
+    end # class StatusRange
+  end # module Support
+end # module Webspicy

data/lib/webspicy/version.rb

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

data/spec/unit/scope/test_expand_example.rb

@@ -53,7 +53,7 @@ module Webspicy
         expect(subject).to be_a(Resource::Service::TestCase)
         expect(subject.description).to eql("Hello world")
         expect(subject.expected).to eql({
-          status: 200,
+          status: Support::StatusRange.int(200),
           content_type: "application/json"
         })
       end

data/spec/unit/support/test_status_range.rb

@@ -0,0 +1,29 @@
+require "spec_helper"
+module Webspicy
+  module Support
+    describe StatusRange do
+
+      it 'has a int information contract' do
+        expect(StatusRange.int(100).range).to eql(100..100)
+        expect(StatusRange.int(100).to_int).to eql(100)
+      end
+
+      it 'has a str information contract' do
+        expect(StatusRange.str("3xx").range).to eql(300...400)
+        expect(StatusRange.str("3xx").to_str).to eql("3xx")
+      end
+
+      it 'has a to_i that returns the first status of the range' do
+        expect(StatusRange.int(300).to_i).to eql(300)
+        expect(StatusRange.str("3xx").to_i).to eql(300)
+      end
+
+      it 'has a matching method' do
+        expect(StatusRange.str("3xx") === 300).to eql(true)
+        expect(StatusRange.str("3xx") === 302).to eql(true)
+        expect(StatusRange.str("3xx") === 400).to eql(false)
+      end
+
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webspicy
 version: !ruby/object:Gem::Version
-  version: 0.15.3
+  version: 0.15.4
 platform: ruby
 authors:
 - Bernard Lambeau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-05 00:00:00.000000000 Z
+date: 2020-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -224,6 +224,8 @@ files:
 - lib/webspicy/resource/service/invocation.rb
 - lib/webspicy/resource/service/test_case.rb
 - lib/webspicy/scope.rb
+- lib/webspicy/support.rb
+- lib/webspicy/support/status_range.rb
 - lib/webspicy/tester.rb
 - lib/webspicy/tester/asserter.rb
 - lib/webspicy/tester/assertions.rb
@@ -239,6 +241,7 @@ files:
 - spec/unit/scope/test_expand_example.rb
 - spec/unit/scope/test_to_real_url.rb
 - spec/unit/spec_helper.rb
+- spec/unit/support/test_status_range.rb
 - spec/unit/test_configuration.rb
 - spec/unit/tester/test_assertions.rb
 - tasks/gem.rake