rest-assured 2.0.0 → 2.0.1

data/spec/models/double_spec.rb

@@ -12,35 +12,30 @@ module RestAssured::Models
       }
     end
 
-    it { should validate_presence_of(:fullpath) }
-    it { should validate_inclusion_of(:verb, Double::VERBS) }
-    it { should validate_inclusion_of(:status, Double::STATUSES) }
-    it { should allow_mass_assignment_of(:fullpath) }
-    it { should allow_mass_assignment_of(:content) }
-    it { should allow_mass_assignment_of(:verb) }
-    it { should allow_mass_assignment_of(:status) }
-    it { should allow_mass_assignment_of(:response_headers) }
+    it { is_expected.to validate_presence_of(:fullpath) }
+    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 { should have_many(:requests) }
+    it { is_expected.to have_many(:requests) }
 
     it 'creates double with valid params' do
       d = Double.new valid_params
-      d.should be_valid
+      expect(d).to be_valid
     end
 
     it "defaults verb to GET" do
       f = Double.create valid_params.except(:verb)
-      f.verb.should == 'GET'
+      expect(f.verb).to eq('GET')
     end
 
     it "defaults status to 200" do
       f = Double.create valid_params.except(:status)
-      f.status.should == 200
+      expect(f.status).to eq(200)
     end
 
     it "makes double active by default" do
       f = Double.create valid_params.except(:active)
-      f.active.should be true
+      expect(f.active).to be true
     end
 
     describe 'when created' do
@@ -50,10 +45,10 @@ module RestAssured::Models
         f3 = Double.create valid_params.merge(:fullpath => '/some/other/api')
         f4 = Double.create valid_params.merge(:verb => 'POST')
 
-        f1.reload.active.should be false
-        f2.reload.active.should be true
-        f3.reload.active.should be true
-        f4.reload.active.should be true
+        expect(f1.reload.active).to be false
+        expect(f2.reload.active).to be true
+        expect(f3.reload.active).to be true
+        expect(f4.reload.active).to be true
       end
     end
 
@@ -67,9 +62,9 @@ module RestAssured::Models
         f1.active = true
         f1.save
 
-        f2.reload.active.should be false
-        f3.reload.active.should be true
-        f4.reload.active.should be true
+        expect(f2.reload.active).to be false
+        expect(f3.reload.active).to be true
+        expect(f4.reload.active).to be true
       end
 
       it "makes other doubles inactive only when active bit set to true" do
@@ -81,17 +76,17 @@ module RestAssured::Models
         f1.reload.save
         f2.reload.save
 
-        f1.reload.active.should be false
-        f2.reload.active.should be true
-        f3.reload.active.should be true
-        f4.reload.active.should be true
+        expect(f1.reload.active).to be false
+        expect(f2.reload.active).to be true
+        expect(f3.reload.active).to be true
+        expect(f4.reload.active).to be true
       end
 
       it "handles long paths (more than 255 characters)" do
         long_path = 'a' * 260
         f1 = Double.create valid_params.merge(:fullpath => long_path)
         f1.reload.save
-        f1.reload.fullpath.should == long_path
+        expect(f1.reload.fullpath).to eq(long_path)
       end
     end
 
@@ -103,8 +98,8 @@ module RestAssured::Models
           f3 = Double.create valid_params.merge(:fullpath => '/some/other/api')
 
           f2.destroy
-          f1.reload.active.should be true
-          f3.reload.active.should be true
+          expect(f1.reload.active).to be true
+          expect(f3.reload.active).to be true
         end
       end
     end

data/spec/models/redirect_spec.rb

@@ -7,56 +7,53 @@ module RestAssured::Models
     #Redirect.create :pattern => 'sdfsdf', :to => 'sdfsffdf'
     #end
 
-    it { should validate_presence_of(:pattern) }
-    it { should validate_presence_of(:to) }
-    it { should allow_mass_assignment_of(:pattern) }
-    it { should allow_mass_assignment_of(:to) }
-    it { should allow_mass_assignment_of(:position) }
+    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'
-      r1.position.should == 0
+      expect(r1.position).to eq(0)
 
       r2 = Redirect.create :pattern => '.*', :to => 'someurl'
-      r2.position.should == 1
+      expect(r2.position).to eq(1)
 
       r2.position = 4
       r2.save
 
       r3 = Redirect.create :pattern => '.*', :to => 'someurl'
