summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZeger-Jan van de Weg <mail@zjvandeweg.nl>2015-12-07 11:29:23 +0100
committerZeger-Jan van de Weg <mail@zjvandeweg.nl>2015-12-07 11:29:23 +0100
commit6eb75ed6ad2710126b577f8093e78faff64bae1b (patch)
treea6ce4a92ca5d88e393397cb5e9cf6aa40553adf9
parentcfc95b828724b0d7cb07254091e675d6d8093dba (diff)
downloadgitlab-ce-6eb75ed6ad2710126b577f8093e78faff64bae1b.tar.gz
Fix specs
-rw-r--r--spec/features/merge_requests/merge_when_build_succeeds_spec.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/spec/features/merge_requests/merge_when_build_succeeds_spec.rb b/spec/features/merge_requests/merge_when_build_succeeds_spec.rb
index b5f319f2040..3a8f0a344e8 100644
--- a/spec/features/merge_requests/merge_when_build_succeeds_spec.rb
+++ b/spec/features/merge_requests/merge_when_build_succeeds_spec.rb
@@ -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