User can leave group from group page.

14 files changed, 377 insertions, 125 deletions

diff --git a/features/admin/groups.feature b/features/admin/groups.feature
index 7741307f178..352c1b3803f 100644
--- a/features/admin/groups.feature
+++ b/features/admin/groups.feature
@@ -2,7 +2,7 @@ Feature: Admin Groups
   Background:
     Given I sign in as an admin
     And I have group with projects
-    And Create user "John Doe"
+    And User "John Doe" exists
     And I visit admin groups page
 
   Scenario: See group list
diff --git a/features/group.feature b/features/group.feature
new file mode 100644
index 00000000000..aa49056fee2
--- /dev/null
+++ b/features/group.feature
@@ -0,0 +1,116 @@
+Feature: Groups
+  Background:
+    Given I sign in as "John Doe"
+    And "John Doe" is owner of group "Owned"
+    And "John Doe" is guest of group "Guest"
+
+  @javascript
+  Scenario: I should see group "Owned" dashboard list
+    When I visit group "Owned" page
+    Then I should see group "Owned" projects list
+    And I should see projects activity feed
+
+  Scenario: Create a group from dasboard
+    When I visit group "Owned" page
+    And I visit dashboard page
+    And I click new group link
+    And submit form with new group "Samurai" info
+    Then I should be redirected to group "Samurai" page
+    And I should see newly created group "Samurai"
+
+  Scenario: I should see group "Owned" issues list
+    Given project from group "Owned" has issues assigned to me
+    When I visit group "Owned" issues page
+    Then I should see issues from group "Owned" assigned to me
+
+  Scenario: I should see group "Owned" merge requests list
+    Given project from group "Owned" has merge requests assigned to me
+    When I visit group "Owned" merge requests page
+    Then I should see merge requests from group "Owned" assigned to me
+
+  @javascript
+  Scenario: I should add user to projects in group "Owned"
+    Given User "Mary Jane" exists
+    When I visit group "Owned" members page
+    And I select user "Mary Jane" from list with role "Reporter"
+    Then I should see user "Mary Jane" in team list
+
+  Scenario: I should see edit group "Owned" page
+    When I visit group "Owned" settings page
+    And I change group "Owned" name to "new-name"
+    Then I should see new group "Owned" name
+
+  Scenario: I edit group "Owned" avatar
+    When I visit group "Owned" settings page
+    And I change group "Owned" avatar
+    And I visit group "Owned" settings page
+    Then I should see new group "Owned" avatar
+    And I should see the "Remove avatar" button
+
+  Scenario: I remove group "Owned" avatar
+    When I visit group "Owned" settings page
+    And I have group "Owned" avatar
+    And I visit group "Owned" settings page
+    And I remove group "Owned" avatar
+    Then I should not see group "Owned" avatar
+    And I should not see the "Remove avatar" button
+
+  # Leave
+
+  @javascript
+  Scenario: Owner should be able to remove himself from group if he is not the last owner
+    Given "Mary Jane" is owner of group "Owned"
+    When I visit group "Owned" members page
+    Then I should see user "John Doe" in team list
+    Then I should see user "Mary Jane" in team list
+    When I click on the "Remove User From Group" button for "John Doe"
+    And I visit group "Owned" members page
+    Then I should not see user "John Doe" in team list
+    Then I should see user "Mary Jane" in team list
+
+  @javascript
+  Scenario: Owner should not be able to remove himself from group if he is the last owner
+    Given "Mary Jane" is guest of group "Owned"
+    When I visit group "Owned" members page
+    Then I should see user "John Doe" in team list
+    Then I should see user "Mary Jane" in team list
+    Then I should not see the "Remove User From Group" button for "Mary Jane"
+
+  @javascript
+  Scenario: Guest should be able to remove himself from group
+    Given "Mary Jane" is guest of group "Guest"
+    When I visit group "Guest" members page
+    Then I should see user "John Doe" in team list
+    Then I should see user "Mary Jane" in team list
+    When I click on the "Remove User From Group" button for "John Doe"
+    When I visit group "Guest" members page
+    Then I should not see user "John Doe" in team list
+    Then I should see user "Mary Jane" in team list
+
+  @javascript
+  Scenario: Guest should be able to remove himself from group even if he is the only user in the group
+    When I visit group "Guest" members page
+    Then I should see user "John Doe" in team list
+    When I click on the "Remove User From Group" button for "John Doe"
+    When I visit group "Guest" members page
+    Then I should not see user "John Doe" in team list
+
+  # Remove others
+
+  @javascript
+  Scenario: Owner should be able to remove other users from group
+    Given "Mary Jane" is owner of group "Owned"
+    When I visit group "Owned" members page
+    Then I should see user "John Doe" in team list
+    Then I should see user "Mary Jane" in team list
+    When I click on the "Remove User From Group" button for "Mary Jane"
+    When I visit group "Owned" members page
+    Then I should see user "John Doe" in team list
+    Then I should not see user "Mary Jane" in team list
+
+  Scenario: Guest should not be able to remove other users from group
+    Given "Mary Jane" is guest of group "Guest"
+    When I visit group "Guest" members page
+    Then I should see user "John Doe" in team list
+    Then I should see user "Mary Jane" in team list
+    Then I should not see the "Remove User From Group" button for "Mary Jane"
diff --git a/features/group/create_group.feature b/features/group/create_group.feature
deleted file mode 100644
index b77f3599e6a..00000000000
--- a/features/group/create_group.feature
+++ /dev/null
@@ -1,11 +0,0 @@
-Feature: Groups
-  Background:
-    Given I sign in as a user
-
-  Scenario: Create a group from dasboard
-    Given I have group with projects
-    And I visit dashboard page
-    When I click new group link
-    And submit form with new group info
-    Then I should be redirected to group page
-    And I should see newly created group
diff --git a/features/group/group.feature b/features/group/group.feature
deleted file mode 100644
index 6177263e477..00000000000
--- a/features/group/group.feature
+++ /dev/null
@@ -1,47 +0,0 @@
-Feature: Groups
-  Background:
-    Given I sign in as a user
-    And I have group with projects
-
-  @javascript
-  Scenario: I should see group dashboard list
-    When I visit group page
-    Then I should see projects list
-    And I should see projects activity feed
-
-  Scenario: I should see group issues list
-    Given project from group has issues assigned to me
-    When I visit group issues page
-    Then I should see issues from this group assigned to me
-
-  Scenario: I should see group merge requests list
-    Given project from group has merge requests assigned to me
-    When I visit group merge requests page
-    Then I should see merge requests from this group assigned to me
-
-  @javascript
-  Scenario: I should add user to projects in Group
-    Given Create user "John Doe"
-    When I visit group members page
-    And I select user "John Doe" from list with role "Reporter"
-    Then I should see user "John Doe" in team list
-
-  Scenario: I should see edit group page
-    When I visit group settings page
-    And I change group name
-    Then I should see new group name
-
-  Scenario: I edit my group avatar
-    When I visit group settings page
-    And I change my group avatar
-    And I visit group settings page
-    Then I should see new group avatar
-    And I should see the "Remove avatar" button
-
-  Scenario: I remove my group avatar
-    When I visit group settings page
-    And I have an group avatar
-    And I visit group settings page
-    And I remove my group avatar
-    Then I should not see my group avatar
-    And I should not see the "Remove avatar" button
diff --git a/features/profile/group.feature b/features/profile/group.feature
new file mode 100644
index 00000000000..70b682e2913
--- /dev/null
+++ b/features/profile/group.feature
@@ -0,0 +1,47 @@
+Feature: Profile Group
+  Background:
+    Given I sign in as "John Doe"
+    And "John Doe" is owner of group "Owned"
+    And "John Doe" is guest of group "Guest"
+
+  # Leave groups
+
+  @javascript
+  Scenario: Owner should be able to leave from group if he is not the last owner
+    Given "Mary Jane" is owner of group "Owned"
+    When I visit profile groups page
+    Then I should see group "Owned" in group list
+    Then I should see group "Guest" in group list
+    When I click on the "Leave" button for group "Owned"
+    And I visit profile groups page
+    Then I should not see group "Owned" in group list
+    Then I should see group "Guest" in group list
+
+  @javascript
+  Scenario: Owner should not be able to leave from group if he is the last owner
+    Given "Mary Jane" is guest of group "Owned"
+    When I visit profile groups page
+    Then I should see group "Owned" in group list
+    Then I should see group "Guest" in group list
+    Then I should not see the "Leave" button for group "Owned"
+
+  @javascript
+  Scenario: Guest should be able to leave from group
+    Given "Mary Jane" is guest of group "Guest"
+    When I visit profile groups page
+    Then I should see group "Owned" in group list
+    Then I should see group "Guest" in group list
+    When I click on the "Leave" button for group "Guest"
+    When I visit profile groups page
+    Then I should see group "Owned" in group list
+    Then I should not see group "Guest" in group list
+
+  @javascript
+  Scenario: Guest should be able to leave from group even if he is the only user in the group
+    When I visit profile groups page
+    Then I should see group "Owned" in group list
+    Then I should see group "Guest" in group list
+    When I click on the "Leave" button for group "Guest"
+    When I visit profile groups page
+    Then I should see group "Owned" in group list
+    Then I should not see group "Guest" in group list
diff --git a/features/steps/group/group.rb b/features/steps/group/group.rb
index 686f683314a..bd59b7a12f6 100644
--- a/features/steps/group/group.rb
+++ b/features/steps/group/group.rb
@@ -1,42 +1,34 @@
 class Groups < Spinach::FeatureSteps
   include SharedAuthentication
   include SharedPaths
