Commit 6eb75ed6 authored by Zeger-Jan van de Weg's avatar Zeger-Jan van de Weg

Fix specs

parent cfc95b82
......@@ -23,12 +23,12 @@ feature 'Merge When Build Succeeds', feature: true, js: true do
end
it 'displays the Merge When Build Succeeds button' do
expect(page).to have_button "Merge When Build Succeeds"
expect(page).to have_link "Merge When Build Succeeds"
end
context "Merge When Build succeeds enabled" do
before do
click_button "Merge When Build Succeeds"
click_link "Merge When Build Succeeds"
end
it 'activates Merge When Build Succeeds feature' do
......@@ -65,7 +65,7 @@ feature 'Merge When Build Succeeds', feature: true, js: true do
it 'cancels the automatic merge' do
click_link "Cancel Automatic Merge"
expect(page).to have_button "Merge When Build Succeeds"
expect(page).to have_link "Merge When Build Succeeds"
visit_merge_request(merge_request) # Needed to refresh the page
expect(page).to have_content "Canceled the automatic merge"
......@@ -82,7 +82,7 @@ feature 'Merge When Build Succeeds', feature: true, js: true do
context 'Build is not active' do
it "should not allow for enabling" do
visit_merge_request(merge_request)
expect(page).not_to have_button "Merge When Build Succeeds"
expect(page).not_to have_link "Merge When Build Succeeds"
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