summaryrefslogtreecommitdiff
path: root/features
diff options
context:
space:
mode:
authorJacob Schatz <jschatz@gitlab.com>2016-06-07 15:15:07 +0000
committerJacob Schatz <jschatz@gitlab.com>2016-06-07 15:15:07 +0000
commit5b83abcc01bd4a24268126dc52019b9f11152a7c (patch)
tree195d1b0b10dcaf5ae58472075d350812b270612e /features
parent25370fd158e95d9672340ac25d13ed51e8dc77af (diff)
parentee26c3cab4651c8876efc45b6a63539727e6a42e (diff)
downloadgitlab-ce-5b83abcc01bd4a24268126dc52019b9f11152a7c.tar.gz
Merge branch 'issue_14189' into 'master'
Ability to prioritize labels Closes #14189 See merge request !4009
Diffstat (limited to 'features')
-rw-r--r--features/steps/project/issues/labels.rb10
1 files changed, 5 insertions, 5 deletions
diff --git a/features/steps/project/issues/labels.rb b/features/steps/project/issues/labels.rb
index 8d87f6a7a58..e02b57bbf84 100644
--- a/features/steps/project/issues/labels.rb
+++ b/features/steps/project/issues/labels.rb
@@ -60,25 +60,25 @@ class Spinach::Features::ProjectIssuesLabels < Spinach::FeatureSteps
end
step 'I should see label \'feature\'' do
- page.within '.manage-labels-list' do
+ page.within '.other-labels .manage-labels-list' do
expect(page).to have_content 'feature'
end
end
step 'I should see label \'bug\'' do
- page.within '.manage-labels-list' do
+ page.within '.other-labels .manage-labels-list' do
expect(page).to have_content 'bug'
end
end
step 'I should not see label \'bug\'' do
- page.within '.manage-labels-list' do
+ page.within '.other-labels .manage-labels-list' do
expect(page).not_to have_content 'bug'
end
end
step 'I should see label \'support\'' do
- page.within '.manage-labels-list' do
+ page.within '.other-labels .manage-labels-list' do
expect(page).to have_content 'support'
end
end
@@ -90,7 +90,7 @@ class Spinach::Features::ProjectIssuesLabels < Spinach::FeatureSteps
end
step 'I should see label \'fix\'' do
- page.within '.manage-labels-list' do
+ page.within '.other-labels .manage-labels-list' do
expect(page).to have_content 'fix'
end
end