rest-assured 0.2.0.rc4 → 0.2.0.rc5

data/Guardfile

@@ -4,7 +4,7 @@
 guard 'spork', :cucumber_env => { 'RACK_ENV' => 'test' }, :rspec_env => { 'RACK_ENV' => 'test' } do
   watch('Gemfile')
   watch('Gemfile.lock')
-  watch('spec/spec_helper.rb')
+  watch(%r{spec/.+\.rb})
   watch(%r{features/support/.+\.rb$})
   watch(%r{^lib/.+\.rb$})
 end

data/db/migrate/20111021113953_add_status_to_doubles.rb

@@ -0,0 +1,9 @@
+class AddStatusToDoubles < ActiveRecord::Migration
+  def self.up
+    add_column :doubles, :status, :integer
+  end
+
+  def self.down
+    remove_column :doubles, :status
+  end
+end

data/features/doubles_via_api.feature

@@ -3,29 +3,32 @@ Feature: use doubles via api
   As a developer
   I want to mock rest services my app is consuming from
 
+  @now
   Scenario Outline: create double
-    When I create a double with "<fullpath>" as fullpath, "<content>" as response content and "<verb>" as request verb
-    Then there should be 1 double with "<fullpath>" as fullpath, "<content>" as response content and "<result_verb>" as request verb
+    When I create a double with "<fullpath>" as fullpath, "<content>" as response content, "<verb>" as request verb and status as "<status>"
+    Then there should be 1 double with "<fullpath>" as fullpath, "<content>" as response content, "<result_verb>" as request verb and status as "<result_status>"
 
     Examples:
-      | fullpath           | content      | verb | result_verb |
-      | /api/something     | created      | POST   | POST          |
-      | /api/sss           | changed      | PUT    | PUT           |
-      | /api/asdfsf        | removed      | DELETE | DELETE        |
-      | /api/some          | text content | GET    | GET           |
-      | /api/some?a=3&b=dd | more content |        | GET           |
+      | fullpath           | content      | verb   | result_verb | status | result_status |
+      | /api/something     | created      | POST   | POST        | 200    | 200           |
+      | /api/sss           | changed      | PUT    | PUT         | 201    | 201           |
+      | /api/asdfsf        | removed      | DELETE | DELETE      | 300    | 300           |
+      | /api/some          | text content | GET    | GET         | 303    | 303           |
+      | /api/some?a=3&b=dd | more content |        | GET         |        | 200           |
+      | /api/empty         |              | POST   | POST        |        | 200           |
 
   Scenario Outline: request fullpath that matches double
-    Given there is double with "<fullpath>" as fullpath, "<content>" as response content and "<verb>" as request verb
+    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 "<content>" in response content
+    Then I should get "<status>" as response status and "<content>" in response content
 
     Examples:
-      | fullpath           | content      | verb |
-      | /api/something     | created      | POST   |
-      | /api/sss           | changed      | PUT    |
-      | /api/asdfsf        | removed      | DELETE |
-      | /api/some?a=3&b=dd | more content | GET    |
+      | fullpath           | content      | verb   | status |
+      | /api/something     | created      | POST   | 200    |
+      | /api/sss           | changed      | PUT    | 201    |
+      | /api/asdfsf        | removed      | DELETE | 202    |
+      | /api/some?a=3&b=dd | more content | GET    | 203    |
+      | /other/api         |              | GET    | 303    |
 
   # current rule: last added double gets picked
   Scenario Outline: request fullpath that matches multiple doubles

data/features/step_definitions/doubles_steps.rb

