diff options
author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2014-12-24 13:27:26 +0000 |
---|---|---|
committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2014-12-24 13:27:26 +0000 |
commit | 5cf2bd4c997d84e9a02d722d6ba870c24b06cc0f (patch) | |
tree | 6175021f35173b865cfa436548a92a7995368ea0 /features | |
parent | fe68c45aa566b436a122c1598c58006d37472e8d (diff) | |
parent | f775809910a2c8ebec1887ec39ba33325d00171a (diff) | |
download | gitlab-ce-5cf2bd4c997d84e9a02d722d6ba870c24b06cc0f.tar.gz |
Merge branch 'project-path' into 'master'
Project path
Fixes gitlab/gitlabhq#1781, gitlab/gitlabhq#1763
See merge request !1337
Diffstat (limited to 'features')
-rw-r--r-- | features/steps/admin/groups.rb | 2 | ||||
-rw-r--r-- | features/steps/groups.rb | 3 | ||||
-rw-r--r-- | features/steps/project/create.rb | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/features/steps/admin/groups.rb b/features/steps/admin/groups.rb index d69a87cd07e..4171398e568 100644 --- a/features/steps/admin/groups.rb +++ b/features/steps/admin/groups.rb @@ -22,7 +22,7 @@ class Spinach::Features::AdminGroups < Spinach::FeatureSteps end step 'submit form with new group info' do - fill_in 'group_name', with: 'gitlab' + fill_in 'group_path', with: 'gitlab' fill_in 'group_description', with: 'Group description' click_button "Create group" end diff --git a/features/steps/groups.rb b/features/steps/groups.rb index 66a32a51d75..0bd7a32f5cb 100644 --- a/features/steps/groups.rb +++ b/features/steps/groups.rb @@ -77,7 +77,7 @@ class Spinach::Features::Groups < Spinach::FeatureSteps end step 'submit form with new group "Samurai" info' do - fill_in 'group_name', with: 'Samurai' + fill_in 'group_path', with: 'Samurai' fill_in 'group_description', with: 'Tokugawa Shogunate' click_button "Create group" end @@ -93,6 +93,7 @@ class Spinach::Features::Groups < Spinach::FeatureSteps step 'I change group "Owned" name to "new-name"' do fill_in 'group_name', with: 'new-name' + fill_in 'group_path', with: 'new-name' click_button "Save group" end diff --git a/features/steps/project/create.rb b/features/steps/project/create.rb index e1062a6ce39..6b07b62f16f 100644 --- a/features/steps/project/create.rb +++ b/features/steps/project/create.rb @@ -3,7 +3,7 @@ class Spinach::Features::ProjectCreate < Spinach::FeatureSteps include SharedPaths step 'fill project form with valid data' do - fill_in 'project_name', with: 'Empty' + fill_in 'project_path', with: 'Empty' click_button "Create project" end |