Commit 7d3daa4d authored by Marin Jankovski's avatar Marin Jankovski

Merge branch 'master' of github.com:gitlabhq/gitlabhq

parents 4bf24d23 1fd58c84
...@@ -6,8 +6,8 @@ Feature: Project Labels ...@@ -6,8 +6,8 @@ Feature: Project Labels
Given I visit project "Shop" labels page Given I visit project "Shop" labels page
Scenario: I should see labels list Scenario: I should see labels list
Then I should see label "bug" Then I should see label 'bug'
And I should see label "feature" And I should see label 'feature'
Scenario: I create new label Scenario: I create new label
Given I visit project "Shop" new label page Given I visit project "Shop" new label page
......
...@@ -3,18 +3,6 @@ class ProjectLabels < Spinach::FeatureSteps ...@@ -3,18 +3,6 @@ class ProjectLabels < Spinach::FeatureSteps
include SharedProject include SharedProject
include SharedPaths 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 step 'I visit \'bug\' label edit page' do
visit edit_project_label_path(project, bug_label) visit edit_project_label_path(project, bug_label)
end end
...@@ -71,6 +59,12 @@ class ProjectLabels < Spinach::FeatureSteps ...@@ -71,6 +59,12 @@ class ProjectLabels < Spinach::FeatureSteps
end end
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 step 'I should see label \'bug\'' do
within '.manage-labels-list' do within '.manage-labels-list' do
page.should have_content 'bug' page.should have_content 'bug'
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment