svn commit: r1141517 - in /incubator/deltacloud/trunk/tests/mock: instances.feature respond_to.feature step_definitions/instances_steps.rb support/env.rb

[mf...@apache.org]

Author: mfojtik
Date: Thu Jun 30 12:50:06 2011
New Revision: 1141517

URL: http://svn.apache.org/viewvc?rev=1141517&view=rev
Log:
Fixed mock Cucumber features to reflect latest changes

Modified:
    incubator/deltacloud/trunk/tests/mock/instances.feature
    incubator/deltacloud/trunk/tests/mock/respond_to.feature
    incubator/deltacloud/trunk/tests/mock/step_definitions/instances_steps.rb
    incubator/deltacloud/trunk/tests/mock/support/env.rb

Modified: incubator/deltacloud/trunk/tests/mock/instances.feature
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/tests/mock/instances.feature?rev=1141517&r1=1141516&r2=1141517&view=diff
==============================================================================
--- incubator/deltacloud/trunk/tests/mock/instances.feature (original)
+++ incubator/deltacloud/trunk/tests/mock/instances.feature Thu Jun 30 12:50:06 2011
@@ -17,7 +17,6 @@ Feature: Managing instances
     | authentication |
     | public_addresses |
     | private_addresses |
-    | authentication |
     And each instance should have 'href' attribute with valid URL
     And this URI should be available in XML, JSON, HTML format
 
@@ -148,12 +147,6 @@ Feature: Managing instances
     And this instance should have last hardware profile
     And this instance should have name
 
-  Scenario: Create instance using HTML form
-    Given URI /api/instances/new exists in HTML format
-    And authentification is required for this URI
-    When client access this URI
-    Then client should get HTML form
-
   Scenario: Destroying created instance
     Given URI /api/instances exists
     And authentification is required for this URI

Modified: incubator/deltacloud/trunk/tests/mock/respond_to.feature
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/tests/mock/respond_to.feature?rev=1141517&r1=1141516&r2=1141517&view=diff
==============================================================================
--- incubator/deltacloud/trunk/tests/mock/respond_to.feature (original)
+++ incubator/deltacloud/trunk/tests/mock/respond_to.feature Thu Jun 30 12:50:06 2011
@@ -18,7 +18,7 @@ Feature: Returning valid responses with 
   Given URI /api exists
     And authentification is not required for this URI
     When client use Accept header:
-    | application/xhtml+html;q=0.9 |
+    | application/xhtml+xml |
     And client perform an HTTP request for this URI
     Then client should get valid HTML response
 
@@ -34,7 +34,7 @@ Feature: Returning valid responses with 
     Given URI /api exists
     And authentification is not required for this URI
     When client use Accept header:
-    | application/xhtml+html;q=0.9 |
+    | application/xhtml+xml;q=0.9 |
     And client accept this URI with parameters:
     | format | xml |
     And client perform an HTTP request for this URI
@@ -66,6 +66,6 @@ Feature: Returning valid responses with 
     And authentification is not required for this URI
     When client wants to get URI '/api.xml'
     When client use Accept header:
-    | application/xhtml+html;q=0.9 |
+    | application/xhtml+xml;q=0.9 |
     And client perform an HTTP request for this URI
     Then client should get valid HTML response

Modified: incubator/deltacloud/trunk/tests/mock/step_definitions/instances_steps.rb
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/tests/mock/step_definitions/instances_steps.rb?rev=1141517&r1=1141516&r2=1141517&view=diff
==============================================================================
--- incubator/deltacloud/trunk/tests/mock/step_definitions/instances_steps.rb (original)
+++ incubator/deltacloud/trunk/tests/mock/step_definitions/instances_steps.rb Thu Jun 30 12:50:06 2011
@@ -99,7 +99,6 @@ Then /^client should get created instanc
 end
 
 When /^this instance should be destroyed$/ do
-  puts @instance[:href].to_s
   get @instance[:href].to_s, {}
   last_response.status.should == 404
   output_xml.xpath('/error').first[:status].should == '404'

Modified: incubator/deltacloud/trunk/tests/mock/support/env.rb
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/tests/mock/support/env.rb?rev=1141517&r1=1141516&r2=1141517&view=diff
==============================================================================
--- incubator/deltacloud/trunk/tests/mock/support/env.rb (original)
+++ incubator/deltacloud/trunk/tests/mock/support/env.rb Thu Jun 30 12:50:06 2011
@@ -38,7 +38,7 @@ World do
 
   Before do
     unless @no_header
-      header 'Accept', 'application/xml;q=9'
+      header 'Accept', 'application/xml'
     end
   end