summaryrefslogtreecommitdiff
path: root/features/steps/project
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2017-09-07 13:26:48 +0000
committerFilipa Lacerda <filipa@gitlab.com>2017-09-07 13:26:48 +0000
commitb8adc0d0423ac53bf94aeb4361c3eb82a4e905c6 (patch)
treebee55832212a9f4491dd5500d7654c609d268637 /features/steps/project
parent0c2dc7273819b29efcb77a347af0116aeb5a9927 (diff)
parente58750dd08d1af7322a1bbdd5bfcc3667d33fc15 (diff)
downloadgitlab-ce-b8adc0d0423ac53bf94aeb4361c3eb82a4e905c6.tar.gz
Merge branch 'fly-out-top-level-item' into 'master'
Add top level items to fly-out navigation Closes #36294 See merge request !13981
Diffstat (limited to 'features/steps/project')
-rw-r--r--features/steps/project/fork.rb2
-rw-r--r--features/steps/project/source/markdown_render.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/features/steps/project/fork.rb b/features/steps/project/fork.rb
index 3b8d9af96c1..513ccce2f8f 100644
--- a/features/steps/project/fork.rb
+++ b/features/steps/project/fork.rb
@@ -37,7 +37,7 @@ class Spinach::Features::ProjectFork < Spinach::FeatureSteps
step 'I goto the Merge Requests page' do
page.within '.nav-sidebar' do
- click_link "Merge Requests"
+ first(:link, "Merge Requests").click
end
end
diff --git a/features/steps/project/source/markdown_render.rb b/features/steps/project/source/markdown_render.rb
index 243a0f54f7f..f6445b57ec0 100644
--- a/features/steps/project/source/markdown_render.rb
+++ b/features/steps/project/source/markdown_render.rb
@@ -218,7 +218,7 @@ class Spinach::Features::ProjectSourceMarkdownRender < Spinach::FeatureSteps
# Wiki
step 'I go to wiki page' do
- click_link "Wiki"
+ first(:link, "Wiki").click
expect(current_path).to eq project_wiki_path(@project, "home")
end