@@ -9,25 +9,25 @@ When /^I create a double with "([^"]*)" as fullpath and "([^"]*)" as response co
   last_response.should be_ok
 end
 
-When /^I create a double with "([^"]*)" as fullpath, "([^"]*)" as response content and "([^"]*)" as request verb$/ do |fullpath, content, verb|
-  post '/doubles', { :fullpath => fullpath, :content => content, :verb => verb }
+When /^I create a double with "([^""]*)" as fullpath, "([^""]*)" as response content, "([^""]*)" as request verb and status as "([^""]*)"$/ do |fullpath, content, verb, status|
+  post '/doubles', { :fullpath => fullpath, :content => content, :verb => verb, :status => status }
   last_response.should be_ok
 end
 
 Then /^there should be (#{CAPTURE_A_NUMBER}) double with "([^"]*)" as fullpath and "([^"]*)" as response content$/ do |n, fullpath, content|
-  Double.where(:fullpath => fullpath, :content => content).count.should == 1
+  Double.where(:fullpath => fullpath, :content => content).count.should == n
 end
 
-Then /^there should be (#{CAPTURE_A_NUMBER}) double with "([^"]*)" as fullpath, "([^"]*)" as response content and "([^"]*)" as request verb$/ do |n, fullpath, content, verb|
-  Double.where(:fullpath => fullpath, :content => content, :verb => verb).count.should == n
+Then /^there should be (#{CAPTURE_A_NUMBER}) double with "([^""]*)" as fullpath, "([^""]*)" as response content, "([^""]*)" as request verb and status as "(#{CAPTURE_A_NUMBER})"$/ do |n, fullpath, content, verb, status|
+  Double.where(:fullpath => fullpath, :content => content, :verb => verb, :status => status).count.should == n
 end
 
 Given /^there is double with "([^"]*)" as fullpath and "([^"]*)" as response content$/ do |fullpath, content|
   Double.create(:fullpath => fullpath, :content => content)
 end
 
-Given /^there is double with "([^"]*)" as fullpath, "([^"]*)" as response content and "([^"]*)" as request verb$/ do |fullpath, content, verb|
-  Double.create(:fullpath => fullpath, :content => content, :verb => verb)
+Given /^there is double with "([^"]*)" as fullpath, "([^"]*)" as response content, "([^"]*)" as request verb and "([^"]*)" as status$/ do |fullpath, content, verb, status|
+  Double.create(:fullpath => fullpath, :content => content, :verb => verb, :status => status)
 end
 
 Given /^I register "([^"]*)" as fullpath and "([^"]*)" as response content$/ do |fullpath, content|
@@ -43,7 +43,8 @@ When /^I "([^"]*)" "([^"]*)"$/ do |verb, fullpath|
   send(verb.downcase, fullpath)
 end
 
-Then /^I should get "([^"]*)" in response content$/ do |content|
+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?
   last_response.body.should == content
 end
 

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

@@ -1,13 +1,18 @@
+require 'net/http'
+
 class Double < ActiveRecord::Base
-  attr_accessible :fullpath, :content, :description, :verb
+  attr_accessible :fullpath, :content, :description, :verb, :status
 
-  METHODS = %w{GET POST PUT DELETE}
+  VERBS = %w{GET POST PUT DELETE}
+  STATUSES = Net::HTTPResponse::CODE_TO_OBJ.keys.map(&:to_i)
 
-  validates_presence_of :fullpath, :content
-  validates_inclusion_of :verb, :in => METHODS
+  validates_presence_of :fullpath
+  validates_inclusion_of :verb, :in => VERBS
+  validates_inclusion_of :status, :in => STATUSES
 
   before_save :toggle_active
   before_validation :set_verb
+  before_validation :set_status
   after_destroy :set_active
 
   has_many :requests
@@ -25,6 +30,10 @@ class Double < ActiveRecord::Base
       self.verb = 'GET' unless verb.present?
     end
 
+    def set_status
+      self.status = 200 unless status.present?
+    end
+
     def set_active
       if active && f = Double.where(:fullpath => fullpath).last
         f.active = true

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

@@ -27,7 +27,7 @@ module RestAssured
       end
 
       router.post /^\/doubles(\.json)?$/ do |passes_json|
-        f = { :fullpath => params['fullpath'], :content => params['content'], :description => params['description'], :verb => params['verb'] }
+        f = { :fullpath => params['fullpath'], :content => params['content'], :description => params['description'], :verb => params['verb'], :status => params['status'] }
 
         @double = Double.create(passes_json ? JSON.parse(request.body.read)['double'] : ( params['double'] || f )) 
 

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

@@ -10,6 +10,7 @@ class Response
       d.requests.create!(:rack_env => env.to_json, :body => body, :params => request.params.to_json)
 
       app.body d.content
