summaryrefslogtreecommitdiff
path: root/features
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-07-19 15:26:51 +0000
committerRémy Coutable <remy@rymai.me>2017-07-19 15:26:51 +0000
commit1df5380ef91022c640490290e18dca19f10a505c (patch)
treea8615f52c191547bf27dca76d72e6929d3265b35 /features
parent55b981343b8e91a9890f6be1c202289cc425f89b (diff)
parent1c84f668bc25179848c002d52a4738d379da2a62 (diff)
downloadgitlab-ce-1df5380ef91022c640490290e18dca19f10a505c.tar.gz
Merge branch '23036-replace-dashboard-spinach' into 'master'
Replaces dashboard/dashboard.feature spinach with rspec See merge request !12876
Diffstat (limited to 'features')
-rw-r--r--features/dashboard/dashboard.feature70
-rw-r--r--features/steps/dashboard/dashboard.rb83
-rw-r--r--features/steps/shared/project.rb5
3 files changed, 0 insertions, 158 deletions
diff --git a/features/dashboard/dashboard.feature b/features/dashboard/dashboard.feature
deleted file mode 100644
index 1af4d46dec9..00000000000
--- a/features/dashboard/dashboard.feature
+++ /dev/null
@@ -1,70 +0,0 @@
-@dashboard
-Feature: Dashboard
- Background:
- Given I sign in as a user
- And I own project "Shop"
- And project "Shop" has push event
- And project "Shop" has CI enabled
- And project "Shop" has CI build
- And project "Shop" has labels: "bug", "feature", "enhancement"
- And project "Shop" has issue: "bug report"
- And I visit dashboard page
-
- Scenario: I should see projects list
- Then I should see "New Project" link
- Then I should see "Shop" project link
- Then I should see "Shop" project CI status
-
- @javascript
- Scenario: I should see activity list
- And I visit dashboard activity page
- Then I should see project "Shop" activity feed
-
- Scenario: I should see groups list
- Given I have group with projects
- And I visit dashboard page
- Then I should see groups list
-
- @javascript
- Scenario: I should see last push widget
- Then I should see last push widget
- And I click "Create Merge Request" link
- Then I see prefilled new Merge Request page
-
- @javascript
- Scenario: Sorting Issues
- Given I visit dashboard issues page
- And I sort the list by "Oldest updated"
- And I visit dashboard activity page
- And I visit dashboard issues page
- Then The list should be sorted by "Oldest updated"
-
- @javascript
- Scenario: Filtering Issues by label
- Given project "Shop" has issue "Bugfix1" with label "feature"
- When I visit dashboard issues page
- And I filter the list by label "feature"
- Then I should see "Bugfix1" in issues list
-
- @javascript
- Scenario: Visiting Project's issues after sorting
- Given I visit dashboard issues page
- And I sort the list by "Oldest updated"
- And I visit project "Shop" issues page
- Then The list should be sorted by "Oldest updated"
-
- @javascript
- Scenario: Sorting Merge Requests
- Given I visit dashboard merge requests page
- And I sort the list by "Oldest updated"
- And I visit dashboard activity page
- And I visit dashboard merge requests page
- Then The list should be sorted by "Oldest updated"
-
- @javascript
- Scenario: Visiting Project's merge requests after sorting
- Given project "Shop" has a "Bugfix MR" merge request open
- And I visit dashboard merge requests page
- And I sort the list by "Oldest updated"
- And I visit project "Shop" merge requests page
- Then The list should be sorted by "Oldest updated"
diff --git a/features/steps/dashboard/dashboard.rb b/features/steps/dashboard/dashboard.rb
deleted file mode 100644
index 0960f49aad3..00000000000
--- a/features/steps/dashboard/dashboard.rb
+++ /dev/null
@@ -1,83 +0,0 @@
-class Spinach::Features::Dashboard < Spinach::FeatureSteps
- include SharedAuthentication
- include SharedPaths
- include SharedProject
- include SharedIssuable
-
- step 'I should see "New Project" link' do
- expect(page).to have_link "New project"
- end
-
- step 'I should see "Shop" project link' do
- expect(page).to have_link "Shop"
- end
-
- step 'I should see "Shop" project CI status' do
- expect(page).to have_link "Commit: skipped"
- end
-
- step 'I should see last push widget' do
- expect(page).to have_content "You pushed to fix"
- expect(page).to have_link "Create merge request"
- end
-
- step 'I click "Create merge request" link' do
- find_link("Create merge request", visible: false).trigger('click')
- end
-
- step 'I see prefilled new Merge Request page' do
- expect(page).to have_selector('.merge-request-form')
- expect(current_path).to eq project_new_merge_request_path(@project)
- expect(find("#merge_request_target_project_id").value).to eq @project.id.to_s
- expect(find("input#merge_request_source_branch").value).to eq "fix"
- expect(find("input#merge_request_target_branch").value).to eq "master"
- end
-
- step 'I have group with projects' do
- @group = create(:group)
- @project = create(:empty_project, namespace: @group)
- @event = create(:closed_issue_event, project: @project)
-
- @project.team << [current_user, :master]
- end
-
- step 'I should see projects list' do
- @user.authorized_projects.all.each do |project|
- expect(page).to have_link project.name_with_namespace
- end
- end
-
- step 'I should see groups list' do
- Group.all.each do |group|
- expect(page).to have_link group.name
- end
- end
-
- step 'group has a projects that does not belongs to me' do
- @forbidden_project1 = create(:empty_project, group: @group)
- @forbidden_project2 = create(:empty_project, group: @group)
- end
-
- step 'I should see 1 project at group list' do
- expect(find('span.last_activity/span')).to have_content('1')
- end
-
- step 'I filter the list by label "feature"' do
- page.within ".labels-filter" do
- find('.dropdown').click
- click_link "feature"
- end
- end
-
- step 'I should see "Bugfix1" in issues list' do
- page.within "ul.content-list" do
- expect(page).to have_content "Bugfix1"
- end
- end
-
- step 'project "Shop" has issue "Bugfix1" with label "feature"' do
- project = Project.find_by(name: "Shop")
- issue = create(:issue, title: "Bugfix1", project: project, assignees: [current_user])
- issue.labels << project.labels.find_by(title: 'feature')
- end
-end
diff --git a/features/steps/shared/project.rb b/features/steps/shared/project.rb
index 729e2b8982c..da1cdd9f897 100644
--- a/features/steps/shared/project.rb
+++ b/features/steps/shared/project.rb
@@ -239,11 +239,6 @@ module SharedProject
create(:label, project: project, title: 'enhancement')
end
- step 'project "Shop" has issue: "bug report"' do
- project = Project.find_by(name: "Shop")
- create(:issue, project: project, title: "bug report")
- end
-
step 'project "Shop" has CI enabled' do
project = Project.find_by(name: "Shop")
project.enable_ci