Fix cukes after merge of #067a45c

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

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

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

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

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

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

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

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"

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"

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
 

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