+      app.status d.status
     elsif r = Redirect.ordered.find { |r| request.fullpath =~ /#{r.pattern}/ }
       app.redirect( "#{r.to}#{request.fullpath}" )
     else

data/lib/rest-assured/version.rb

@@ -1,3 +1,3 @@
 module RestAssured
-  VERSION = '0.2.0.rc4'
+  VERSION = '0.2.0.rc5'
 end

data/spec/custom_matchers.rb

@@ -0,0 +1,7 @@
+RSpec::Matchers.define :validate_inclusion_of do |field, list|
+  match do |actual|
+    list.each do |i|
+      actual.should allow_value(i).for(field)
+    end
+  end
+end

data/spec/functional/double_routes_spec.rb

@@ -2,13 +2,13 @@ require File.expand_path('../../spec_helper', __FILE__)
 
 describe 'Double routes' do
   let :test_double do
-    { :fullpath => '/api/google?a=5', :content => 'some awesome content', :verb => 'POST' }
+    { :fullpath => '/api/google?a=5', :content => 'some awesome content', :verb => 'POST', :status => '201' }
   end
   let :valid_params do
-    { 'double[fullpath]' =>  test_double[:fullpath], 'double[content]' => test_double[:content], 'double[verb]' => test_double[:verb] }
+    { 'double[fullpath]' =>  test_double[:fullpath], 'double[content]' => test_double[:content], 'double[verb]' => test_double[:verb], 'double[status]' => test_double[:status] }
   end
   let :invalid_params do
-    { 'double[fullpath]' =>  test_double[:fullpath] }
+    valid_params.except('double[fullpath]')
   end
 
   describe "through ui", :ui => true do
@@ -46,7 +46,7 @@ describe 'Double routes' do
       post '/doubles', invalid_params
 
       last_response.should be_ok
-      last_response.body.should =~ /Crumps!.*Content can't be blank/
+      last_response.body.should =~ /Crumps!.*Fullpath can't be blank/
     end
 
     it "brings up double edit form" do
@@ -99,10 +99,10 @@ describe 'Double routes' do
     end
 
     it "reports failure when creating with invalid parameters" do
-      post '/doubles', test_double.except(:content)
+      post '/doubles', test_double.except(:fullpath)
 
       last_response.should_not be_ok
-      last_response.body.should =~ /\{"content":\["can't be blank"\]\}/
+      last_response.body.should =~ /\{"fullpath":\["can't be blank"\]\}/
     end
 
     it "deletes all doubles" do
@@ -125,10 +125,10 @@ describe 'Double routes' do
     end
 
     it "reports failure when creating with invalid parameters" do
-      post '/doubles.json', { :double => test_double.except(:content) }.to_json, 'CONTENT_TYPE' => 'Application/json'
+      post '/doubles.json', { :double => test_double.except(:fullpath) }.to_json, 'CONTENT_TYPE' => 'Application/json'
 
       last_response.should_not be_ok
-      last_response.body.should =~ /\{"content":\["can't be blank"\]\}/
+      last_response.body.should =~ /\{"fullpath":\["can't be blank"\]\}/
     end
 
     it 'loads double as AR resource' do

data/spec/functional/response_spec.rb

@@ -22,12 +22,32 @@ describe Response do
   }
   let(:rest_assured_app) { double('App', :request => request).as_null_object }
 
-  it "returns double content if an active one found with the same fullpath and the same method as request" do
-    d = Double.create :fullpath => '/some/path', :content => 'content' 
-    request.stub(:fullpath).and_return(d.fullpath)
+  context 'when double matches request' do
+    before do
+      @double = Double.create :fullpath => '/some/path', :content => 'content', :status => 201
+      request.stub(:fullpath).and_return(@double.fullpath)
+    end
 
-    rest_assured_app.should_receive(:body).with(d.content)
-    Response.perform(rest_assured_app)
+    it "returns double content" do
+      rest_assured_app.should_receive(:body).with(@double.content)
+
+      Response.perform(rest_assured_app)
+    end
+
+    it 'sets response status to the one from double' do
+      rest_assured_app.should_receive(:status).with(@double.status)
+
+      Response.perform(rest_assured_app)
+    end
+
+    it 'records request' do
+      requests = double
+      Double.stub_chain('where.first').and_return(double(:requests => requests).as_null_object)
+
+      requests.should_receive(:create!).with(:rack_env => 'env', :body => 'body', :params => 'params')
+
+      Response.perform(rest_assured_app)
+    end
   end
 
   it "redirects if double not hit but there is redirect that matches request" do
