Fix test for merge request

b076d8cd · Dmitriy Zaporozhets · 34b7472b · b076d8cd
Commit b076d8cd authored Jan 28, 2015 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

merge_requests.rb features/steps/project/merge_requests.rb +3 -1

No files found.
--- 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