svn commit: r1080551 - in /incubator/deltacloud/trunk: server/server.rb tests/ec2/step_definitions/keys_steps.rb tests/ec2/support/env.rb

[mf...@apache.org]

Author: mfojtik
Date: Fri Mar 11 12:37:25 2011
New Revision: 1080551

URL: http://svn.apache.org/viewvc?rev=1080551&view=rev
Log:
Fixed Cucumber tests for EC2 keys (destroy action)

Modified:
    incubator/deltacloud/trunk/server/server.rb
    incubator/deltacloud/trunk/tests/ec2/step_definitions/keys_steps.rb
    incubator/deltacloud/trunk/tests/ec2/support/env.rb

Modified: incubator/deltacloud/trunk/server/server.rb
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/server/server.rb?rev=1080551&r1=1080550&r2=1080551&view=diff
==============================================================================
--- incubator/deltacloud/trunk/server/server.rb (original)
+++ incubator/deltacloud/trunk/server/server.rb Fri Mar 11 12:37:25 2011
@@ -650,9 +650,9 @@ collection :keys do
     control do
       driver.destroy_key(credentials, { :key_name => params[:id]})
       respond_to do |format|
-        format.xml { return 204 }
-        format.json { return 204 }
-        format.html { return redirect(keys_url) }
+        format.xml { 204 }
+        format.json { 204 }
+        format.html { redirect(keys_url) }
       end
     end
   end

Modified: incubator/deltacloud/trunk/tests/ec2/step_definitions/keys_steps.rb
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/tests/ec2/step_definitions/keys_steps.rb?rev=1080551&r1=1080550&r2=1080551&view=diff
==============================================================================
--- incubator/deltacloud/trunk/tests/ec2/step_definitions/keys_steps.rb (original)
+++ incubator/deltacloud/trunk/tests/ec2/step_definitions/keys_steps.rb Fri Mar 11 12:37:25 2011
@@ -56,5 +56,5 @@ Then /^client should get created key$/ d
 end
 
 Then /^this key should be destroyed$/ do
-  last_response.status.should == 302
+  last_response.status.should == 204
 end

Modified: incubator/deltacloud/trunk/tests/ec2/support/env.rb
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/tests/ec2/support/env.rb?rev=1080551&r1=1080550&r2=1080551&view=diff
==============================================================================
--- incubator/deltacloud/trunk/tests/ec2/support/env.rb (original)
+++ incubator/deltacloud/trunk/tests/ec2/support/env.rb Fri Mar 11 12:37:25 2011
@@ -23,7 +23,7 @@ World do
       set :environment => :test
       set :loggining => true
       set :raise_errors => true
-      set :show_exceptions => true
+      set :show_exceptions => false
       run Sinatra::Application
     end
   end