@@ -46,15 +66,6 @@ describe Response do
     Response.perform(rest_assured_app)
   end
 
-  it 'records request if double matches' do
-    requests = double
-    Double.stub_chain('where.first').and_return(double(:requests => requests).as_null_object)
-
-    requests.should_receive(:create!).with(:rack_env => 'env', :body => 'body', :params => 'params')
-
-    Response.perform(rest_assured_app)
-  end
-
   it 'excludes "rack.input" and "rack.errors" as they break with "IOError - not opened for reading:" on consequent #to_json (as they are IO and StringIO)' do
     requests = double.as_null_object
     Double.stub_chain('where.first').and_return(double(:requests => requests).as_null_object)

data/spec/models/double_spec.rb

@@ -2,19 +2,34 @@ require File.expand_path('../../spec_helper', __FILE__)
 
 describe Double do
   let :valid_params do
-    { :fullpath => '/some/api', :content => 'some content', :verb => 'GET' }
+    { :fullpath => '/some/api', :content => 'some content', :verb => 'GET', :status => '303' }
   end
 
   it { should validate_presence_of(:fullpath) }
-  it { should validate_presence_of(:content) }
-  #it { should ensure_inclusion_of(:verb).in(Double::METHODS) }
+  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 have_many(:requests) }
 
+  it 'creates double with valid params' do
+    d = Double.new valid_params
+    d.should be_valid
+  end
+
   it "defaults verb to GET" do
     f = Double.create valid_params.except(:verb)
     f.verb.should == 'GET'
   end
 
+  it "defaults status to 200" do
+    f = Double.create valid_params.except(:status)
+    f.status.should == 200
+  end
+
   it "makes double active by default" do
     f = Double.create valid_params.except(:active)
     f.active.should be true

data/spec/models/redirect_spec.rb

@@ -8,6 +8,9 @@ describe Redirect do
 
   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) }
   # commented out since it doesn't work with :allow_blank => true
   #it { should validate_uniqueness_of(:position) }
 

data/spec/spec_helper.rb

@@ -7,6 +7,7 @@ Spork.prefork do
   require 'capybara/rspec'
   require 'rack/test'
   require 'database_cleaner'
+  require File.expand_path('../custom_matchers', __FILE__)
 
   ENV['RACK_ENV'] = 'test'
 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: rest-assured
 version: !ruby/object:Gem::Version 
-  hash: 15424061
+  hash: 15424063
   prerelease: 6
   segments: 
   - 0
   - 2
   - 0
   - rc
-  - 4
-  version: 0.2.0.rc4
+  - 5
+  version: 0.2.0.rc5
 platform: ruby
 authors: 
 - Artem Avetisyan
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-20 00:00:00 Z
+date: 2011-10-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sinatra
@@ -158,6 +158,7 @@ files:
 - db/migrate/20110912163705_rename_fixtures_to_doubles.rb
 - db/migrate/20111013122857_create_requests.rb
 - db/migrate/20111016174101_rename_method_to_verb.rb
+- db/migrate/20111021113953_add_status_to_doubles.rb
 - features/call_history.feature
 - features/doubles_via_api.feature
 - features/doubles_via_ui.feature
@@ -204,6 +205,7 @@ files:
 - public/javascript/jquery.jgrowl_minimized.js
 - rest-assured.gemspec
 - spec/client/resource_double_spec.rb
+- spec/custom_matchers.rb
 - spec/functional/double_routes_spec.rb
 - spec/functional/redirect_routes_spec.rb
 - spec/functional/response_spec.rb
@@ -274,6 +276,7 @@ test_files:
 - features/support/selenium-fix.rb
 - features/support/test-server.rb
 - spec/client/resource_double_spec.rb
+- spec/custom_matchers.rb
 - spec/functional/double_routes_spec.rb
 - spec/functional/redirect_routes_spec.rb
 - spec/functional/response_spec.rb