diff options
| author | Marin Jankovski <marin@gitlab.com> | 2014-09-12 19:03:59 +0200 |
|---|---|---|
| committer | Marin Jankovski <marin@gitlab.com> | 2014-09-12 19:03:59 +0200 |
| commit | 7d3daa4dfbf5e00d48e4658d7bf7406406e63607 (patch) | |
| tree | 7ee8db9b6fd9dacfb2f410075939e7d8f0fae127 | |
| parent | 4bf24d239f1c1140405f19bfe63ffb99042f6e37 (diff) | |
| parent | 1fd58c84a027e62df0ec3cc0ff7e45bcf8965255 (diff) | |
| download | gitlab-ce-7d3daa4dfbf5e00d48e4658d7bf7406406e63607.tar.gz | |
Merge branch 'master' of github.com:gitlabhq/gitlabhq
| -rw-r--r-- | features/project/issues/labels.feature | 4 | ||||
| -rw-r--r-- | features/steps/project/labels.rb | 18 |
2 files changed, 8 insertions, 14 deletions
diff --git a/features/project/issues/labels.feature b/features/project/issues/labels.feature index bdc1646ff12..a9fe1595fc5 100644 --- a/features/project/issues/labels.feature +++ b/features/project/issues/labels.feature @@ -6,8 +6,8 @@ Feature: Project Labels Given I visit project "Shop" labels page Scenario: I should see labels list - Then I should see label "bug" - And I should see label "feature" + Then I should see label 'bug' + And I should see label 'feature' Scenario: I create new label Given I visit project "Shop" new label page diff --git a/features/steps/project/labels.rb b/features/steps/project/labels.rb index 6dd4df8a1ad..62c1d74c718 100644 --- a/features/steps/project/labels.rb +++ b/features/steps/project/labels.rb @@ -3,18 +3,6 @@ class ProjectLabels < Spinach::FeatureSteps include SharedProject include SharedPaths - step 'I should see label "bug"' do - within ".manage-labels-list" do - page.should have_content "bug" - end - end - - step 'I should see label "feature"' do - within ".manage-labels-list" do - page.should have_content "feature" - end - end - step 'I visit \'bug\' label edit page' do visit edit_project_label_path(project, bug_label) end @@ -71,6 +59,12 @@ class ProjectLabels < Spinach::FeatureSteps end end + step 'I should see label \'feature\'' do + within '.manage-labels-list' do + page.should have_content 'feature' + end + end + step 'I should see label \'bug\'' do within '.manage-labels-list' do page.should have_content 'bug' |