-      r3.position.should == 5
+      expect(r3.position).to eq(5)
     end
 
     it 'updates order (with which redirects picked up for matching request)' do
       r1 = Redirect.create :pattern => '.*', :to => 'somewhere', :position => 0
       r2 = Redirect.create :pattern => '.*', :to => 'somewhere', :position => 1
 
-      Redirect.update_order([r2.id, r1.id]).should be true
-      r1.reload.position.should == 1
-      r2.reload.position.should == 0
+      expect(Redirect.update_order([r2.id, r1.id])).to be true
+      expect(r1.reload.position).to eq(1)
+      expect(r2.reload.position).to eq(0)
 
-      Redirect.update_order([nil, 34]).should == false
+      expect(Redirect.update_order([nil, 34])).to eq(false)
     end
 
     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.find_redirect_url_for("/api/#{path}?param=1").should == "http://external.com/some/url/#{path}?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.find_redirect_url_for('/api/path').should == '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.find_redirect_url_for('/api/path').should == 'someurl/path'
+        expect(Redirect.find_redirect_url_for('/api/path')).to eq('someurl/path')
       end
     end
   end

data/spec/models/request_spec.rb

@@ -2,15 +2,15 @@ require File.expand_path('../../spec_helper', __FILE__)
 
 module RestAssured::Models
   describe Request do
-    it { should belong_to(:double) }
-    it { should validate_presence_of(:rack_env) }
+    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
-      Time.stub(:now).and_return(now)
+      allow(Time).to receive(:now).and_return(now)
       r = Request.create(:body => 'sdfsd', :rack_env => 'headers')
 
-      r.created_at.should == now
+      expect(r.created_at).to eq(now)
     end
   end
 end

data/spec/port_explorer_spec.rb

@@ -5,7 +5,7 @@ module RestAssured::Utils
   describe PortExplorer do
     it 'finds free tcp port' do
       free_port = PortExplorer.free_port
-      lambda { Net::HTTP.get('127.0.0.1', '/', free_port) }.should raise_error(Errno::ECONNREFUSED)
+      expect { Net::HTTP.get('127.0.0.1', '/', free_port) }.to raise_error(Errno::ECONNREFUSED)
     end
 
     it 'knows if port is in use' do
@@ -20,13 +20,13 @@ module RestAssured::Utils
       end
       sleep 0.5
 
-      PortExplorer.port_free?(port).should == false
+      expect(PortExplorer.port_free?(port)).to eq(false)
     end
 
     it 'knows that port is free' do
       port = PortExplorer.free_port
 
-      PortExplorer.port_free?(port).should == true
+      expect(PortExplorer.port_free?(port)).to eq(true)
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+ENV['RACK_ENV'] = 'test'
+
 if ENV['COVERAGE']
   begin
     require 'simplecov'
@@ -15,13 +17,26 @@ $:.unshift(File.expand_path('../../lib'), __FILE__)
 require 'rspec'
 require 'capybara/rspec'
 require 'rack/test'
-require 'database_cleaner'
 require 'awesome_print'
+require 'rest-assured/config'
+
+DB_OPTS = { :adapter => 'postgresql' }
+RestAssured::Config.build(DB_OPTS)
+
+require 'rest-assured'
+require 'rest-assured/application'
+require 'shoulda/matchers'
+
+Capybara.app = RestAssured::Application
+
+def app
+  RestAssured::Application
+end
+
+require 'database_cleaner'
 require File.expand_path('../support/custom_matchers', __FILE__)
 require File.expand_path('../support/reset-singleton', __FILE__)
 
-ENV['RACK_ENV'] = 'test'
-
 module XhrHelpers
   def xhr(path, params = {})
     verb = params.delete(:as) || :get
@@ -35,12 +50,20 @@ RSpec.configure do |c|
   c.include Rack::Test::Methods
   c.include XhrHelpers
 
-  c.before(:each) do
-    DatabaseCleaner.start
+  c.before(:suite) do
+    DatabaseCleaner.strategy = :truncation
+    DatabaseCleaner.clean_with(:truncation)
   end
 
