diff options
author | Jacob Schatz <jschatz1@gmail.com> | 2016-04-07 21:20:16 +0000 |
---|---|---|
committer | Yorick Peterse <yorickpeterse@gmail.com> | 2016-04-08 12:04:12 +0200 |
commit | 621d614492f524692dc50c3258a5ce2c2c397e9c (patch) | |
tree | e5ea191ad7d8f32185f688715c1e5325d0bbbbba /features/steps/project | |
parent | 2d5845a07addb5c24d5d9113e8defc8fcba62e4c (diff) | |
download | gitlab-ce-621d614492f524692dc50c3258a5ce2c2c397e9c.tar.gz |
Revert "Merge branch 'new-navigation-prototype' into 'master'"
This reverts merge request !3494
Diffstat (limited to 'features/steps/project')
-rw-r--r-- | features/steps/project/active_tab.rb | 4 | ||||
-rw-r--r-- | features/steps/project/fork.rb | 2 | ||||
-rw-r--r-- | features/steps/project/project.rb | 12 |
3 files changed, 11 insertions, 7 deletions
diff --git a/features/steps/project/active_tab.rb b/features/steps/project/active_tab.rb index 4584fc4d754..19d81453d8c 100644 --- a/features/steps/project/active_tab.rb +++ b/features/steps/project/active_tab.rb @@ -82,9 +82,7 @@ class Spinach::Features::ProjectActiveTab < Spinach::FeatureSteps # Sub Tabs: Issues step 'I click the "Milestones" tab' do - page.within '.nav-secondary' do - click_link('Milestones') - end + click_link('Milestones') end step 'I click the "Labels" tab' do diff --git a/features/steps/project/fork.rb b/features/steps/project/fork.rb index d9b16afa9b8..527f7853da9 100644 --- a/features/steps/project/fork.rb +++ b/features/steps/project/fork.rb @@ -36,7 +36,7 @@ class Spinach::Features::ProjectFork < Spinach::FeatureSteps end step 'I goto the Merge Requests page' do - page.within '.nav-secondary' do + page.within '.page-sidebar-expanded' do click_link "Merge Requests" end end diff --git a/features/steps/project/project.rb b/features/steps/project/project.rb index 8f1d4a223a9..ef185861e00 100644 --- a/features/steps/project/project.rb +++ b/features/steps/project/project.rb @@ -114,9 +114,7 @@ class Spinach::Features::Project < Spinach::FeatureSteps end step 'I should not see "Snippets" button' do - page.within '.nav-secondary' do - expect(page).not_to have_link 'Snippets' - end + expect(page).not_to have_link 'Snippets' end step 'project "Shop" belongs to group' do @@ -125,6 +123,14 @@ class Spinach::Features::Project < Spinach::FeatureSteps @project.save! end + step 'I should see back to dashboard button' do + expect(page).to have_content 'Go to dashboard' + end + + step 'I should see back to group button' do + expect(page).to have_content 'Go to group' + end + step 'I click notifications drop down button' do click_link 'notifications-button' end |