rest-assured 2.2.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 370e594e8946de24f24b8469929fbc069fe5235f
-  data.tar.gz: 9e1e1621fa5b64411827d967dfd6705cf1872e5b
+  metadata.gz: d6dbb2567ce9b78bddff115b00f57999052f0bfc
+  data.tar.gz: 69f443e6bfd47995fd8c1d29a674702f3ebf4e97
 SHA512:
-  metadata.gz: 4652bf11923b101cdbd09e61c6e3f45a01c9756d81a3816bbe7330fbee9a60d1dee4e0d4338dcbafe18ec51e314c947d6c548a6762ba7b5e7de40bea1ec1039e
-  data.tar.gz: 886b1e670a667bfb494d30535a5e275f8c3dedcd892be3d5c6edb7fad5c04b7fa7321052a6f10ca433c644dd73cb01b3bee3ab486cea238cf23847fdfcd23eb7
+  metadata.gz: eaef1f201d5063cc4e7de3f1f827b6be2e24c14c18a4781f904fb1301b4f0814fb67ecdfbaabac13090892d603192b7d1a350505f3787ac2e325adc83f3048c1
+  data.tar.gz: a1ae1c24692c74ff7fe007e444d2d1bc4f681927375f2b2b6866acd2cf2e71cdc176fac3afa74dd2d723ba055299fa2df9a0180c6a08b9b519696393b1ef650b

data/README.markdown

