rest-assured 1.1.5 → 1.1.6

data/.gitignore

@@ -6,3 +6,4 @@ bundle_bin
 .sass-cache
 test.log
 coverage
+.rvmrc

data/Gemfile.lock

@@ -1,11 +1,12 @@
 PATH
   remote: .
   specs:
-    rest-assured (1.1.5)
+    rest-assured (1.1.6)
       activerecord (~> 3.2.0)
       activeresource (~> 3.2.0)
       childprocess (~> 0.3.0)
       haml (>= 3.1.3)
+      json
       sinatra (~> 1.3.2)
       sinatra-flash
 

data/README.markdown

@@ -6,20 +6,20 @@
 
 Stub/spy http(s) based external dependencies in your integration/acceptance tests.
 
-In a nutshell, here is how you can use it:
+In a nutshell, you can:
 
 * replace external data sources with predefined data (stubbing)
 * verify requests to external services (spying)
 * simulate different behavior of external services using web UI; useful in development
 
-Here is how it works. REST-assured starts a webapp that can be instructed (via ruby client library or plain REST api) to respond to any request in any way. You configure api endpoints of the application under test to point to that webapp instead of real dependencies. Then in your tests create doubles to match whatever the app is supposed to be requesting. Double is more than just a data stub, it also keeps track of its request history. So that it can be verified.
+Here is how it works. REST-assured starts an application that can be instructed (via ruby client library or plain REST api) to respond to any request with arbitrary content, status, headers, etc. Configure api endpoints of the application under test to point to that application instead of real services. Then in tests use the API (create doubles) that match requests your application is supposed to be firing. Either to stub content or to verify various aspects of how your application requests dependencies (headers, payload, etc).
 
 Check out [example](https://github.com/artemave/REST-assured-example)
 
 
 ## Set up
 
-You are going to need ruby >= 1.8.7 on Linux/MacOS. Also, either sqlite3, postgres or mysql is required.
+You are going to need ruby >= 1.8.7 on Linux/MacOS. Also, one of sqlite3, postgres or mysql.
 
 ### Ruby Client
 
@@ -39,7 +39,7 @@ RestAssured::Server.address = 'http://localhost:4578' # or wherever it is
 
 ### Standalone instance
 
-Rest-assured requires a database to run. Either sqlite, mysql or postgres. So, make sure there is one and its backed with corresponding client gem:
+Install db client gem:
 
     bash$ gem install sqlite3 # or mysql2 or pg
 
@@ -135,11 +135,13 @@ For those using REST-assured from non-ruby environments.
   
   Example:
 
+```
     bash$ curl -d 'fullpath=/api/something&content=awesome&response_headers%5BContent-Type%5D=text%2Fhtml' http://localhost:4578/doubles
     {"double":{"active":true,"content":"awesome","description":null,"fullpath":"/api/something","id":1,"response_headers":{"Content-Type":"text/html"},"status":200,"verb":"GET"}}
 
     bash$ curl http://localhost:4578/api/something
     awesome
+```
 
   If there is more than one double for the same fullpath and verb, the last created one gets served. In UI you can manually control which double is 'active' (gets served).
 

data/features/ruby_api/destroy_double.feature

@@ -0,0 +1,22 @@
+@ruby_api
+Feature: destroy double
+  As api user
+  I want to be able to destroy double 
+  So that I can emulate 'service gone' in the middle of a test
+
+  Scenario: list doubles
+    Given I created a double:
+    """
+    @double = RestAssured::Double.create :fullpath => 'path'
+    """
+
+    When I destroy that double:
+    """
+    @double.destroy
+    """
+
+    Then the following should be true:
+    """
+    RestAssured::Double.all.size.should == 0
+    """
+

data/features/ruby_api/list_doubles.feature

@@ -0,0 +1,21 @@
+@ruby_api
+Feature: list doubles
+  As api user
+  I want to be able to get list of doubles
+  So that I can do batch operations on them (e.g. remove doubles that match criteria)
+
+  Scenario: list doubles
+    Given there are the following doubles:
+      | fullpath |
+      | first    |
+      | second   |
+
+    When I get the list of doubles:
+    """
+    @doubles = RestAssured::Double.all
+    """
+
+    Then the following should be true:
+    """
+    @doubles.size.should == 2
+    """

data/features/step_definitions/doubles_steps.rb

@@ -75,7 +75,8 @@ Given /^the following doubles exist:$/ do |doubles|
       :fullpath    => row['fullpath'],
       :description => row['description'],
       :content     => row['content'],
-      :verb        => row['verb']
+      :verb        => row['verb'],
+      :status      => row['status']
     )
   end
 end
