diff options
author | Mike Greiling <mike@pixelcog.com> | 2018-09-08 02:27:24 +0300 |
---|---|---|
committer | Mike Greiling <mike@pixelcog.com> | 2018-09-08 02:27:24 +0300 |
commit | 6d1b5850342a91ebdff07bb57722ce28e31b773f (patch) | |
tree | a3e36284caef0fd582ca9ed1cd3012085657ba3c /spec/features | |
parent | d7c694b6e979c6ed570fd1981f78b39d0b0a5fcb (diff) | |
parent | f32ec46ede6198ad3bbc6f57d404a8a8e22cd008 (diff) |
Merge branch 'tz-mr-new-datastructure' into 'master'
Vue MR Page - Data structure update
See merge request gitlab-org/gitlab-ce!21062
Diffstat (limited to 'spec/features')
-rw-r--r-- | spec/features/merge_request/user_posts_diff_notes_spec.rb | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/spec/features/merge_request/user_posts_diff_notes_spec.rb b/spec/features/merge_request/user_posts_diff_notes_spec.rb index 77261f9375c..b6ed3686de2 100644 --- a/spec/features/merge_request/user_posts_diff_notes_spec.rb +++ b/spec/features/merge_request/user_posts_diff_notes_spec.rb @@ -186,11 +186,8 @@ describe 'Merge request > User posts diff notes', :js do describe 'posting a note' do it 'adds as discussion' do - expect(page).to have_css('.js-temp-notes-holder', count: 2) - should_allow_commenting(find('[id="6eb14e00385d2fb284765eb1cd8d420d33d63fc9_22_22"]'), asset_form_reset: false) expect(page).to have_css('.notes_holder .note.note-discussion', count: 1) - expect(page).to have_css('.js-temp-notes-holder', count: 1) expect(page).to have_button('Reply...') end end @@ -267,7 +264,7 @@ describe 'Merge request > User posts diff notes', :js do def assert_comment_persistence(line_holder, asset_form_reset:) notes_holder_saved = line_holder.find(:xpath, notes_holder_input_xpath) - expect(notes_holder_saved[:class]).not_to include(notes_holder_input_class) + expect(notes_holder_saved[:class]).not_to include('note-edit-form') expect(notes_holder_saved).to have_content test_note_comment assert_form_is_reset if asset_form_reset @@ -281,6 +278,6 @@ describe 'Merge request > User posts diff notes', :js do end def assert_form_is_reset - expect(page).to have_no_css('.js-temp-notes-holder') + expect(page).to have_no_css('.note-edit-form') end end |