Skip to content

Commit 0b86cad

Browse files
committed
Fix image_pack_tag to find images under by default
1 parent 6355c8c commit 0b86cad

File tree

3 files changed

+12
-5
lines changed

3 files changed

+12
-5
lines changed

lib/webpacker/helper.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ def sources_from_manifest_entrypoints(names, type:)
142142
end
143143

144144
def resolve_path_to_image(name)
145-
path = name.starts_with?("media/") ? name : "media/#{name}"
145+
path = name.starts_with?("media/images/") ? name : "media/images/#{name}"
146146
asset_path(current_webpacker_instance.manifest.lookup!(path))
147147
rescue
148148
asset_path(current_webpacker_instance.manifest.lookup!(name))

test/helper_test.rb

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,17 @@ def test_image_pack_tag
3939
"<img alt=\"Edit Entry\" src=\"/packs/application-k344a6d59eef8632c9d1.png\" width=\"16\" height=\"10\" />",
4040
image_pack_tag("application.png", size: "16x10", alt: "Edit Entry")
4141
assert_equal \
42-
"<img alt=\"Edit Entry\" src=\"/packs/media/image-c38deda30895059837cf.jpg\" width=\"16\" height=\"10\" />",
42+
"<img alt=\"Edit Entry\" src=\"/packs/media/images/image-c38deda30895059837cf.jpg\" width=\"16\" height=\"10\" />",
4343
image_pack_tag("image.jpg", size: "16x10", alt: "Edit Entry")
4444
assert_equal \
45-
"<img alt=\"Edit Entry\" src=\"/packs/media/image-c38deda30895059837cf.jpg\" width=\"16\" height=\"10\" />",
46-
image_pack_tag("media/image.jpg", size: "16x10", alt: "Edit Entry")
45+
"<img alt=\"Edit Entry\" src=\"/packs/media/images/image-c38deda30895059837cf.jpg\" width=\"16\" height=\"10\" />",
46+
image_pack_tag("media/images/image.jpg", size: "16x10", alt: "Edit Entry")
47+
assert_equal \
48+
"<img alt=\"Edit Entry\" src=\"/packs/media/images/nested/image-c38deda30895059837cf.jpg\" width=\"16\" height=\"10\" />",
49+
image_pack_tag("nested/image.jpg", size: "16x10", alt: "Edit Entry")
50+
assert_equal \
51+
"<img alt=\"Edit Entry\" src=\"/packs/media/images/nested/image-c38deda30895059837cf.jpg\" width=\"16\" height=\"10\" />",
52+
image_pack_tag("media/images/nested/image.jpg", size: "16x10", alt: "Edit Entry")
4753
end
4854

4955
def test_javascript_pack_tag

test/test_app/public/packs/manifest.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
"bootstrap.js": "/packs/bootstrap-300631c4f0e0f9c865bc.js",
55
"application.js": "/packs/application-k344a6d59eef8632c9d1.js",
66
"application.png": "/packs/application-k344a6d59eef8632c9d1.png",
7-
"media/image.jpg": "/packs/media/image-c38deda30895059837cf.jpg",
7+
"media/images/image.jpg": "/packs/media/images/image-c38deda30895059837cf.jpg",
8+
"media/images/nested/image.jpg": "/packs/media/images/nested/image-c38deda30895059837cf.jpg",
89
"entrypoints": {
910
"application": {
1011
"js": [

0 commit comments

Comments
 (0)