diff options
| author | Tim Zallmann <tzallmann@gitlab.com> | 2017-07-06 11:09:10 +0200 |
|---|---|---|
| committer | Tim Zallmann <tzallmann@gitlab.com> | 2017-07-06 11:09:10 +0200 |
| commit | 2801e8e95b0f373c0ac7b5251343166e58caaf45 (patch) | |
| tree | c0b9c743597e6fdeebaa1db5f4a6c1ce8f046113 | |
| parent | 89d757c8922874697e635530799daa8793c0c1e4 (diff) | |
| download | gitlab-ce-34361-lazy-load-images-on-the-frontend.tar.gz | |
Fix for Gollum Filter with lazy loaded images34361-lazy-load-images-on-the-frontend
Appearance Logo Test fixed
| -rw-r--r-- | lib/banzai/filter/gollum_tags_filter.rb | 2 | ||||
| -rw-r--r-- | spec/features/admin/admin_appearance_spec.rb | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/lib/banzai/filter/gollum_tags_filter.rb b/lib/banzai/filter/gollum_tags_filter.rb index 0ea4eeaed5b..2e259904673 100644 --- a/lib/banzai/filter/gollum_tags_filter.rb +++ b/lib/banzai/filter/gollum_tags_filter.rb @@ -118,7 +118,7 @@ module Banzai end if path - content_tag(:img, nil, src: path, class: 'gfm') + content_tag(:img, nil, data: { src: path }, class: 'gfm') end end diff --git a/spec/features/admin/admin_appearance_spec.rb b/spec/features/admin/admin_appearance_spec.rb index 7bfdfeeb3cb..7a3d98a79a9 100644 --- a/spec/features/admin/admin_appearance_spec.rb +++ b/spec/features/admin/admin_appearance_spec.rb @@ -39,10 +39,10 @@ feature 'Admin Appearance', feature: true do attach_file(:appearance_logo, logo_fixture) click_button 'Save' - expect(page).to have_selector(logo_selector) + expect(page).to have_css(logo_selector) click_link 'Remove logo' - expect(page).not_to have_selector(logo_selector) + expect(page).not_to have_css(logo_selector) end scenario 'Header logos' do @@ -51,10 +51,10 @@ feature 'Admin Appearance', feature: true do attach_file(:appearance_header_logo, logo_fixture) click_button 'Save' - expect(page).to have_selector(header_logo_selector) + expect(page).to have_css(header_logo_selector) click_link 'Remove header logo' - expect(page).not_to have_selector(header_logo_selector) + expect(page).not_to have_css(header_logo_selector) end def expect_page_has_custom_appearance(appearance) @@ -63,11 +63,11 @@ feature 'Admin Appearance', feature: true do end def logo_selector - 'img[data-src="/uploads/system/appearance/logo"]' + 'img[data-src^="/uploads/system/appearance/logo"]' end def header_logo_selector - 'img[data-src="/uploads/system/appearance/header_logo"]' + 'img[data-src^="/uploads/system/appearance/header_logo"]' end def logo_fixture |