Merge branch 'changes_tab_vue_refactoring' of gitlab.com:gitlab-org/gitlab-ce into changes_tab_vue_refactoring

1 files changed, 5 insertions, 6 deletions

diff --git a/spec/features/merge_request/user_posts_notes_spec.rb b/spec/features/merge_request/user_posts_notes_spec.rb
index b54addce993..bedfbb20438 100644
--- a/spec/features/merge_request/user_posts_notes_spec.rb
+++ b/spec/features/merge_request/user_posts_notes_spec.rb
@@ -24,7 +24,7 @@ describe 'Merge request > User posts notes', :js do
   describe 'the note form' do
     it 'is valid' do
       is_expected.to have_css('.js-main-target-form', visible: true, count: 1)
-      expect(find('.js-main-target-form .js-comment-button').value)
+      expect(find('.js-main-target-form .js-comment-button[disabled]').text)
         .to eq('Comment')
       page.within('.js-main-target-form') do
         expect(page).not_to have_link('Cancel')
@@ -41,7 +41,7 @@ describe 'Merge request > User posts notes', :js do
       it 'has enable submit button and preview button' do
         page.within('.js-main-target-form') do
           expect(page).not_to have_css('.js-comment-button[disabled]')
-          expect(page).to have_css('.js-md-preview-button', visible: true)
+          expect(page).to have_css('.js-preview-link', visible: true)
         end
       end
     end
@@ -51,7 +51,7 @@ describe 'Merge request > User posts notes', :js do
     before do
       page.within('.js-main-target-form') do
         fill_in 'note[note]', with: 'This is awesome!'
-        find('.js-md-preview-button').click
+        find('.js-preview-link').click
         click_button 'Comment'
       end
     end
@@ -60,10 +60,9 @@ describe 'Merge request > User posts notes', :js do
       is_expected.to have_content('This is awesome!')
       page.within('.js-main-target-form') do
         expect(page).to have_no_field('note[note]', with: 'This is awesome!')
-        expect(page).to have_css('.js-md-preview', visible: :hidden)
       end
       page.within('.js-main-target-form') do
-        is_expected.to have_css('.js-note-text', visible: true)
+        is_expected.to have_css('.js-vue-comment-form', visible: true)
       end
     end
   end
@@ -76,7 +75,7 @@ describe 'Merge request > User posts notes', :js do
     end
 
     it 'hides the toolbar buttons when previewing a note' do
-      find('.js-md-preview-button').click
+      find('.js-preview-link').click
       page.within('.js-main-target-form') do
         expect(page).not_to have_css('.md-header-toolbar.active')
       end