+  include SharedGroup
   include SharedUser
   include Select2Helper
 
-  Then 'I should see projects list' do
-    current_user.authorized_projects.each do |project|
+  Then 'I should see group "Owned" projects list' do
+    Group.find_by(name: "Owned").projects.each do |project|
       page.should have_link project.name
     end
   end
 
-  And 'I have group with projects' do
-    @group   = create(:group)
-    @group.add_owner(current_user)
-    @project = create(:project, namespace: @group)
-    @event   = create(:closed_issue_event, project: @project)
-
-    @project.team << [current_user, :master]
-  end
-
   And 'I should see projects activity feed' do
     page.should have_content 'closed issue'
   end
 
-  Then 'I should see issues from this group assigned to me' do
+  Then 'I should see issues from group "Owned" assigned to me' do
     assigned_to_me(:issues).each do |issue|
       page.should have_content issue.title
     end
   end
 
-  Then 'I should see merge requests from this group assigned to me' do
+  Then 'I should see merge requests from group "Owned" assigned to me' do
     assigned_to_me(:merge_requests).each do |issue|
       page.should have_content issue.title[0..80]
     end
   end
 
-  And 'I select user "John Doe" from list with role "Reporter"' do
-    user = User.find_by(name: "John Doe")
+  And 'I select user "Mary Jane" from list with role "Reporter"' do
+    user = User.find_by(name: "Mary Jane") || create(:user, name: "Mary Jane")
     within ".users-group-form" do
       select2(user.id, from: "#user_ids", multiple: true)
       select "Reporter", from: "group_access"
