summaryrefslogtreecommitdiff
path: root/features/project/commits
diff options
context:
space:
mode:
authorVinnie Okada <vokada@mrvinn.com>2014-10-16 23:36:52 -0500
committerVinnie Okada <vokada@mrvinn.com>2014-10-18 18:07:23 -0500
commite06f0ead9843df2688ca2f341a3b37d4d56a955d (patch)
treef6ccee3ab1023f5be90d7931ee0c5504a9b2abd5 /features/project/commits
parente1491465de441b386c72726f0b869104d1c15680 (diff)
downloadgitlab-ce-e06f0ead9843df2688ca2f341a3b37d4d56a955d.tar.gz
Fix Markdown preview tests
Update Spinach tests for Markdown previews for the new-ish tab UI that replaced the old preview/edit toggle button.
Diffstat (limited to 'features/project/commits')
-rw-r--r--features/project/commits/comments.feature8
-rw-r--r--features/project/commits/diff_comments.feature6
2 files changed, 7 insertions, 7 deletions
diff --git a/features/project/commits/comments.feature b/features/project/commits/comments.feature
index e176752cfbf..a45245917e3 100644
--- a/features/project/commits/comments.feature
+++ b/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
diff --git a/features/project/commits/diff_comments.feature b/features/project/commits/diff_comments.feature
index a145ec84b78..9c4cc723d1b 100644
--- a/features/project/commits/diff_comments.feature
+++ b/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