summaryrefslogtreecommitdiff
path: root/spec/features/atom
diff options
context:
space:
mode:
authorConnor Shea <connor.james.shea@gmail.com>2016-06-21 10:24:00 -0600
committerConnor Shea <connor.james.shea@gmail.com>2016-06-27 09:16:07 -0600
commitc7b04841c0b742146d88c63b83f6ac4474e77e05 (patch)
treea7ffe29f706a3acf0abf9a7070c51b660fed4b6b /spec/features/atom
parentf48f7760c26e681e3f8b011c7c4e2b6ccfc9c3f5 (diff)
downloadgitlab-ce-c7b04841c0b742146d88c63b83f6ac4474e77e05.tar.gz
Wrap images in divs with Banzai and limit max-height.image-sizing
Add max-height to prevent images from displaying larger than the provided screen size. Also fix a failing test and add a new one.
Diffstat (limited to 'spec/features/atom')
-rw-r--r--spec/features/atom/users_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/features/atom/users_spec.rb b/spec/features/atom/users_spec.rb
index de6aed74fb4..91704377a07 100644
--- a/spec/features/atom/users_spec.rb
+++ b/spec/features/atom/users_spec.rb
@@ -61,7 +61,7 @@ describe "User Feed", feature: true do
end
it 'should have XHTML summaries in merge request descriptions' do
- expect(body).to match /Here is the fix: <a[^>]*><img[^>]*\/><\/a>/
+ expect(body).to match /Here is the fix: <\/p><div[^>]*><a[^>]*><img[^>]*\/><\/a><\/div>/
end
end
end