summaryrefslogtreecommitdiff
path: root/features
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-01-28 15:36:12 -0800
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-01-28 15:36:12 -0800
commitb076d8cddb37ea7ae24cd035967cba885cdc429d (patch)
treea21a0dc6a871961375023bb754589eb28b213ce6 /features
parent34b7472b33986db8894939b59116784f706d4759 (diff)
downloadgitlab-ce-b076d8cddb37ea7ae24cd035967cba885cdc429d.tar.gz
Fix test for merge request
Diffstat (limited to 'features')
-rw-r--r--features/steps/project/merge_requests.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/features/steps/project/merge_requests.rb b/features/steps/project/merge_requests.rb
index 071ef75dc62..6f421de1aba 100644
--- a/features/steps/project/merge_requests.rb
+++ b/features/steps/project/merge_requests.rb
@@ -173,7 +173,9 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
merge!: true,
)
- click_button "Accept Merge Request"
+ within '.can_be_merged' do
+ click_button "Accept Merge Request"
+ end
end
step 'I should see merged request' do