@@ -49,14 +41,29 @@ class Groups < Spinach::FeatureSteps
     projects_with_access.should have_content("John Doe")
   end
 
-  Given 'project from group has issues assigned to me' do
+  Then 'I should not see user "John Doe" in team list' do
+    projects_with_access = find(".ui-box .well-list")
+    projects_with_access.should_not have_content("John Doe")
+  end
+
+  Then 'I should see user "Mary Jane" in team list' do
+    projects_with_access = find(".ui-box .well-list")
+    projects_with_access.should have_content("Mary Jane")
+  end
+
+  Then 'I should not see user "Mary Jane" in team list' do
+    projects_with_access = find(".ui-box .well-list")
+    projects_with_access.should_not have_content("Mary Jane")
+  end
+
+  Given 'project from group "Owned" has issues assigned to me' do
     create :issue,
       project: project,
       assignee: current_user,
       author: current_user
   end
 
-  Given 'project from group has merge requests assigned to me' do
+  Given 'project from group "Owned" has merge requests assigned to me' do
     create :merge_request,
       source_project: project,
       target_project: project,
@@ -68,78 +75,94 @@ class Groups < Spinach::FeatureSteps
     click_link "New group"
   end
 
-  And 'submit form with new group info' do
+  And 'submit form with new group "Samurai" info' do
     fill_in 'group_name', with: 'Samurai'
     fill_in 'group_description', with: 'Tokugawa Shogunate'
     click_button "Create group"
   end
 
-  Then 'I should see newly created group' do
+  Then 'I should be redirected to group "Samurai" page' do
+    current_path.should == group_path(Group.last)
+  end
+
+  Then 'I should see newly created group "Samurai"' do
     page.should have_content "Samurai"
     page.should have_content "Tokugawa Shogunate"
     page.should have_content "You will only see events from projects in this group"
   end
 
-  Then 'I should be redirected to group page' do
-    current_path.should == group_path(Group.last)
-  end
-
-  And 'I change group name' do
+  And 'I change group "Owned" name to "new-name"' do
     fill_in 'group_name', with: 'new-name'
     click_button "Save group"
   end
 
