diff options
author | Douwe Maan <douwe@gitlab.com> | 2017-02-02 14:34:00 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2017-02-02 14:34:00 +0000 |
commit | cbaf23841381216f0ea65fefebd0751c52749b1f (patch) | |
tree | d0f93b0c4bbf28647a914dcf94a54f448f0e6231 /spec/features | |
parent | 1d013ee97120fb9d1bebf1730fd50137fdc6ddbe (diff) | |
parent | ceb1ebd9590aaddc96cc059735bcf571464a8460 (diff) | |
download | gitlab-ce-cbaf23841381216f0ea65fefebd0751c52749b1f.tar.gz |
Merge branch 'jej-backport-active-tense-specs' into 'master'
Port 'Active tense test coverage' changes from EE
See merge request !8921
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 b785b2f7704..fab2d532e06 100644 --- a/spec/features/notes_on_merge_requests_spec.rb +++ b/spec/features/notes_on_merge_requests_spec.rb @@ -89,7 +89,7 @@ describe 'Comments', feature: true do end end - it 'should reset the edit note form textarea with the original content of the note if cancelled' do + it 'resets the edit note form textarea with the original content of the note if cancelled' do within('.current-note-edit-form') do fill_in 'note[note]', with: 'Some new content' find('.btn-cancel').click @@ -198,7 +198,7 @@ describe 'Comments', feature: true do end describe 'the note form' do - it "shouldn't add a second form for same row" do + it "does not add a second form for same row" do click_diff_line is_expected. @@ -206,7 +206,7 @@ describe 'Comments', feature: true do count: 1) end - it 'should be removed when canceled' do + it 'is removed when canceled' do is_expected.to have_css('.js-temp-notes-holder') page.within("form[data-line-code='#{line_code}']") do |