Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarin Jankovski <maxlazio@gmail.com>2014-09-12 21:03:47 +0400
committerMarin Jankovski <maxlazio@gmail.com>2014-09-12 21:03:47 +0400
commit1fd58c84a027e62df0ec3cc0ff7e45bcf8965255 (patch)
tree89cec44d3f4d7cbe08d35704e81f473296a53bc9
parent5ac019946f327852d9c355bbe95de1f0c1cfad59 (diff)
parent8321a4d41fb760c6ac4c91aea3dd757eea953c21 (diff)
Merge pull request #7741 from Razer6/refactor/remove_duplicate_steps
[Refactor] Remove duplicated labels step
-rw-r--r--features/project/issues/labels.feature4
-rw-r--r--features/steps/project/labels.rb18
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'