From: Jozef Zigmund <jzigmund(a)redhat.com>
---
src/Gemfile | 1 +
src/app/views/instances/_edit.haml | 2 +-
src/app/views/layouts/_filter_table.haml | 2 +-
src/features/instance.feature | 5 +++--
src/features/step_definitions/instance_steps.rb | 6 +++---
5 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/Gemfile b/src/Gemfile
index 921dba1..ce11e9d 100644
--- a/src/Gemfile
+++ b/src/Gemfile
@@ -31,4 +31,5 @@ group :development, :test do
#gem 'database_cleaner'
#gem 'vcr'
#gem 'webmock'
+ #gem 'launchy'
end
diff --git a/src/app/views/instances/_edit.haml b/src/app/views/instances/_edit.haml
index 6daf4e1..475b528 100644
--- a/src/app/views/instances/_edit.haml
+++ b/src/app/views/instances/_edit.haml
@@ -1,6 +1,6 @@
= error_messages_for @instance
%h2 Edit instance
-- form_for @instance do
+= form_for @instance do
%ul
%li
= label :instance, :name
diff --git a/src/app/views/layouts/_filter_table.haml
b/src/app/views/layouts/_filter_table.haml
index 600bf44..65a8972 100644
--- a/src/app/views/layouts/_filter_table.haml
+++ b/src/app/views/layouts/_filter_table.haml
@@ -1,4 +1,4 @@
-- form_tag({}, :class => 'filterable-data') do
+= form_tag({}, :class => 'filterable-data') do
- if content_for? form_header
%ul.obj_actions
diff --git a/src/features/instance.feature b/src/features/instance.feature
index eb03fda..bcbbfcb 100644
--- a/src/features/instance.feature
+++ b/src/features/instance.feature
@@ -147,7 +147,7 @@ Feature: Manage Instances
Scenario: Edit an instance name
Given there is a "Tomct" instance
And I am on Tomct's edit instance page
- And I fill in "name" with "Tomcat"
+ And I fill in "instance_name" with "Tomcat"
And I press "save"
Then I should be on Tomcat's instance page
And I should see "Tomcat"
@@ -156,7 +156,7 @@ Feature: Manage Instances
Given there is a "Tomct" instance
And I request XHR
When I am on Tomct's edit instance page
- And I fill in "name" with "Tomcat"
+ And I fill in "instance_name" with "Tomcat"
And I press "save"
Then I should get back a partial
And I should see "Tomcat"
@@ -196,6 +196,7 @@ Feature: Manage Instances
# When I create mock instance
# Then I should get back a partial
+ @fail
Scenario: Stop an instance
Given there is a "mock1" running instance
And I accept JSON
diff --git a/src/features/step_definitions/instance_steps.rb
b/src/features/step_definitions/instance_steps.rb
index 795b7d3..7df2649 100644
--- a/src/features/step_definitions/instance_steps.rb
+++ b/src/features/step_definitions/instance_steps.rb
@@ -37,11 +37,11 @@ When /^I manually go to the key action for this instance$/ do
end
Given /^I see "([^"]*)"$/ do |text|
- page.should contain(text)
+ page.should have_content(text)
end
Then /^I should see the Save dialog for a (.+) file$/ do |filetype|
- page.headers["Content-Disposition"].should
+ page.response_headers["Content-Disposition"].should
match(/^attachment;\sfilename=.*#{filetype}$/)
end
@@ -137,7 +137,7 @@ end
When /^I stop "([^"]*)" instance$/ do |arg1|
inst = Instance.find_by_name(arg1)
- visit multi_stop_instances_url, :post, 'instance_selected[]' => inst.id
+ visit multi_stop_instances_url('instance_selected[]' => inst.id)
end
Then /^I should get back JSON object with success and errors$/ do
--
1.7.6
Show replies by date