--- src/app/views/roles/_form.haml | 4 ++-- src/app/views/roles/show.haml | 4 ++-- src/features/role.feature | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/app/views/roles/_form.haml b/src/app/views/roles/_form.haml index a22b97c..0f60466 100644 --- a/src/app/views/roles/_form.haml +++ b/src/app/views/roles/_form.haml @@ -3,5 +3,5 @@ = form.label :name, 'Name' = form.text_field :name, :class => "em long" %fieldset.options - = form.submit "Save", :class => "submit button" - = link_to t(:cancel), roles_path, :class => 'button button' + = form.submit "Save", :class => "submit button", :id => 'role_submit_button' + = link_to t(:cancel), roles_path, :class => 'button button', :id => 'role_cancel_button' diff --git a/src/app/views/roles/show.haml b/src/app/views/roles/show.haml index a7804e3..debc487 100644 --- a/src/app/views/roles/show.haml +++ b/src/app/views/roles/show.haml @@ -4,8 +4,8 @@ #obj_actions.button-container = link_to 'New Role', new_role_url, :class => 'button primary', :id => 'new_role_button' .button-group - = link_to 'Edit', edit_role_path(@role), :class => 'button pill' - = button_to 'Delete', role_path(@role), :method => :delete, :class => 'button pill danger', + = link_to 'Edit', edit_role_path(@role), :class => 'button pill', :id => 'edit_role_button' + = button_to 'Delete', role_path(@role), :method => :delete, :class => 'button pill danger', :id => 'delete_role_button', :confirm => "Are you sure you want to delete this role?"
.corner diff --git a/src/features/role.feature b/src/features/role.feature index abd0157..c47e840 100644 --- a/src/features/role.feature +++ b/src/features/role.feature @@ -13,10 +13,10 @@ Feature: Manage Roles Given I am on the roles page And there should be a role named "Captain" When I follow "Captain" - And I follow "Edit" + And I follow "edit_role_button" Then I should see "Editing Role:" - When I fill in "role[name]" with "Admiral" - And I press "Save" + When I fill in "role_name" with "Admiral" + And I press "role_submit_button" Then I should see "Role updated successfully!"
Scenario: Show role details @@ -37,7 +37,7 @@ Feature: Manage Roles And there are 2 more roles When I check "Admiral" role And I check "Captain" role - And I press "Delete" + And I press "delete_button" Then there should be 0 more roles And I should be on the roles page And I should see "These Roles were deleted: Captain, Admiral"