summaryrefslogtreecommitdiff
path: root/features
diff options
context:
space:
mode:
authorTim Zallmann <tzallmann@gitlab.com>2017-05-29 11:28:20 +0200
committerTim Zallmann <tzallmann@gitlab.com>2017-06-07 11:10:24 +0200
commit33748960716916f0e6c6bbc168d4ad7f76120102 (patch)
tree8234a6cb1063d2169ff99f579a5fe7085eecbd72 /features
parent6709e65cfc9fcfbe90427645cd1cf679a28ebddd (diff)
downloadgitlab-ce-33748960716916f0e6c6bbc168d4ad7f76120102.tar.gz
Check for Merge Request fixed
Fixed couple of spinach test
Diffstat (limited to 'features')
-rw-r--r--features/steps/project/merge_requests.rb4
-rw-r--r--features/steps/project/snippets.rb4
2 files changed, 6 insertions, 2 deletions
diff --git a/features/steps/project/merge_requests.rb b/features/steps/project/merge_requests.rb
index 54b6352c952..17d190711f5 100644
--- a/features/steps/project/merge_requests.rb
+++ b/features/steps/project/merge_requests.rb
@@ -14,7 +14,9 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
end
step 'I click link "New Merge Request"' do
- page.has_link?('New Merge Request') ? click_link("New Merge Request") : click_link('New merge request')
+ page.within '#content-body' do
+ page.has_link?('New Merge Request') ? click_link("New Merge Request") : click_link('New merge request')
+ end
end
step 'I click link "Bug NS-04"' do
diff --git a/features/steps/project/snippets.rb b/features/steps/project/snippets.rb
index e3f5e9e3ef3..dd49701a3d9 100644
--- a/features/steps/project/snippets.rb
+++ b/features/steps/project/snippets.rb
@@ -23,7 +23,9 @@ class Spinach::Features::ProjectSnippets < Spinach::FeatureSteps
end
step 'I click link "New snippet"' do
- first(:link, "New snippet").click
+ page.within '#content-body' do
+ first(:link, "New snippet").click
+ end
end
step 'I click link "Snippet one"' do