diff options
author | Douwe Maan <douwe@gitlab.com> | 2015-12-16 21:24:29 +0300 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2015-12-16 21:27:46 +0300 |
commit | 8eb51dc037ef69454731d17cdd7b13e9285fd755 (patch) | |
tree | ab464934bfc8c9d6559306f8498ec045f425fb10 /spec | |
parent | d89216ee3aff33a7f74bd1a3ed9370de53575098 (diff) |
Fix updating and disabling merge button when Merge Immediately is clicked
Diffstat (limited to 'spec')
-rw-r--r-- | spec/features/merge_requests/merge_when_build_succeeds_spec.rb | 6 |
1 files changed, 3 insertions, 3 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 28a46a0725d..7aa7eb965e9 100644 --- a/spec/features/merge_requests/merge_when_build_succeeds_spec.rb +++ b/spec/features/merge_requests/merge_when_build_succeeds_spec.rb @@ -21,12 +21,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_link "Merge When Build Succeeds" + expect(page).to have_button "Merge When Build Succeeds" end context "Merge When Build succeeds enabled" do before do - click_link "Merge When Build Succeeds" + click_button "Merge When Build Succeeds" end it 'activates Merge When Build Succeeds feature' do @@ -58,7 +58,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_link "Merge When Build Succeeds" + expect(page).to have_button "Merge When Build Succeeds" visit_merge_request(merge_request) # Needed to refresh the page expect(page).to have_content "Canceled the automatic merge" |