From 5bb8aff5ddcc1debb4406303477c1ddbe618d058 Mon Sep 17 00:00:00 2001 From: Vinnie Okada Date: Sat, 18 Oct 2014 18:43:45 -0500 Subject: [PATCH] Fix more Markdown preview tests --- features/project/merge_requests.feature | 8 ++++---- 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