@@ -89,6 +90,7 @@ Then /^I should see existing doubles:$/ do |doubles|
     page.should have_content(row[:fullpath])
     page.should have_content(row[:description])
     page.should have_content(row[:verb])
+    page.should have_content(row[:status])
   end
 end
 
@@ -107,6 +109,7 @@ When /^I enter double details:$/ do |details|
   fill_in 'Content', :with => double['content']
   select  double['verb'], :from => 'Verb'
   fill_in 'Description', :with => double['description']
+  select  double['status'], :from => 'Status'
 end
 
 When /^I save it$/ do
@@ -148,10 +151,15 @@ When /^I change "([^"]*)" "([^"]*)" to "([^"]*)"$/ do |obj, prop, value|
 end
 
 Given /^I choose to delete double with fullpath "([^"]*)"$/ do |fullpath|
-  find(:xpath, "//tr[td[text()='#{fullpath}']]//a[text()='Delete']").click
+  find(:xpath, "//tr[td[a[text()='#{fullpath}']]]//a[text()='Delete']").click
 end
 
 Then /^I should be asked to confirm delete$/ do
   page.driver.browser.switch_to.alert.accept
 end
 
+Given /^there are the following doubles:$/ do |table|
+  table.hashes.each do |row|
+    RestAssured::Models::Double.create :fullpath => row['fullpath']
+  end
+end

data/features/step_definitions/ruby_api_steps.rb

@@ -111,3 +111,11 @@ end
 Then /^it should be stopped:$/ do |code|
   eval code
 end
+
+When /^I get the list of doubles:$/ do |code|
+  eval code
+end
+
+When /^I destroy that double:$/ do |code|
+  eval code
+end

data/features/web_ui/doubles.feature

@@ -22,13 +22,13 @@ Feature: manage doubles via ui
     Given I am on "doubles" page
     When I choose to create a double
     And I enter double details:
-      | fullpath      | description | content      | verb |
-      | /url2/bb?a=b5 | google api  | test content | POST |
+      | fullpath      | description | content      | verb | status |
+      | /url2/bb?a=b5 | google api  | test content | POST | 200    |
     And I save it
     Then I should see "Double created"
     And I should see existing doubles:
-      | fullpath      | description | verb |
-      | /url2/bb?a=b5 | google api  | POST |
+      | fullpath      | description | verb | status |
+      | /url2/bb?a=b5 | google api  | POST | 200    |
 
   @javascript
   Scenario: choose active double
@@ -41,16 +41,16 @@ Feature: manage doubles via ui
 
   Scenario: edit double
     Given the following doubles exist:
-      | fullpath  | description | content      | verb |
-      | /url1/aaa | twitter     | test content | POST |
+      | fullpath  | description | content      | verb | status |
+      | /url1/aaa | twitter     | test content | POST | 404    |
     And I visit "doubles" page
     And I choose to edit double
     When I change "double" "description" to "google"
     And I save it
     Then I should see that I am on "doubles" page
     And I should see existing doubles:
-      | fullpath  | description | verb |
-      | /url1/aaa | google      | POST |
+      | fullpath  | description | verb | status |
+      | /url1/aaa | google      | POST | 404    |
 
   @javascript
   Scenario: delete double

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

@@ -8,6 +8,10 @@ module RestAssured
         def verbs
           RestAssured::Models::Double::VERBS
         end
+
+        def statuses
+          RestAssured::Models::Double::STATUSES.sort
+        end
       end
 
       router.get '/' do

data/lib/rest-assured/version.rb

