From 86b9a2ca584a08a7aaf4b318dfa988173dfee6c0 Mon Sep 17 00:00:00 2001 From: Hagen Schink Date: Thu, 25 Jul 2013 08:40:32 +0200 Subject: [PATCH] Fix cukes after merge of #067a45c --- features/activities/index.feature | 2 +- features/groups/membership.feature | 2 +- features/issues/list_sums.feature | 2 +- features/issues/relations.feature | 2 +- features/issues/time_entries.feature | 2 +- .../colors_administration.feature | 2 +- .../planning_element_types_adminstration.feature | 2 +- features/projects/settings.feature | 5 +++-- features/roles/role_crud.feature | 4 ++-- features/users/deleting.feature | 4 ++-- features/users/password_expiry.feature | 2 +- 11 files changed, 15 insertions(+), 14 deletions(-) diff --git a/features/activities/index.feature b/features/activities/index.feature index 0e1a782b18..953c06cb47 100644 --- a/features/activities/index.feature +++ b/features/activities/index.feature @@ -28,7 +28,7 @@ Feature: Activities | activity | And the project "project2" has 1 issue with the following: | subject | issue2 | - And I am already logged in as "admin" + And I am admin Scenario: Hide activity from Projects with disabled activity module When I go to the overall activity page diff --git a/features/groups/membership.feature b/features/groups/membership.feature index 5a47f5bdb7..c69e397fc9 100644 --- a/features/groups/membership.feature +++ b/features/groups/membership.feature @@ -45,7 +45,7 @@ Feature: Group memberships Scenario: Adding members to a group after the group has been added to the project adds the users to the project Given the group "group1" is a "beta" in the project "project1" - And I am logged in as "admin" + And I am admin When I go to the edit page of the group called "group1" And I follow "Users" within ".tabs" And I add the user "alice" to the group diff --git a/features/issues/list_sums.feature b/features/issues/list_sums.feature index ad60305dd9..a96937cddd 100644 --- a/features/issues/list_sums.feature +++ b/features/issues/list_sums.feature @@ -27,7 +27,7 @@ Feature: Issue Sum Calculations for Currency And there is 1 user with: | Login | manager | And the user "manager" is a "Manager" in the project "project1" - And I am logged in as "admin" + And I am admin @javascript Scenario: Should calculate an overall sum for a standard issue query diff --git a/features/issues/relations.feature b/features/issues/relations.feature index 36c8e8848e..0c1201e99d 100644 --- a/features/issues/relations.feature +++ b/features/issues/relations.feature @@ -28,7 +28,7 @@ Feature: Relating issues to each other | subject | Some Issue | And the user "bob" has 1 issue with the following: | subject | Another Issue | - And I am logged in as "admin" + And I am admin @javascript Scenario: Adding a relation will add it to the list of related issues through AJAX instantly diff --git a/features/issues/time_entries.feature b/features/issues/time_entries.feature index 5de1549e79..a221ab71a9 100644 --- a/features/issues/time_entries.feature +++ b/features/issues/time_entries.feature @@ -35,7 +35,7 @@ Feature: Tracking Time | start_date | 2011-05-04 | | description | Aioli Sali Grande | And there is a time entry for "issue1" with 4 hours - And I am logged in as "admin" + And I am admin And I am on the time entry page of issue "issue1" Scenario: Adding a time entry diff --git a/features/planning_element_type_colors/colors_administration.feature b/features/planning_element_type_colors/colors_administration.feature index 03aba22c51..f80d78896a 100644 --- a/features/planning_element_type_colors/colors_administration.feature +++ b/features/planning_element_type_colors/colors_administration.feature @@ -22,7 +22,7 @@ Feature: Color Adminstration | Grey | #999999 | | Yellow | #FFCC33 | - And I am logged in as "admin" + And I am admin Scenario: The admin may see all colors within the admin UI When I go to the admin page diff --git a/features/planning_element_types/planning_element_types_adminstration.feature b/features/planning_element_types/planning_element_types_adminstration.feature index 2a6ab9789c..0c9cf98426 100644 --- a/features/planning_element_types/planning_element_types_adminstration.feature +++ b/features/planning_element_types/planning_element_types_adminstration.feature @@ -24,7 +24,7 @@ Feature: Planning Element Type Adminstration | Minor Phase | false | false | | Minor Milestone | true | false | - And I am logged in as "admin" + And I am admin Scenario: The admin may see all planning element types within the admin UI When I go to the admin page diff --git a/features/projects/settings.feature b/features/projects/settings.feature index 4d92421dd8..ae72bd2212 100644 --- a/features/projects/settings.feature +++ b/features/projects/settings.feature @@ -44,11 +44,12 @@ Feature: Project Settings When I click on "Edit" within "#member-1" And I uncheck "alpha" within "#member-1-roles-form" And I click "Change" within "#member-1-roles-form" - Then I should not see "Bob Bobbit" within ".list.members" + Then there should be an error message + Then I should see "Bob Bobbit" within ".list.members" @javascript Scenario: Changing members per page keeps us on the members tab - Given I am logged in as "admin" + Given I am admin When I go to the settings page of the project "project1" And I follow "Members" within ".tabs" And I follow "50" within ".per_page_options" within "#tab-content-members" diff --git a/features/roles/role_crud.feature b/features/roles/role_crud.feature index 922b1b5bb3..e19be3cba9 100644 --- a/features/roles/role_crud.feature +++ b/features/roles/role_crud.feature @@ -4,7 +4,7 @@ Feature: As an admin @javascript Scenario: Normal Role creation with existing role with same name - And I am already logged in as "admin" + And I am already admin When I go to the new page of "Role" Then I should see "Issues can be assigned to this role" When I fill in "Name" with "Manager" @@ -14,7 +14,7 @@ Feature: As an admin @javascript Scenario: Normal Role creation with existing role with same name And there is a role "Manager" - And I am already logged in as "admin" + And I am already admin When I go to the new page of "Role" Then I should see "Issues can be assigned to this role" When I fill in "Name" with "Manager" diff --git a/features/users/deleting.feature b/features/users/deleting.feature index 0ec3111ca7..b65f7125f5 100644 --- a/features/users/deleting.feature +++ b/features/users/deleting.feature @@ -37,7 +37,7 @@ Feature: User deletion Given the "users_deletable_by_admins" setting is set to true And there is 1 user with the following: | login | bob | - And I am already logged in as "admin" + And I am admin When I go to the edit page of the user "bob" And I select "Delete" from the action menu And I press "Delete" @@ -49,7 +49,7 @@ Feature: User deletion Given the "users_deletable_by_admins" setting is set to false And there is 1 user with the following: | login | bob | - And I am already logged in as "admin" + And I am admin And I go to the edit page of the user "bob" Then there should not be a "Delete" entry in the action menu diff --git a/features/users/password_expiry.feature b/features/users/password_expiry.feature index 80b81b36f9..a60f1d670a 100644 --- a/features/users/password_expiry.feature +++ b/features/users/password_expiry.feature @@ -14,7 +14,7 @@ Feature: Pasword expiry Background: Given there is a user named "bob" - And I am already logged in as "admin" + And I am already admin Scenario: An admin activating password expiry forces a user to change the password When I set passwords to expire after 30 days