Fix Markdown preview tests

features/project/commits/comments.feature

@@ -16,12 +16,12 @@ Feature: Project Commits Comments
   @javascript
   Scenario: I can't preview without text
     Given I haven't written any comment text
-    Then I should not see the comment preview button
+    Then The comment preview tab should say there is nothing to do
 
   @javascript
   Scenario: I can preview with text
-    Given I write a comment like "Nice"
-    Then I should see the comment preview button
+    Given I write a comment like ":+1: Nice"
+    Then The comment preview tab should be display rendered Markdown
 
   @javascript
   Scenario: I preview a comment
@@ -32,7 +32,7 @@ Feature: Project Commits Comments
   @javascript
   Scenario: I can edit after preview
     Given I preview a comment text like "Bug fixed :smile:"
-    Then I should see the comment edit button
+    Then I should see the comment write tab
 
   @javascript
   Scenario: I have a reset form after posting from preview

features/project/commits/diff_comments.feature

@@ -58,13 +58,13 @@ Feature: Project Commits Diff Comments
   Scenario: I can't preview without text
     Given I open a diff comment form
     And I haven't written any diff comment text
-    Then I should not see the diff comment preview button
+    Then The diff comment preview tab should say there is nothing to do
 
   @javascript
   Scenario: I can preview with text
     Given I open a diff comment form
     And I write a diff comment like ":-1: I don't like this"
-    Then I should see the diff comment preview button
+    Then The diff comment preview tab should display rendered Markdown
 
   @javascript
   Scenario: I preview a diff comment
@@ -75,7 +75,7 @@ Feature: Project Commits Diff Comments
   @javascript
   Scenario: I can edit after preview
     Given I preview a diff comment text like "Should fix it :smile:"
-    Then I should see the diff comment edit button
+    Then I should see the diff comment write tab
 
   @javascript
   Scenario: The form gets removed after posting

features/project/issues/issues.feature

@@ -166,13 +166,13 @@ Feature: Project Issues
   Scenario: I can't preview without text
     Given I click link "New Issue"
     And I haven't written any description text
-    Then I should not see the Markdown preview button
+    Then The Markdown preview tab should say there is nothing to do
 
   @javascript
   Scenario: I can preview with text
     Given I click link "New Issue"
-    And I write a description like "Nice"
-    Then I should see the Markdown preview button
+    And I write a description like ":+1: Nice"
+    Then The Markdown preview tab should display rendered Markdown
 
   @javascript
   Scenario: I preview an issue description
@@ -185,4 +185,4 @@ Feature: Project Issues
   Scenario: I can edit after preview
     Given I click link "New Issue"
     And I preview a description text like "Bug fixed :smile:"
-    Then I should see the Markdown edit button
+    Then I should see the Markdown write tab

features/steps/shared/diff_note.rb

@@ -71,9 +71,10 @@ module SharedDiffNote
     end
   end
 
-  step 'I should not see the diff comment preview button' do
+  step 'The diff comment preview tab should say there is nothing to do' do
     within(diff_file_selector) do
-      expect(page).not_to have_css('.js-md-preview-button')
+      find('.js-md-preview-button').click
+      expect(find('.js-md-preview')).to have_content('Nothing to preview.')
     end
   end
 
@@ -135,15 +136,16 @@ module SharedDiffNote
     end
   end
 
-  step 'I should see the diff comment edit button' do
+  step 'I should see the diff comment write tab' do
     within(diff_file_selector) do
       expect(page).to have_css('.js-md-write-button')
     end
   end
 
-  step 'I should see the diff comment preview button' do
+  step 'The diff comment preview tab should display rendered Markdown' do
     within(diff_file_selector) do
-      expect(page).to have_css('.js-md-preview-button')
+      find('.js-md-preview-button').click
+      expect(find('.js-md-preview')).to have_css('img.emoji')
     end
   end
 

features/steps/shared/markdown.rb

@@ -56,18 +56,21 @@ EOT
   end
 
   step 'I should not see the Markdown preview' do
