diff options
author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-07 12:09:20 +0100 |
---|---|---|
committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-07 12:09:20 +0100 |
commit | 2f22890d4223c0b524ee1f27e222a24a8f0c9a87 (patch) | |
tree | 79609a077a37cc49d95463b649ff4098cea10b4d /features/steps/project/merge_requests.rb | |
parent | 907b754173ed4185574c38ded0a173360d073085 (diff) | |
parent | fb7b0d6e710d462f5bef1df3195fa8b051668bfc (diff) | |
download | gitlab-ce-2f22890d4223c0b524ee1f27e222a24a8f0c9a87.tar.gz |
Merge branch 'update-droplab-to-webpack-version' into new-resolvable-discussion
Diffstat (limited to 'features/steps/project/merge_requests.rb')
-rw-r--r-- | features/steps/project/merge_requests.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/features/steps/project/merge_requests.rb b/features/steps/project/merge_requests.rb index a67b3222af3..3985fe8f2f7 100644 --- a/features/steps/project/merge_requests.rb +++ b/features/steps/project/merge_requests.rb @@ -300,10 +300,10 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps page.within('.current-note-edit-form', visible: true) do fill_in 'note_note', with: 'Typo, please fix' - click_button 'Save Comment' + click_button 'Save comment' end - expect(page).not_to have_button 'Save Comment', disabled: true, visible: true + expect(page).not_to have_button 'Save comment', disabled: true, visible: true end end @@ -381,7 +381,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps end step 'merge request is mergeable' do - expect(page).to have_button 'Accept Merge Request' + expect(page).to have_button 'Accept merge request' end step 'I modify merge commit message' do @@ -395,7 +395,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps step 'I accept this merge request' do page.within '.mr-state-widget' do - click_button "Accept Merge Request" + click_button "Accept merge request" end end |