-  c.after(:each) do
-    DatabaseCleaner.clean
+  c.around(:each) do |example|
+    begin
+      DatabaseCleaner.cleaning do
+        example.run
+      end
+    rescue ActiveRecord::StatementInvalid
+      ActiveRecord::Base.connection.reconnect!
+      DatabaseCleaner.clean_with :truncation
+    end
   end
 
   c.before(:each, :ui => true) do
@@ -57,18 +80,3 @@ RSpec.configure do |c|
     end
   end
 end
-require 'rest-assured/config'
-DB_OPTS = { :adapter => 'mysql' }
-RestAssured::Config.build(DB_OPTS)
-
-require 'rest-assured'
-require 'rest-assured/application'
-require 'shoulda-matchers'
-
-Capybara.app = RestAssured::Application
-
-def app
-  RestAssured::Application
-end
-
-DatabaseCleaner.strategy = :truncation

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rest-assured
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Artem Avetisyan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-01 00:00:00.000000000 Z
+date: 2015-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -72,28 +72,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: activeresource
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement
@@ -116,21 +116,11 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
 - CHANGELOG
-- Gemfile
-- Gemfile.lock
-- Guardfile
 - LICENSE
-- Procfile
 - README.markdown
-- Rakefile
-- bin/console
-- bin/heroku_runner
 - bin/rest-assured
-- cucumber.yml
+- db/development.db
 - db/migrate/20110620161740_add_fixtures.rb
 - db/migrate/20110625155332_add_redirects_table.rb
 - db/migrate/20110709150645_add_description_to_fixtures.rb
@@ -144,6 +134,7 @@ files:
 - db/migrate/20111021113953_add_status_to_doubles.rb
 - db/migrate/20111208155906_add_response_headers_to_doubles.rb
 - db/migrate/20120320200820_change_fullpath_to_text.rb
+- db/test.db
 - features/command_line_options.feature
 - features/rest_api/doubles.feature
 - features/rest_api/redirects.feature
@@ -159,7 +150,6 @@ files:
 - features/step_definitions/ruby_api_steps.rb
 - features/step_definitions/support/numeric_transforms.rb
 - features/support/env.rb
-- features/support/test-server.rb
 - features/support/world_helpers.rb
 - features/web_ui/doubles.feature
 - features/web_ui/redirects.feature
@@ -196,7 +186,6 @@ files:
 - public/javascript/application.js
 - public/javascript/jquery.jgrowl_minimized.js
 - public/javascript/jquery.simulate.drag-sortable.js
-- rest-assured.gemspec
 - spec/api/app_session_spec.rb
 - spec/api/resource_double_spec.rb
 - spec/api/server_spec.rb
@@ -233,7 +222,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.8.7
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -241,11 +230,25 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rest-assured
-rubygems_version: 2.2.0
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Real stubs and spies for HTTP(S) services
 test_files:
+- spec/api/app_session_spec.rb
+- spec/api/resource_double_spec.rb
+- spec/api/server_spec.rb
+- spec/config_spec.rb
+- spec/functional/double_routes_spec.rb
+- spec/functional/redirect_routes_spec.rb
+- spec/functional/response_spec.rb
+- spec/models/double_spec.rb
+- spec/models/redirect_spec.rb
+- spec/models/request_spec.rb
+- spec/port_explorer_spec.rb
+- spec/spec_helper.rb
+- spec/support/custom_matchers.rb
+- spec/support/reset-singleton.rb
 - features/command_line_options.feature
 - features/rest_api/doubles.feature
 - features/rest_api/redirects.feature
@@ -261,22 +264,6 @@ test_files:
 - features/step_definitions/ruby_api_steps.rb
 - features/step_definitions/support/numeric_transforms.rb
 - features/support/env.rb
-- features/support/test-server.rb
 - features/support/world_helpers.rb
 - features/web_ui/doubles.feature
 - features/web_ui/redirects.feature
-- spec/api/app_session_spec.rb
-- spec/api/resource_double_spec.rb
-- spec/api/server_spec.rb
-- spec/config_spec.rb
-- spec/functional/double_routes_spec.rb
-- spec/functional/redirect_routes_spec.rb
-- spec/functional/response_spec.rb
-- spec/models/double_spec.rb
-- spec/models/redirect_spec.rb
-- spec/models/request_spec.rb
-- spec/port_explorer_spec.rb
-- spec/spec_helper.rb
-- spec/support/custom_matchers.rb
-- spec/support/reset-singleton.rb
-has_rdoc: