diff options
author | Jacob Schatz <jschatz1@gmail.com> | 2016-03-11 13:07:43 +0000 |
---|---|---|
committer | Jacob Schatz <jschatz1@gmail.com> | 2016-03-11 13:07:43 +0000 |
commit | d343c7a159a1786e2d43f1a060b7c79edbd67376 (patch) | |
tree | f9da9679b6dbea6f0d8d418041e72baa9475d184 /spec/features | |
parent | 1f08363650169925f01261863ee905ad103a177f (diff) | |
parent | 6690d8e25b0da2fa83e218d6f2411df7cec9ef32 (diff) | |
download | gitlab-ce-d343c7a159a1786e2d43f1a060b7c79edbd67376.tar.gz |
Merge branch 'comment-discard-button' into 'master'
Added discard button to comment form
Also changed the labels on the buttons to better match the action they are completing.
Closes #8057
See merge request !3085
Diffstat (limited to 'spec/features')
-rw-r--r-- | spec/features/notes_on_merge_requests_spec.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/features/notes_on_merge_requests_spec.rb b/spec/features/notes_on_merge_requests_spec.rb index 1a360cd1ebc..d9a8058efd9 100644 --- a/spec/features/notes_on_merge_requests_spec.rb +++ b/spec/features/notes_on_merge_requests_spec.rb @@ -22,7 +22,7 @@ describe 'Comments', feature: true do it 'should be valid' do is_expected.to have_css('.js-main-target-form', visible: true, count: 1) expect(find('.js-main-target-form input[type=submit]').value). - to eq('Add Comment') + to eq('Comment') page.within('.js-main-target-form') do expect(page).not_to have_link('Cancel') end @@ -49,7 +49,7 @@ describe 'Comments', feature: true do page.within('.js-main-target-form') do fill_in 'note[note]', with: 'This is awsome!' find('.js-md-preview-button').click - click_button 'Add Comment' + click_button 'Comment' end end @@ -202,7 +202,7 @@ describe 'Comments', feature: true do before do page.within("tr[id='#{line_code_2}'] + .js-temp-notes-holder") do fill_in 'note[note]', with: 'Another comment on line 10' - click_button('Add Comment') + click_button('Comment') end end |