diff options
author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-02-17 23:38:53 +0300 |
---|---|---|
committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-02-17 23:38:53 +0300 |
commit | 0da0d800f2a0db9d9c16cf5e2feb0dd80b528223 (patch) | |
tree | 29e0e3fd64f5c2939970f71e4f96d30e71aa5a58 /features | |
parent | 55a906f643b5d52722597f18f2f8e417e92dab6b (diff) | |
parent | 080449f8af56e1aa0d80c921d0bc6ea4a61f1c38 (diff) |
Merge branch 'md-preview-class' into 'master'
Make sure Markdown previews always use the same styling as the eventual destination.
Font size, image width and code-block styling weren't accurate between the markdown preview and the issue/wiki/note body.
See merge request !1514
Diffstat (limited to 'features')
-rw-r--r-- | features/steps/project/merge_requests.rb | 4 | ||||
-rw-r--r-- | features/steps/shared/note.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/features/steps/project/merge_requests.rb b/features/steps/project/merge_requests.rb index 6f421de1aba..c97c3075c53 100644 --- a/features/steps/project/merge_requests.rb +++ b/features/steps/project/merge_requests.rb @@ -253,7 +253,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps end step 'I should still see a comment like "Line is correct" in the first file' do - within '.files [id^=diff]:nth-child(1) .note-text' do + within '.files [id^=diff]:nth-child(1) .note-body > .note-text' do page.should have_visible_content "Line is correct" end end @@ -271,7 +271,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps end step 'I should see comments on the side-by-side diff page' do - within '.files [id^=diff]:nth-child(1) .parallel .note-text' do + within '.files [id^=diff]:nth-child(1) .parallel .note-body > .note-text' do page.should have_visible_content "Line is correct" end end diff --git a/features/steps/shared/note.rb b/features/steps/shared/note.rb index 625bcc0b266..45773056953 100644 --- a/features/steps/shared/note.rb +++ b/features/steps/shared/note.rb @@ -116,7 +116,7 @@ module SharedNote end step 'The comment with the header should not have an ID' do - within(".note-text") do + within(".note-body > .note-text") do page.should have_content("Comment with a header") page.should_not have_css("#comment-with-a-header") end |