1 files changed, 10 insertions, 251 deletions

diff --git a/features/steps/groups.rb b/features/steps/groups.rb
index 9c0313537b1..f5e3fee61c0 100644
--- a/features/steps/groups.rb
+++ b/features/steps/groups.rb
@@ -3,20 +3,11 @@ class Spinach::Features::Groups < Spinach::FeatureSteps
   include SharedPaths
   include SharedGroup
   include SharedUser
-  include Select2Helper
 
   step 'I should see back to dashboard button' do
     expect(page).to have_content 'Go to dashboard'
   end
 
-  step 'gitlab user "Mike"' do
-    create(:user, name: "Mike")
-  end
-
-  step 'I click link "Add members"' do
-    find(:css, 'button.btn-new').click
-  end
-
   step 'I should see group "Owned"' do
     expect(page).to have_content '@owned'
   end
@@ -26,7 +17,7 @@ class Spinach::Features::Groups < Spinach::FeatureSteps
   end
 
   step 'Group "Owned" has a public project "Public-project"' do
-    group = Group.find_by(name: "Owned")
+    group = owned_group
 
     @project = create :empty_project, :public,
                  group: group,
@@ -37,61 +28,8 @@ class Spinach::Features::Groups < Spinach::FeatureSteps
     expect(page).to have_content 'Public-project'
   end
 
-  step 'I select "Mike" as "Reporter"' do
-    user = User.find_by(name: "Mike")
-
-    page.within ".users-group-form" do
-      select2(user.id, from: "#user_ids", multiple: true)
-      select "Reporter", from: "access_level"
-    end
-
-    click_button "Add users to group"
-  end
-
-  step 'I select "Mike" as "Master"' do
-    user = User.find_by(name: "Mike")
-
-    page.within ".users-group-form" do
-      select2(user.id, from: "#user_ids", multiple: true)
-      select "Master", from: "access_level"
-    end
-
-    click_button "Add users to group"
-  end
-
-  step 'I should see "Mike" in team list as "Reporter"' do
-    page.within '.well-list' do
-      expect(page).to have_content('Mike')
-      expect(page).to have_content('Reporter')
-    end
-  end
-
-  step 'I should see "Mike" in team list as "Owner"' do
-    page.within '.well-list' do
-      expect(page).to have_content('Mike')
-      expect(page).to have_content('Owner')
-    end
-  end
-
-  step 'I select "sjobs@apple.com" as "Reporter"' do
-    page.within ".users-group-form" do
-      select2("sjobs@apple.com", from: "#user_ids", multiple: true)
-      select "Reporter", from: "access_level"
-    end
-
-    click_button "Add users to group"
-  end
-
-  step 'I should see "sjobs@apple.com" in team list as invited "Reporter"' do
-    page.within '.well-list' do
-      expect(page).to have_content('sjobs@apple.com')
-      expect(page).to have_content('invited')
-      expect(page).to have_content('Reporter')
-    end
-  end
-
   step 'I should see group "Owned" projects list' do
-    Group.find_by(name: "Owned").projects.each do |project|
+    owned_group.projects.each do |project|
       expect(page).to have_link project.name
     end
   end
@@ -112,36 +50,6 @@ class Spinach::Features::Groups < Spinach::FeatureSteps
     end
   end
 
-  step 'I select user "Mary Jane" from list with role "Reporter"' do
-    user = User.find_by(name: "Mary Jane") || create(:user, name: "Mary Jane")
-    click_button 'Add members'
-    page.within ".users-group-form" do
-      select2(user.id, from: "#user_ids", multiple: true)
-      select "Reporter", from: "access_level"
-    end
-    click_button "Add users to group"
-  end
-
-  step 'I should see user "John Doe" in team list' do
-    projects_with_access = find(".panel .well-list")
-    expect(projects_with_access).to have_content("John Doe")
-  end
-
-  step 'I should not see user "John Doe" in team list' do
-    projects_with_access = find(".panel .well-list")
-    expect(projects_with_access).not_to have_content("John Doe")
-  end
-
-  step 'I should see user "Mary Jane" in team list' do
-    projects_with_access = find(".panel .well-list")
-    expect(projects_with_access).to have_content("Mary Jane")
-  end
-
-  step 'I should not see user "Mary Jane" in team list' do
-    projects_with_access = find(".panel .well-list")
-    expect(projects_with_access).not_to have_content("Mary Jane")
-  end
-
   step 'project from group "Owned" has issues assigned to me' do
     create :issue,
       project: project,
@@ -172,12 +80,12 @@ class Spinach::Features::Groups < Spinach::FeatureSteps
   step 'I change group "Owned" avatar' do
     attach_file(:group_avatar, File.join(Rails.root, 'spec', 'fixtures', 'banana_sample.gif'))
     click_button "Save group"
-    Group.find_by(name: "Owned").reload
+    owned_group.reload
   end
 
   step 'I should see new group "Owned" avatar' do
-    expect(Group.find_by(name: "Owned").avatar).to be_instance_of AvatarUploader
-    expect(Group.find_by(name: "Owned").avatar.url).to eq "/uploads/group/avatar/#{ Group.find_by(name:"Owned").id }/banana_sample.gif"
+    expect(owned_group.avatar).to be_instance_of AvatarUploader
+    expect(owned_group.avatar.url).to eq "/uploads/group/avatar/#{ Group.find_by(name:"Owned").id }/banana_sample.gif"
   end
 
   step 'I should see the "Remove avatar" button' do