-    expect(find('.gfm-form')).not_to have_css('.js-md-preview')
+    expect(find('.gfm-form')).not_to have_css('.js-md-preview', visible: true)
   end
 
-  step 'I should not see the Markdown preview button' do
-    expect(find('.gfm-form')).not_to have_css('.js-md-preview-button')
+  step 'The Markdown preview tab should say there is nothing to do' do
+    within(".gfm-form") do
+      find('.js-md-preview-button').click
+      expect(find('.js-md-preview')).to have_content('Nothing to preview.')
+    end
   end
 
   step 'I should not see the Markdown text field' do
-    expect(find('.gfm-form')).not_to have_css('textarea')
+    expect(find('.gfm-form')).not_to have_css('textarea', visible: true)
   end
 
-  step 'I should see the Markdown edit button' do
+  step 'I should see the Markdown write tab' do
     expect(find('.gfm-form')).to have_css('.js-md-write-button')
   end
 
@@ -75,12 +78,15 @@ EOT
     expect(find('.gfm-form')).to have_css('.js-md-preview')
   end
 
-  step 'I should see the Markdown preview button' do
-    expect(find('.gfm-form')).to have_css('.js-md-preview-button')
+  step 'The Markdown preview tab should display rendered Markdown' do
+    within(".gfm-form") do
+      find('.js-md-preview-button').click
+      expect(find('.js-md-preview')).to have_css('img.emoji')
+    end
   end
 
-  step 'I write a description like "Nice"' do
-    find('.gfm-form').fill_in 'Description', with: 'Nice'
+  step 'I write a description like ":+1: Nice"' do
+    find('.gfm-form').fill_in 'Description', with: ':+1: Nice'
   end
 
   step 'I preview a description text like "Bug fixed :smile:"' do

features/steps/shared/note.rb

@@ -33,9 +33,9 @@ module SharedNote
     end
   end
 
-  step 'I write a comment like "Nice"' do
+  step 'I write a comment like ":+1: Nice"' do
     within(".js-main-target-form") do
-      fill_in "note[note]", with: "Nice"
+      fill_in "note[note]", with: ":+1: Nice"
     end
   end
 
@@ -51,13 +51,14 @@ module SharedNote
 
   step 'I should not see the comment preview' do
     within(".js-main-target-form") do
-      expect(page).not_to have_css('.js-md-preview')
+      expect(page).not_to have_css('.js-md-preview', visible: true)
     end
   end
 
-  step 'I should not see the comment preview button' do
+  step 'The comment preview tab should say there is nothing to do' do
     within(".js-main-target-form") do
-      expect(page).not_to have_css('.js-md-preview-button')
+      find('.js-md-preview-button').click
+      expect(find('.js-md-preview')).to have_content('Nothing to preview.')
     end
   end
 
@@ -79,21 +80,22 @@ module SharedNote
     end
   end
 
-  step 'I should see the comment edit button' do
+  step 'I should see the comment write tab' do
     within(".js-main-target-form") do
       expect(page).to have_css('.js-md-write-button')
     end
   end
 
-  step 'I should see the comment preview' do
+  step 'The comment preview tab should be display rendered Markdown' do
     within(".js-main-target-form") do
-      expect(page).to have_css('.js-md-preview')
+      find('.js-md-preview-button').click
+      expect(find('.js-md-preview')).to have_css('img.emoji')
     end
   end
 
-  step 'I should see the comment preview button' do
+  step 'I should see the comment preview' do
     within(".js-main-target-form") do
-      expect(page).to have_css('.js-md-preview-button')
+      expect(page).to have_css('.js-md-preview')
     end
   end
 

spec/features/notes_on_merge_requests_spec.rb

@@ -21,7 +21,6 @@ describe 'Comments' do
         find(".js-main-target-form input[type=submit]").value.should == "Add Comment"
         within('.js-main-target-form') do
           expect(page).not_to have_link('Cancel')
-          expect(page).not_to have_css('.js-md-preview-button', visible: true)
         end
       end