diff options
| author | Vinnie Okada <vokada@mrvinn.com> | 2014-10-18 18:43:45 -0500 |
|---|---|---|
| committer | Vinnie Okada <vokada@mrvinn.com> | 2014-10-18 18:43:45 -0500 |
| commit | 5bb8aff5ddcc1debb4406303477c1ddbe618d058 (patch) | |
| tree | fc73fc888d55d87bc516dc9ec20e796a7e60f3c7 /features | |
| parent | 74c82ae32583ebf335f310a29ffb22d75b356863 (diff) | |
| download | gitlab-ce-5bb8aff5ddcc1debb4406303477c1ddbe618d058.tar.gz | |
Fix more Markdown preview tests
Diffstat (limited to 'features')
| -rw-r--r-- | features/project/merge_requests.feature | 8 | ||||
| -rw-r--r-- | features/steps/project/issues/issues.rb | 1 |
2 files changed, 5 insertions, 4 deletions
diff --git a/features/project/merge_requests.feature b/features/project/merge_requests.feature index f8a43e1ee36..7c029f05d75 100644 --- a/features/project/merge_requests.feature +++ b/features/project/merge_requests.feature @@ -195,14 +195,14 @@ Feature: Project Merge Requests Given I visit merge request page "Bug NS-04" And I click link "Edit" for the merge request 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 visit merge request page "Bug NS-04" And I click link "Edit" for the merge request - 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 a merge request description @@ -217,4 +217,4 @@ Feature: Project Merge Requests Given I visit merge request page "Bug NS-04" And I click link "Edit" for the merge request 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 diff --git a/features/steps/project/issues/issues.rb b/features/steps/project/issues/issues.rb index 640603562dd..c0ae5208541 100644 --- a/features/steps/project/issues/issues.rb +++ b/features/steps/project/issues/issues.rb @@ -1,5 +1,6 @@ class Spinach::Features::ProjectIssues < Spinach::FeatureSteps include SharedAuthentication + include SharedIssuable include SharedProject include SharedNote include SharedPaths |