@@ -187,83 +95,22 @@ class Spinach::Features::Groups < Spinach::FeatureSteps
   step 'I have group "Owned" avatar' do
     attach_file(:group_avatar, File.join(Rails.root, 'spec', 'fixtures', 'banana_sample.gif'))
     click_button "Save group"
-    Group.find_by(name: "Owned").reload
+    owned_group.reload
   end
 
   step 'I remove group "Owned" avatar' do
     click_link "Remove avatar"
-    Group.find_by(name: "Owned").reload
+    owned_group.reload
   end
 
   step 'I should not see group "Owned" avatar' do
-    expect(Group.find_by(name: "Owned").avatar?).to eq false
+    expect(owned_group.avatar?).to eq false
   end
 
   step 'I should not see the "Remove avatar" button' do
     expect(page).not_to have_link("Remove avatar")
   end
 
-  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
-
-  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
-
-  step 'I should not see the "Remove User From Group" button for "John Doe"' do
-    expect(find(:css, 'li', text: "John Doe")).not_to 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
-    expect(find(:css, 'li', text: "Mary Jane")).not_to have_selector(:css, 'a.btn-remove')
-    # poltergeist always confirms popups.
-  end
-
-  step 'I search for \'Mary\' member' do
-    page.within '.member-search-form' do
-      fill_in 'search', with: 'Mary'
-      click_button 'Search'
-    end
-  end
-
-  step 'I click on group milestones' do
-    click_link 'Milestones'
-  end
-
-  step 'I should see group milestones index page has no milestones' do
-    expect(page).to have_content('No milestones to show')
-  end
-
-  step 'Group has projects with milestones' do
-    group_milestone
-  end
-
-  step 'I should see group milestones index page with milestones' do
-    expect(page).to have_content('Version 7.2')
-    expect(page).to have_content('GL-113')
-    expect(page).to have_link('2 Issues', href: issues_group_path("owned", milestone_title: "Version 7.2"))
-    expect(page).to have_link('3 Merge Requests', href: merge_requests_group_path("owned", milestone_title: "GL-113"))
-  end
-
-  step 'I click on one group milestone' do
-    click_link 'GL-113'
-  end
-
-  step 'I should see group milestone with descriptions and expiry date' do
-    expect(page).to have_content('expires at Aug 20, 2114')
-  end
-
-  step 'I should see group milestone with all issues and MRs assigned to that milestone' do
-    expect(page).to have_content('Milestone GL-113')
-    expect(page).to have_content('Progress: 0 closed – 4 open')
-    expect(page).to have_link(@issue1.title, href: namespace_project_issue_path(@project1.namespace, @project1, @issue1))
-    expect(page).to have_link(@mr3.title, href: namespace_project_merge_request_path(@project3.namespace, @project3, @mr3))
-  end
-
   step 'Group "Owned" has archived project' do
     group = Group.find_by(name: 'Owned')
     create(:project, namespace: group, archived: true, path: "archived-project")
@@ -273,101 +120,13 @@ class Spinach::Features::Groups < Spinach::FeatureSteps
     expect(page).to have_xpath("//span[@class='label label-warning']", text: 'archived')
   end
 
-  step 'I fill milestone name' do
-    fill_in 'milestone_title', with: 'v2.9.0'
-  end
-
-  step 'I click new milestone button' do
-    click_link "New Milestone"
-  end
-
-  step 'I press create mileston button' do
-    click_button "Create Milestone"
-  end
-
-  step 'milestone in each project should be created' do
-    group = Group.find_by(name: 'Owned')
-    expect(page).to have_content "Milestone v2.9.0"
-    expect(group.projects).to be_present
-
-    group.projects.each do |project|
-      expect(page).to have_content project.name
-    end
-  end
-
-  protected
+  private
 
   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
-
-  def group_milestone
-    group = Group.find_by(name: "Owned")
-
-    @project1 = create :project,
-                 group: group
-    project2 = create :project,
-                 path: 'gitlab-ci',
-                 group: group
-    @project3 = create :project,
-                 path: 'cookbook-gitlab',
-                 group: group
-    milestone1_project1 = create :milestone,
-                            title: "Version 7.2",
-                            project: @project1
-    milestone1_project2 = create :milestone,
-                            title: "Version 7.2",
-                            project: project2
-    create :milestone,
-      title: "Version 7.2",
-      project: @project3
-    milestone2_project1 = create :milestone,
-                            title: "GL-113",
-                            project: @project1
-    milestone2_project2 = create :milestone,
-                            title: "GL-113",
-                            project: project2
-    milestone2_project3 = create :milestone,
-                            title: "GL-113",
-                            project: @project3,
-                            due_date: '2114-08-20',
-                            description: 'Lorem Ipsum is simply dummy text of the printing and typesetting industry'
-    @issue1 = create :issue,
-               project: @project1,
-               assignee: current_user,
-               author: current_user,
-               milestone: milestone2_project1
-    create :issue,
-      project: project2,
-      assignee: current_user,
-      author: current_user,
-      milestone: milestone1_project2
-    create :issue,
-      project: @project3,
-      assignee: current_user,
-      author: current_user,
-      milestone: milestone1_project1
-    create :merge_request,
-      source_project: @project1,
-      target_project: @project1,
-      assignee: current_user,
-      author: current_user,
-      milestone: milestone2_project1
-    create :merge_request,
-      source_project: project2,
-      target_project: project2,
-      assignee: current_user,
-      author: current_user,
-      milestone: milestone2_project2
-    @mr3 = create :merge_request,
-            source_project: @project3,
-            target_project: @project3,
-            assignee: current_user,
-            author: current_user,
-            milestone: milestone2_project3
+    owned_group.projects.first
   end
 end