summaryrefslogtreecommitdiff
path: root/features
diff options
context:
space:
mode:
authorJacob Schatz <jschatz@gitlab.com>2016-07-07 21:17:23 +0000
committerJacob Schatz <jschatz@gitlab.com>2016-07-07 21:17:23 +0000
commit5541e55c491eb86567c8c1f28457e894a4155dd1 (patch)
tree1fd84776d751c33665aca26c1e4d4eac624fd295 /features
parent86d238e4bda6424a79eb9d8ea7cfe41af714f49f (diff)
parente486bbfd34bc962ddc6e7a0433a5b0cce74603a7 (diff)
downloadgitlab-ce-5541e55c491eb86567c8c1f28457e894a4155dd1.tar.gz
Merge branch 'issues-blank-state' into 'master'
Added blank state to issues ## What does this MR do? Adds new blank state to issues when no issues exist. Part of #18519 ## Screenshots (if relevant) ![Screen_Shot_2016-06-24_at_16.37.12](/uploads/0c3f385615b29216ef1137bd6fac06af/Screen_Shot_2016-06-24_at_16.37.12.png) See merge request !4908
Diffstat (limited to 'features')
-rw-r--r--features/dashboard/dashboard.feature1
-rw-r--r--features/project/merge_requests.feature7
-rw-r--r--features/steps/shared/project.rb5
3 files changed, 6 insertions, 7 deletions
diff --git a/features/dashboard/dashboard.feature b/features/dashboard/dashboard.feature
index db73309804c..1f4c9020731 100644
--- a/features/dashboard/dashboard.feature
+++ b/features/dashboard/dashboard.feature
@@ -7,6 +7,7 @@ Feature: Dashboard
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
diff --git a/features/project/merge_requests.feature b/features/project/merge_requests.feature
index 0e97e4d5954..21768c15c17 100644
--- a/features/project/merge_requests.feature
+++ b/features/project/merge_requests.feature
@@ -89,13 +89,6 @@ Feature: Project Merge Requests
Then The list should be sorted by "Oldest updated"
@javascript
- Scenario: Visiting Issues after being sorted the list
- Given I visit project "Shop" merge requests 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: Visiting Merge Requests from a differente Project after sorting
Given I visit project "Shop" merge requests page
And I sort the list by "Oldest updated"
diff --git a/features/steps/shared/project.rb b/features/steps/shared/project.rb
index b3411c03118..0b4920883b8 100644
--- a/features/steps/shared/project.rb
+++ b/features/steps/shared/project.rb
@@ -223,6 +223,11 @@ 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