-  Then 'I should see new group name' do
+  Then 'I should see new group "Owned" name' do
     within ".navbar-gitlab" do
       page.should have_content "group: new-name"
     end
   end
 
-  step 'I change my group avatar' do
+  step 'I change group "Owned" avatar' do
     attach_file(:group_avatar, File.join(Rails.root, 'public', 'gitlab_logo.png'))
     click_button "Save group"
-    @group.reload
+    Group.find_by(name: "Owned").reload
   end
 
-  step 'I should see new group avatar' do
-    @group.avatar.should be_instance_of AttachmentUploader
-    @group.avatar.url.should == "/uploads/group/avatar/#{ @group.id }/gitlab_logo.png"
+  step 'I should see new group "Owned" avatar' do
+    Group.find_by(name: "Owned").avatar.should be_instance_of AttachmentUploader
+    Group.find_by(name: "Owned").avatar.url.should == "/uploads/group/avatar/#{ Group.find_by(name:"Owned").id }/gitlab_logo.png"
   end
 
   step 'I should see the "Remove avatar" button' do
     page.should have_link("Remove avatar")
   end
 
-  step 'I have an group avatar' do
+  step 'I have group "Owned" avatar' do
     attach_file(:group_avatar, File.join(Rails.root, 'public', 'gitlab_logo.png'))
     click_button "Save group"
-    @group.reload
+    Group.find_by(name: "Owned").reload
   end
 
-  step 'I remove my group avatar' do
+  step 'I remove group "Owned" avatar' do
     click_link "Remove avatar"
-    @group.reload
+    Group.find_by(name: "Owned").reload
   end
 
-  step 'I should not see my group avatar' do
-    @group.avatar?.should be_false
+  step 'I should not see group "Owned" avatar' do
+    Group.find_by(name: "Owned").avatar?.should be_false
   end
 
   step 'I should not see the "Remove avatar" button' do
     page.should_not have_link("Remove avatar")
   end
 
-  protected
+  step 'I click on the "Remove User From Group" button for "John Doe"' do
+    find(:css, 'li', text: "John Doe").find(:css, 'a.btn-remove').click
+    # poltergeist always confirms popups.
+  end
 
-  def current_group
-    @group ||= Group.first
+  step 'I click on the "Remove User From Group" button for "Mary Jane"' do
+    find(:css, 'li', text: "Mary Jane").find(:css, 'a.btn-remove').click
+    # poltergeist always confirms popups.
   end
 
-  def project
-    current_group.projects.first
+  step 'I should not see the "Remove User From Group" button for "John Doe"' do
+    find(:css, 'li', text: "John Doe").should_not have_selector(:css, 'a.btn-remove')
+    # poltergeist always confirms popups.
   end
 
+  step 'I should not see the "Remove User From Group" button for "Mary Jane"' do
+    find(:css, 'li', text: "Mary Jane").should_not have_selector(:css, 'a.btn-remove')
+    # poltergeist always confirms popups.
+  end
+
+  protected
+
   def assigned_to_me key
     project.send(key).where(assignee_id: current_user.id)
   end
+
+  def project
+    Group.find_by(name: "Owned").projects.first
+  end
 end
diff --git a/features/steps/profile/group.rb b/features/steps/profile/group.rb
new file mode 100644
index 00000000000..03144104c7e
--- /dev/null
+++ b/features/steps/profile/group.rb
@@ -0,0 +1,44 @@
+class ProfileGroup < Spinach::FeatureSteps
+  include SharedAuthentication
+  include SharedGroup
+  include SharedPaths
+  include SharedUser
+
+  # Leave
+
+  step 'I click on the "Leave" button for group "Owned"' do
+    find(:css, 'li', text: "Owner").find(:css, 'i.icon-signout').click
+    # poltergeist always confirms popups.
+  end
+
+  step 'I click on the "Leave" button for group "Guest"' do
+    find(:css, 'li', text: "Guest").find(:css, 'i.icon-signout').click
+    # poltergeist always confirms popups.
+  end
+
+  step 'I should not see the "Leave" button for group "Owned"' do
+    find(:css, 'li', text: "Owner").should_not have_selector(:css, 'i.icon-signout')
+    # poltergeist always confirms popups.
+  end
+
+  step 'I should not see the "Leave" button for groupr "Guest"' do
+    find(:css, 'li', text: "Guest").should_not have_selector(:css,  'i.icon-signout')
+    # poltergeist always confirms popups.
+  end
+
+  step 'I should see group "Owned" in group list' do
+    page.should have_content("Owned")
+  end
+
+  step 'I should not see group "Owned" in group list' do
+    page.should_not have_content("Owned")
+  end
+
+  step 'I should see group "Guest" in group list' do
+    page.should have_content("Guest")
+  end
+
+  step 'I should not see group "Guest" in group list' do
+    page.should_not have_content("Guest")
+  end
+end
diff --git a/features/steps/project/project_network_graph.rb b/features/steps/project/project_network_graph.rb
index c7d9ece6feb..1c5cfcc6c68 100644
--- a/features/steps/project/project_network_graph.rb
+++ b/features/steps/project/project_network_graph.rb
@@ -1,5 +1,6 @@
 class ProjectNetworkGraph < Spinach::FeatureSteps
   include SharedAuthentication
