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

This commit is contained in:
Marin Jankovski
2014-09-12 19:03:59 +02:00
2 changed files with 8 additions and 14 deletions
+2 -2
View File
@@ -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
+6 -12
View File
@@ -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'