@@ -1,3 +1,3 @@
 module RestAssured
-  VERSION = '1.1.5'
+  VERSION = '1.1.6'
 end

data/rest-assured.gemspec

@@ -26,5 +26,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'haml', '>= 3.1.3'
   s.add_dependency 'activerecord', '~> 3.2.0'
   s.add_dependency 'activeresource', '~> 3.2.0'
+  s.add_dependency 'json'
 end
 

data/views/doubles/_form.haml

@@ -16,6 +16,12 @@
   %label{:for => 'double_description'} Description
   %textarea.wide#double_description{:name => 'double[description]', :rows => 3}= @double.description
 
+%p
+  %label{:for => 'double_status'} Status
+  %select#double_status{:name => 'double[status]'}
+    - statuses.each do |s|
+      %option{:name => s, :selected => (@double.status == s)}= s
+
 %p
   %input{:type => 'submit', :value => 'Save'}
   |

data/views/doubles/index.haml

@@ -6,6 +6,7 @@
       %th Request fullpath
       %th Verb
       %th Description
+      %th Status
       %th Active?
       %th  
   %tbody
@@ -13,9 +14,11 @@
       - fs.each_with_index do |f, i|
         %tr{:id => "double_row_#{f.id}"}
           - if i == 0
-            %td{:rowspan => fs.size}= fullpath
+            %td{:rowspan => fs.size}
+              %a{:href => fullpath, :target => '_blank'}= fullpath
           %td= f.verb
           %td= f.description
+          %td= f.status
           %td.label.text-center
             %input.active-double-toggle{:type => 'radio', :name => fullpath, :checked => f.active, :data => { :double_id => f.id }}
           %td.edit-link.text-center.white-space-nowrap

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rest-assured
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-19 00:00:00.000000000 Z
+date: 2012-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &2156724640 !ruby/object:Gem::Requirement
+  requirement: &2153725420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.3.2
   type: :runtime
   prerelease: false
-  version_requirements: *2156724640
+  version_requirements: *2153725420
 - !ruby/object:Gem::Dependency
   name: childprocess
-  requirement: &2156724180 !ruby/object:Gem::Requirement
+  requirement: &2153721660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156724180
+  version_requirements: *2153721660
 - !ruby/object:Gem::Dependency
   name: sinatra-flash
-  requirement: &2156723800 !ruby/object:Gem::Requirement
+  requirement: &2153717260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156723800
+  version_requirements: *2153717260
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &2156723260 !ruby/object:Gem::Requirement
+  requirement: &2153713100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 3.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *2156723260
+  version_requirements: *2153713100
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2156722760 !ruby/object:Gem::Requirement
+  requirement: &2153709880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 3.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156722760
+  version_requirements: *2153709880
 - !ruby/object:Gem::Dependency
   name: activeresource
-  requirement: &2156722300 !ruby/object:Gem::Requirement
+  requirement: &2153707700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,7 +76,18 @@ dependencies:
         version: 3.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156722300
+  version_requirements: *2153707700
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &2153706540 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *2153706540
 description: 
 email:
 - artem.avetisyan@bbc.co.uk
@@ -116,6 +127,8 @@ files:
 - features/rest_api/doubles.feature
 - features/rest_api/redirects.feature
 - features/ruby_api/create_double.feature
+- features/ruby_api/destroy_double.feature
+- features/ruby_api/list_doubles.feature
 - features/ruby_api/test_server.feature
 - features/ruby_api/verify_requests.feature
 - features/ruby_api/wait_for_requests.feature
@@ -208,6 +221,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3710356704569330003
 requirements: []
 rubyforge_project: rest-assured
 rubygems_version: 1.8.10
@@ -219,6 +235,8 @@ test_files:
 - features/rest_api/doubles.feature
 - features/rest_api/redirects.feature
 - features/ruby_api/create_double.feature
+- features/ruby_api/destroy_double.feature
+- features/ruby_api/list_doubles.feature
 - features/ruby_api/test_server.feature
 - features/ruby_api/verify_requests.feature
 - features/ruby_api/wait_for_requests.feature