+  include SharedPaths
   include SharedProject
 
   Then 'page should have network graph' do
diff --git a/features/steps/shared/authentication.rb b/features/steps/shared/authentication.rb
index df05754c287..b8c11ce0a23 100644
--- a/features/steps/shared/authentication.rb
+++ b/features/steps/shared/authentication.rb
@@ -12,6 +12,14 @@ module SharedAuthentication
     login_as :admin
   end
 
+  step 'I sign in as "John Doe"' do
+    login_with(user_exists("John Doe"))
+  end
+
+  step 'I sign in as "Mary Jane"' do
+    login_with(user_exists("Mary Jane"))
+  end
+
   step 'I should be redirected to sign in page' do
     current_path.should == new_user_session_path
   end
diff --git a/features/steps/shared/group.rb b/features/steps/shared/group.rb
new file mode 100644
index 00000000000..6b4c47312a7
--- /dev/null
+++ b/features/steps/shared/group.rb
@@ -0,0 +1,36 @@
+module SharedGroup
+  include Spinach::DSL
+
+  step '"John Doe" is owner of group "Owned"' do
+    is_member_of("John Doe", "Owned", Gitlab::Access::OWNER)
+  end
+
+  step '"John Doe" is guest of group "Guest"' do
+    is_member_of("John Doe", "Guest", Gitlab::Access::GUEST)
+  end
+
+  step '"Mary Jane" is owner of group "Owned"' do
+    is_member_of("Mary Jane", "Owned", Gitlab::Access::OWNER)
+  end
+
+  step '"Mary Jane" is guest of group "Owned"' do
+    is_member_of("Mary Jane", "Owned", Gitlab::Access::GUEST)
+  end
+
+  step '"Mary Jane" is guest of group "Guest"' do
+    is_member_of("Mary Jane", "Guest", Gitlab::Access::GUEST)
+  end
+
+  protected
+
+  def is_member_of(username, groupname, role)
+    @project_count ||= 0
+    user = User.find_by(name: username) || create(:user, name: username)
+    group = Group.find_by(name: groupname) || create(:group, name: groupname)
+    group.add_user(user, role)
+    project ||= create(:project, namespace: group, path: "project#{@project_count}")
+    event   ||= create(:closed_issue_event, project: project)
+    project.team << [user, :master]
+    @project_count += 1
+  end
+end
diff --git a/features/steps/shared/paths.rb b/features/steps/shared/paths.rb
index c1aafc183dc..a0213815a78 100644
--- a/features/steps/shared/paths.rb
+++ b/features/steps/shared/paths.rb
@@ -17,24 +17,44 @@ module SharedPaths
   # Group
   # ----------------------------------------
 
-  step 'I visit group page' do
-    visit group_path(current_group)
+  step 'I visit group "Owned" page' do
+    visit group_path(Group.find_by(name:"Owned"))
   end
 
-  step 'I visit group issues page' do
-    visit issues_group_path(current_group)
+  step 'I visit group "Owned" issues page' do
+    visit issues_group_path(Group.find_by(name:"Owned"))
   end
 
-  step 'I visit group merge requests page' do
-    visit merge_requests_group_path(current_group)
+  step 'I visit group "Owned" merge requests page' do
+    visit merge_requests_group_path(Group.find_by(name:"Owned"))
   end
 
-  step 'I visit group members page' do
-    visit members_group_path(current_group)
+  step 'I visit group "Owned" members page' do
+    visit members_group_path(Group.find_by(name:"Owned"))
   end
 