@@ -32,7 +32,7 @@ But why not to use [VCR](https://github.com/vcr/vcr) or [WebMock](https://github
 
 ## Set up
 
-You are going to need ruby >= 1.9.3 and either sqlite3, postgres or mysql.
+You are going to need ruby >= 2.2.2 and either sqlite3, postgres or mysql. Use 2.x version of this gem if you need to support an older ruby version (>= 1.9.3).
 
 ### In ruby project
 

data/db/migrate/20110620161740_add_fixtures.rb

@@ -1,4 +1,4 @@
-class AddFixtures < ActiveRecord::Migration
+class AddFixtures < ActiveRecord::Migration[4.2]
   def self.up
     create_table :fixtures do |t|
       t.string  :url

data/db/migrate/20110625155332_add_redirects_table.rb

@@ -1,4 +1,4 @@
-class AddRedirectsTable < ActiveRecord::Migration
+class AddRedirectsTable < ActiveRecord::Migration[4.2]
   def self.up
     create_table :redirects do |t|
       t.string :pattern

data/db/migrate/20110709150645_add_description_to_fixtures.rb

@@ -1,4 +1,4 @@
-class AddDescriptionToFixtures < ActiveRecord::Migration
+class AddDescriptionToFixtures < ActiveRecord::Migration[4.2]
   def self.up
     add_column :fixtures, :description, :text
   end

data/db/migrate/20110807222522_add_active_bit_to_fixtures.rb

@@ -1,4 +1,4 @@
-class AddActiveBitToFixtures < ActiveRecord::Migration
+class AddActiveBitToFixtures < ActiveRecord::Migration[4.2]
   def self.up
     add_column :fixtures, :active, :boolean, :default => true
   end

data/db/migrate/20110818155555_add_position_to_redirects.rb

@@ -1,4 +1,4 @@
-class AddPositionToRedirects < ActiveRecord::Migration
+class AddPositionToRedirects < ActiveRecord::Migration[4.2]
   def self.up
     add_column :redirects, :position, :integer
   end

data/db/migrate/20110823132023_add_method_to_fixtures.rb

@@ -1,4 +1,4 @@
-class AddMethodToFixtures < ActiveRecord::Migration
+class AddMethodToFixtures < ActiveRecord::Migration[4.2]
   def self.up
     add_column :fixtures, :method, :string
   end

data/db/migrate/20110912162948_rename_url_to_fullpath.rb

@@ -1,4 +1,4 @@
-class RenameUrlToFullpath < ActiveRecord::Migration
+class RenameUrlToFullpath < ActiveRecord::Migration[4.2]
   def self.up
     rename_column :fixtures, :url, :fullpath
   end

data/db/migrate/20110912163705_rename_fixtures_to_doubles.rb

@@ -1,4 +1,4 @@
-class RenameFixturesToDoubles < ActiveRecord::Migration
+class RenameFixturesToDoubles < ActiveRecord::Migration[4.2]
   def self.up
     rename_table :fixtures, :doubles
   end

data/db/migrate/20111013122857_create_requests.rb

@@ -1,4 +1,4 @@
-class CreateRequests < ActiveRecord::Migration
+class CreateRequests < ActiveRecord::Migration[4.2]
   def self.up
     create_table :requests do |t|
       t.integer :double_id

data/db/migrate/20111016174101_rename_method_to_verb.rb

@@ -1,4 +1,4 @@
-class RenameMethodToVerb < ActiveRecord::Migration
+class RenameMethodToVerb < ActiveRecord::Migration[4.2]
   def self.up
     rename_column :doubles, :method, :verb
   end

data/db/migrate/20111021113953_add_status_to_doubles.rb

@@ -1,4 +1,4 @@
-class AddStatusToDoubles < ActiveRecord::Migration
+class AddStatusToDoubles < ActiveRecord::Migration[4.2]
   def self.up
     add_column :doubles, :status, :integer
   end

data/db/migrate/20111208155906_add_response_headers_to_doubles.rb

@@ -1,4 +1,4 @@
-class AddResponseHeadersToDoubles < ActiveRecord::Migration
+class AddResponseHeadersToDoubles < ActiveRecord::Migration[4.2]
   def self.up
     add_column :doubles, :response_headers, :string
   end

data/db/migrate/20120320200820_change_fullpath_to_text.rb

@@ -1,4 +1,4 @@
-class ChangeFullpathToText < ActiveRecord::Migration
+class ChangeFullpathToText < ActiveRecord::Migration[4.2]
   def self.up
     change_column :doubles, :fullpath, :text
   end

data/db/migrate/20170713000515_add_delay_to_doubles.rb

@@ -1,4 +1,4 @@
-class AddDelayToDoubles < ActiveRecord::Migration
+class AddDelayToDoubles < ActiveRecord::Migration[4.2]
   def self.up
     add_column :doubles, :delay, :integer
   end

data/db/migrate/20170818001158_add_pathpattern_to_doubles.rb

@@ -1,4 +1,4 @@
-class AddPathpatternToDoubles < ActiveRecord::Migration
+class AddPathpatternToDoubles < ActiveRecord::Migration[4.2]
   def self.up
     add_column :doubles, :pathpattern, :text
   end

data/features/rest_api/doubles.feature

@@ -34,7 +34,7 @@ Feature: use doubles via api
   Scenario Outline: request fullpath that matches double
     Given there is double with "<fullpath>" as fullpath, "<content>" as response content, "<verb>" as request verb and "<status>" as status
     When I "<verb>" "<fullpath>"
-    Then I should get "<status>" as response status and "<content>" in response content
+    Then I should get <status> as response status and "<content>" in response content
 
     Examples:
       | fullpath           | content      | verb   | status |
@@ -48,7 +48,7 @@ Feature: use doubles via api
   Scenario Outline: request a path that matches double a path pattern
     Given there is double with "<pathpattern>" as pathpattern, "<content>" as response content, "<verb>" as request verb and "<status>" as status
     When I "<verb>" "<fullpath>"
-    Then I should get "<status>" as response status and "<content>" in response content
+    Then I should get <status> as response status and "<content>" in response content
 
     Examples:
       | pathpattern                   | fullpath            | content      | verb | status |

data/features/ruby_api/wait_for_requests.feature

@@ -24,7 +24,7 @@ Feature: wait for requests on double to happen
     @double.wait_for_requests(3)
     """
     And that double gets requested 2 times
-    Then it should wait for 5 seconds (default timeout)
+    Then it should wait for default timeout of 5 seconds
     And it should raise MoreRequestsExpected error after with the following message:
     """
     Expected 3 requests. Got 2.

data/features/step_definitions/doubles_steps.rb

@@ -24,16 +24,16 @@ Then /^I should be able to get json representation of that double from response$
   JSON.load( @create_a_double_response ).should == MultiJson.load( d.to_json )
 end
 
-Then /^I should get (#{CAPTURE_A_NUMBER}) in response status$/ do |status|
+Then /^I should get {int} in response status$/ do |status|
   last_response.status.should == status
 end
 
-Then /^there should be (#{CAPTURE_A_NUMBER}) double with "([^""]*)" as fullpath, "([^""]*)" as response content, "([^""]*)" as request verb, status as "(#{CAPTURE_A_NUMBER})" and delay as "(#{CAPTURE_A_NUMBER})"$/ do |n, fullpath, content, verb, status, delay|
-  RestAssured::Models::Double.where(:fullpath => fullpath, :content => content, :verb => verb, :status => status, :delay => delay).count.should == n
+Then "there should be {int} double with {string} as fullpath, {string} as response content, {string} as request verb, status as {string} and delay as {string}" do |n, fullpath, content, verb, status, delay|
+  RestAssured::Models::Double.where(:fullpath => fullpath, :content => content, :verb => verb, :status => status.to_i, :delay => delay.to_i).count.should == n
 end
 
-Then /^there should be (#{CAPTURE_A_NUMBER}) double with "([^""]*)" as pathpattern, "([^""]*)" as response content, "([^""]*)" as request verb, status as "(#{CAPTURE_A_NUMBER})" and delay as "(#{CAPTURE_A_NUMBER})"$/ do |n, pathpattern, content, verb, status, delay|
-  RestAssured::Models::Double.where(:pathpattern => pathpattern, :content => content, :verb => verb, :status => status, :delay => delay).count.should == n
+Then "there should be {int} double with {string} as pathpattern, {string} as response content, {string} as request verb, status as {string} and delay as {string}" do |n, pathpattern, content, verb, status, delay|
+  RestAssured::Models::Double.where(:pathpattern => pathpattern, :content => content, :verb => verb, :status => status.to_i, :delay => delay.to_i).count.should == n
 end
 
 Given /^there is double with "([^"]*)" as fullpath and "([^"]*)" as response content$/ do |fullpath, content|
@@ -64,8 +64,16 @@ When /^I "([^"]*)" "([^"]*)"$/ do |verb, fullpath|
   send(verb.downcase, fullpath)
 end
 
-Then /^I should get (?:"(#{CAPTURE_A_NUMBER})" as response status and )?"([^"]*)" in response content$/ do |status, content|
-  last_response.status.should == status if status.present?
+Then "I should get {string} in response content" do |content|
+  last_response.body.should == content
+end
+
+Then "I should get {int} in response status" do |status|
+  last_response.status.should == status
+end
+
+Then "I should get {int} as response status and {string} in response content" do |status, content|
+  last_response.status.should == status
   last_response.body.should == content
 end
 

data/features/step_definitions/ruby_api_steps.rb

@@ -24,7 +24,7 @@ Given /^I created? a double:$/ do |string|
   eval string
 end
 
-When /^that double gets requested (#{CAPTURE_A_NUMBER}) times$/ do |num|
+When "that double gets requested {int} times" do |num|
   num.times do
     sleep 0.5
     send(@double.verb.downcase, @double.fullpath)
@@ -50,10 +50,9 @@ Then /^it should let me through$/ do
   @more_reqs_exc.should == nil
 end
 
-Then /^it should wait for (#{CAPTURE_A_NUMBER}) seconds(?: \(default timeout\))?$/ do |timeout|
+Then 'it should wait for (default timeout of ){int} seconds' do |timeout|
   @t.join
   wait_time = Time.now - @wait_start
-  #(timeout..(timeout+1)).should cover(wait_time) # cover() only avilable in 1.9
   wait_time.should >= timeout
   wait_time.should < timeout + 1.5
 end

data/features/support/env.rb

@@ -44,7 +44,6 @@ db_opts = {
 RestAssured::Config.build(db_opts)
 
 require 'rest-assured'
-require 'shoulda-matchers'
 
 RestAssured::Server.start(db_opts.merge(:port => 19876))
 

data/lib/rest-assured/routes/double.rb

@@ -17,7 +17,7 @@ module RestAssured
         redirect to('/doubles')
       end
 
-      router.get %r{^/doubles(\.json)?$} do |needs_json|
+      router.get %r{/doubles(\.json)?} do |needs_json|
         @doubles = Models::Double.all
         if needs_json
           body @doubles.to_json
@@ -40,7 +40,7 @@ module RestAssured
         end
       end
 
-      router.post /^\/doubles(\.json)?$/ do |needs_json|
+      router.post /\/doubles(\.json)?/ do |needs_json|
         begin
           data = request.body.read
           d = JSON.load(data)
@@ -101,7 +101,7 @@ module RestAssured
         end
       end
 
-      router.delete %r{/doubles/(\d+)(\.json)?$} do |id, needs_json|
+      router.delete %r{/doubles/(\d+)(\.json)?} do |id, needs_json|
         if Models::Double.destroy(id)
           flash[:notice] = 'Double deleted'
           redirect '/doubles' unless needs_json

data/lib/rest-assured/routes/redirect.rb

@@ -11,7 +11,7 @@ module RestAssured
         haml :'redirects/new'
       end
 
-      router.post /^\/redirects(.json)?$/ do |needs_json|
+      router.post /\/redirects(.json)?/ do |needs_json|
         @redirect = Models::Redirect.create(params['redirect'] || { :pattern => params['pattern'], :to => params['to'] })
 
         if needs_json

data/lib/rest-assured/version.rb

@@ -1,3 +1,3 @@
 module RestAssured
-  VERSION = '2.2.0'
+  VERSION = '3.0.0'
 end

data/spec/functional/response_spec.rb

@@ -57,8 +57,6 @@ module RestAssured
         fullpath = '/some/other/path'
         allow(request).to receive(:fullpath).and_return(fullpath)
         allow(Models::Redirect).to receive(:find_redirect_url_for).with(fullpath).and_return(path)
-        puts "PATH"
-        puts path
 
         expect(rest_assured_app).to receive(:body).with(@double.content)
         expect(rest_assured_app).to receive(:status).with(@double.status)
@@ -133,7 +131,7 @@ module RestAssured
       requests = double.as_null_object
       allow(Models::Double).to  receive(:where).and_return(double(:requests => requests, :delay => 10).as_null_object)
 
-      Response.stub(:sleep)
+      allow(Response).to receive(:sleep)
       expect(Response).to receive(:sleep).with(10)
 
       Response.perform(rest_assured_app)

data/spec/models/double_spec.rb

@@ -17,11 +17,6 @@ module RestAssured::Models
       valid_params.except(:fullpath).merge(:pathpattern => /^\/api\/.*\/[a-zA-Z]\?nocache=true/)
     end
 
-    it { is_expected.to validate_inclusion_of(:verb).in_array Double::VERBS }
-    it { is_expected.to validate_inclusion_of(:status).in_array Double::STATUSES }
-
-    it { is_expected.to have_many(:requests) }
-
     it 'rejects double with neither fullpath or pathpattern' do
       d = Double.new valid_params.except(:fullpath)
       expect(d).to_not be_valid

data/spec/models/redirect_spec.rb

@@ -2,14 +2,6 @@ require File.expand_path('../../spec_helper', __FILE__)
 
 module RestAssured::Models
   describe Redirect do
-    # this is solely to get through 'Can't find first XXX' shoulda crap
-    #before do
-    #Redirect.create :pattern => 'sdfsdf', :to => 'sdfsffdf'
-    #end
-
-    it { is_expected.to validate_presence_of(:pattern) }
-    it { is_expected.to validate_presence_of(:to) }
-
     it 'assigns incremental position on create' do
       r1 = Redirect.create :pattern => '.*', :to => 'someurl'
       expect(r1.position).to eq(0)
@@ -38,20 +30,20 @@ module RestAssured::Models
     context 'redirect url' do
       it 'constructs url to redirect to' do
         path = rand(1000)
-        r = Redirect.create :pattern => '/api/(.*)\?.*', :to => 'http://external.com/some/url/\1?p=5'
+        Redirect.create :pattern => '/api/(.*)\?.*', :to => 'http://external.com/some/url/\1?p=5'
         expect(Redirect.find_redirect_url_for("/api/#{path}?param=1")).to eq("http://external.com/some/url/#{path}?p=5")
       end
 
       it 'returns the one that matches the substring' do
-        r1 = Redirect.create :pattern => '/ai/path', :to => 'someurl'
-        r2 = Redirect.create :pattern => '/api/path', :to => 'someurl'
+        Redirect.create :pattern => '/ai/path', :to => 'someurl'
+        Redirect.create :pattern => '/api/path', :to => 'someurl'
 
         expect(Redirect.find_redirect_url_for('/api/path')).to eq('someurl')
       end
 
       it 'returns the oldest one that match' do
-        r1 = Redirect.create :pattern => '/api', :to => 'someurl'
-        r2 = Redirect.create :pattern => '/api/path', :to => 'otherurl'
+        Redirect.create :pattern => '/api', :to => 'someurl'
+        Redirect.create :pattern => '/api/path', :to => 'otherurl'
 
         expect(Redirect.find_redirect_url_for('/api/path')).to eq('someurl/path')
       end

data/spec/models/request_spec.rb

@@ -2,9 +2,6 @@ require File.expand_path('../../spec_helper', __FILE__)
 
 module RestAssured::Models
   describe Request do
-    it { is_expected.to belong_to(:double) }
-    it { is_expected.to validate_presence_of(:rack_env) }
-
     it 'knows when it has been created' do
       now = Time.now
       allow(Time).to receive(:now).and_return(now)

data/spec/spec_helper.rb

@@ -30,7 +30,6 @@ RestAssured::Config.build(DB_OPTS)
 
 require 'rest-assured'
 require 'rest-assured/application'
-require 'shoulda/matchers'
 
 Capybara.app = RestAssured::Application
 

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: rest-assured
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Artem Avetisyan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-29 00:00:00.000000000 Z
+date: 2017-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: childprocess
   requirement: !ruby/object:Gem::Requirement
@@ -56,44 +62,62 @@ dependencies:
   name: haml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: activeresource
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement
@@ -149,7 +173,6 @@ files:
 - features/step_definitions/doubles_steps.rb
 - features/step_definitions/redirect_rules_steps.rb
 - features/step_definitions/ruby_api_steps.rb
-- features/step_definitions/support/numeric_transforms.rb
 - features/support/env.rb
 - features/support/world_helpers.rb
 - features/web_ui/doubles.feature
@@ -223,7 +246,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -263,7 +286,6 @@ test_files:
 - features/step_definitions/doubles_steps.rb
 - features/step_definitions/redirect_rules_steps.rb
 - features/step_definitions/ruby_api_steps.rb
-- features/step_definitions/support/numeric_transforms.rb
 - features/support/env.rb
 - features/support/world_helpers.rb
 - features/web_ui/doubles.feature

data/features/step_definitions/support/numeric_transforms.rb

@@ -1,3 +0,0 @@
-CAPTURE_A_NUMBER = Transform /^\d+$/ do |n|
-  n.to_i
-end