---
src/app/views/instances/_edit.haml | 2 +-
src/app/views/instances/_list.haml | 2 +-
src/app/views/instances/_properties.haml | 2 +-
src/app/views/layouts/application.haml | 2 +-
src/features/instance.feature | 18 +++++++++---------
5 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/app/views/instances/_edit.haml b/src/app/views/instances/_edit.haml
index dfce76f..54f5370 100644
--- a/src/app/views/instances/_edit.haml
+++ b/src/app/views/instances/_edit.haml
@@ -7,4 +7,4 @@
= text_field :instance, :name
= submit_tag 'Cancel', :name => 'cancel'
- = submit_tag 'Save', :name => 'save'
+ = submit_tag 'Save', :name => 'save', :id => 'save'
diff --git a/src/app/views/instances/_list.haml b/src/app/views/instances/_list.haml
index 1604ccf..91bd300 100644
--- a/src/app/views/instances/_list.haml
+++ b/src/app/views/instances/_list.haml
@@ -1,5 +1,5 @@
- form_header = capture_haml do
- = restful_submit_tag 'Stop Selected Instances', 'stop',
multi_stop_instances_path, 'GET', :class => 'button'
+ = restful_submit_tag 'Stop Selected Instances', 'stop',
multi_stop_instances_path, 'GET', :class => 'button', :id =>
'stop_selected_instances'
= hidden_field_tag 'backlink', request.url
- if @hide_stopped
%b Stopped
diff --git a/src/app/views/instances/_properties.haml
b/src/app/views/instances/_properties.haml
index e59d881..3cec61b 100644
--- a/src/app/views/instances/_properties.haml
+++ b/src/app/views/instances/_properties.haml
@@ -41,7 +41,7 @@
- if @instance.instance_key
%li
= label_tag :instance_key, 'SSH key'
- %span= link_to("Download", key_instance_path(@instance))
+ %span= link_to("Download", key_instance_path(@instance), :id
=>'download_ssh_key')
%li
= label_tag :owner, 'Owner'
%span= "#{(a)instance.owner.first_name} #{(a)instance.owner.last_name}"
diff --git a/src/app/views/layouts/application.haml
b/src/app/views/layouts/application.haml
index dcb18e6..7f3a8e6 100644
--- a/src/app/views/layouts/application.haml
+++ b/src/app/views/layouts/application.haml
@@ -35,7 +35,7 @@
- # navigation before the proper wireframes exist for all the sections.
- # Then we'll want to switch to the simple-nav gem or something else.
%li{:class => "#{'active' unless [:design,
:administer].include? controller.top_section}" }
- = link_to 'Monitor', pools_path
+ = link_to 'Monitor', pools_path, :id => 'monitor'
%li{:class => "#{'active' if controller.top_section ==
:administer}" }
= link_to 'Administer', suggested_deployables_path
diff --git a/src/features/instance.feature b/src/features/instance.feature
index 3df8072..eb03fda 100644
--- a/src/features/instance.feature
+++ b/src/features/instance.feature
@@ -12,7 +12,7 @@ Feature: Manage Instances
Given a mock running instance exists
And I am viewing the mock instance detail
And I see "SSH key"
- When I follow "Download"
+ When I follow "download_ssh_key"
Then I should see the Save dialog for a .pem file
Scenario: Download an Instance Key over XHR
@@ -20,7 +20,7 @@ Feature: Manage Instances
And I request XHR
When I am viewing the mock instance detail
And I see "SSH key"
- When I follow "Download"
+ When I follow "download_ssh_key"
Then I should see the Save dialog for a .pem file
Scenario: Don't see' an Instance Key
@@ -36,10 +36,10 @@ Feature: Manage Instances
Scenario: I want to view all instances
Given there is a "mock1" instance
And I am on the home page
- When I follow "Monitor"
+ When I follow "monitor"
Then I should be on the pools page
- When I follow link with ID "filter_view"
- And I follow "Instances"
+ When I follow "filter_view"
+ And I follow "details_instances"
Then I should be on the pools page
And I should see "mock1"
@@ -69,7 +69,7 @@ Feature: Manage Instances
Given there is a "mock1" running instance
And I am on the instances page
When I check "mock1" instance
- And I press "Stop Selected Instances"
+ And I press "stop_selected_instances"
Then I should be on the instances page
And I should see "mock1: stop action was successfully queued"
@@ -81,7 +81,7 @@ Feature: Manage Instances
When I check "mock1" instance
And I check "mock2" instance
And I check "mock3" instance
- And I press "Stop Selected Instances"
+ And I press "stop_selected_instances"
Then I should be on the instances page
And I should see "mock1: stop action was successfully queued"
And I should see "mock2: stop action was successfully queued"
@@ -148,7 +148,7 @@ Feature: Manage Instances
Given there is a "Tomct" instance
And I am on Tomct's edit instance page
And I fill in "name" with "Tomcat"
- And I press "Save"
+ And I press "save"
Then I should be on Tomcat's instance page
And I should see "Tomcat"
@@ -157,7 +157,7 @@ Feature: Manage Instances
And I request XHR
When I am on Tomct's edit instance page
And I fill in "name" with "Tomcat"
- And I press "Save"
+ And I press "save"
Then I should get back a partial
And I should see "Tomcat"
--
1.7.4.4