-  step 'I visit group settings page' do
-    visit edit_group_path(current_group)
+  step 'I visit group "Owned" settings page' do
+    visit edit_group_path(Group.find_by(name:"Owned"))
+  end
+
+  step 'I visit group "Guest" page' do
+    visit group_path(Group.find_by(name:"Guest"))
+  end
+
+  step 'I visit group "Guest" issues page' do
+    visit issues_group_path(Group.find_by(name:"Guest"))
+  end
+
+  step 'I visit group "Guest" merge requests page' do
+    visit merge_requests_group_path(Group.find_by(name:"Guest"))
+  end
+
+  step 'I visit group "Guest" members page' do
+    visit members_group_path(Group.find_by(name:"Guest"))
+  end
+
+  step 'I visit group "Guest" settings page' do
+    visit edit_group_path(Group.find_by(name:"Guest"))
   end
 
   # ----------------------------------------
@@ -93,6 +113,14 @@ module SharedPaths
     visit history_profile_path
   end
 
+  step 'I visit profile groups page' do
+    visit profile_groups_path
+  end
+
+  step 'I should be redirected to the profile groups page' do
+    current_path.should == profile_groups_path
+  end
+
   # ----------------------------------------
   # Admin
   # ----------------------------------------
@@ -326,4 +354,12 @@ module SharedPaths
   def project
     project = Project.find_by!(name: "Shop")
   end
+
+  # ----------------------------------------
+  # Errors
+  # ----------------------------------------
+
+  Then 'page status code should be 404' do
+    page.status_code.should == 404
+  end
 end
diff --git a/features/steps/shared/project.rb b/features/steps/shared/project.rb
index a6354aeaf86..f35beab8af2 100644
--- a/features/steps/shared/project.rb
+++ b/features/steps/shared/project.rb
@@ -58,10 +58,6 @@ module SharedProject
     page.should have_content("Features:")
   end
 
-  Then 'page status code should be 404' do
-    page.status_code.should == 404
-  end
-
   def current_project
     @project ||= Project.first
   end
@@ -107,24 +103,21 @@ module SharedProject
   end
 
   step '"John Doe" is authorized to private project "Enterprise"' do
-    user = User.find_by(name: "John Doe")
-    user ||= create(:user, name: "John Doe", username: "john_doe")
+    user = user_exists("John Doe", username: "john_doe")
     project = Project.find_by(name: "Enterprise")
     project ||= create(:project, name: "Enterprise", namespace: user.namespace)
     project.team << [user, :master]
   end
 
   step '"John Doe" is authorized to internal project "Internal"' do
-    user = User.find_by(name: "John Doe")
-    user ||= create(:user, name: "John Doe", username: "john_doe")
+    user = user_exists("John Doe", username: "john_doe")
     project = Project.find_by(name: "Internal")
     project ||= create :project, name: 'Internal', visibility_level: Gitlab::VisibilityLevel::INTERNAL
     project.team << [user, :master]
   end
 
   step '"John Doe" is authorized to public project "Community"' do
-    user = User.find_by(name: "John Doe")
-    user ||= create(:user, name: "John Doe", username: "john_doe")
+    user = user_exists("John Doe", username: "john_doe")
     project = Project.find_by(name: "Community")
     project ||= create :project, name: 'Community', visibility_level: Gitlab::VisibilityLevel::PUBLIC
     project.team << [user, :master]
diff --git a/features/steps/shared/user.rb b/features/steps/shared/user.rb
index a2bf069a114..209d77c7acf 100644
--- a/features/steps/shared/user.rb
+++ b/features/steps/shared/user.rb
@@ -1,11 +1,17 @@
 module SharedUser
   include Spinach::DSL
 
-  step 'Create user "John Doe"' do
-    create(:user, name: "John Doe", username: "john_doe")
+  step 'User "John Doe" exists' do
+    user_exists("John Doe", {username: "john_doe"})
   end
 
-  step 'I sign in as "John Doe"' do
-    login_with(User.find_by(name: "John Doe"))
+  step 'User "Mary Jane" exists' do
+    user_exists("Mary Jane", {username: "mary_jane"})
+  end
+
+  protected
+
+  def user_exists(name, options = {})
+    User.find_by(name: name) || create(:user, {name: name, admin: false}.merge(options))
   end
 end
diff --git a/features/user.feature b/features/user.feature
index c1c1ddda52b..d4198c08de9 100644
--- a/features/user.feature
+++ b/features/user.feature
@@ -1,6 +1,6 @@
 Feature: User
   Background:
-    Given Create user "John Doe"
+    Given User "John Doe" exists
     And "John Doe" is authorized to private project "Enterprise"
 
   # Signed out