summaryrefslogtreecommitdiff
path: root/features
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-07-01 09:32:41 +0000
committerDouwe Maan <douwe@gitlab.com>2015-07-01 09:32:41 +0000
commit690aafebdb96b01d585fedf6a3ba7be0d8adbf67 (patch)
tree87d8efe43f85a25c975ab12bb49d252a45964ef0 /features
parentb096374dd50226b96f96203f3a02780c40c4502a (diff)
parenta521e88fc065242b61becbe101ced908e7dadfbd (diff)
downloadgitlab-ce-690aafebdb96b01d585fedf6a3ba7be0d8adbf67.tar.gz
Merge branch 'group_settings_nav' into 'master'
Fix consistency issue in sidebars of Project and Group Settings. Fixes #2277 ![before_after_group_settings_nav](https://dev.gitlab.org/gitlab/gitlabhq/uploads/370c701d0eff8f1f8e44cf954c75f2bf/before_after_group_settings_nav.png) See merge request !1871
Diffstat (limited to 'features')
-rw-r--r--features/steps/project/active_tab.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/features/steps/project/active_tab.rb b/features/steps/project/active_tab.rb
index fabbc1d3d81..9e96fa5ba49 100644
--- a/features/steps/project/active_tab.rb
+++ b/features/steps/project/active_tab.rb
@@ -20,8 +20,8 @@ class Spinach::Features::ProjectActiveTab < Spinach::FeatureSteps
end
step 'I click the "Edit" tab' do
- page.within '.project-settings-nav' do
- click_link('Project')
+ page.within '.sidebar-subnav' do
+ click_link('Project Settings')
end
end