Commit e315e3ea authored by Bryce Johnson's avatar Bryce Johnson

Enable JavaScript for Approval Spinach specs.

parent e93f06b7
......@@ -329,6 +329,7 @@ Feature: Project Merge Requests
And I click link "Close"
Then I should see closed merge request "Bug NS-04"
@javascript
Scenario: Developer can approve merge request
Given I am a "Shop" developer
And I visit project "Shop" merge requests page
......@@ -337,6 +338,7 @@ Feature: Project Merge Requests
When I click link "Approve"
Then I should see approved merge request "Bug NS-04"
@javascript
Scenario: I can not approve merge request if I am not an approver
Given merge request 'Bug NS-04' must be approved by some user
And I click link "Bug NS-04"
......
......@@ -635,7 +635,6 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
step 'I should see message that MR require an approval from me' do
page.within '.mr-state-widget' do
wait_for_ajax
expect(page).to have_content("Requires 1 more approval (from #{current_user.name})")
end
end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment