From 9d753cb89ed7482aec0bca53c56136634d7c1d63 Mon Sep 17 00:00:00 2001 From: David Taylor Date: Thu, 28 Jul 2022 22:20:52 +0100 Subject: [PATCH] FIX: Ensure theme_uploads_local only has one `/` at beginning (#17719) Followup to c7dfb1c549c29e560ea24558bc1a32d8991625c2 --- app/models/javascript_cache.rb | 2 +- spec/models/theme_field_spec.rb | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/models/javascript_cache.rb b/app/models/javascript_cache.rb index b5dca967ea2..85a31c94c4e 100644 --- a/app/models/javascript_cache.rb +++ b/app/models/javascript_cache.rb @@ -12,7 +12,7 @@ class JavascriptCache < ActiveRecord::Base end def local_url - "#{Discourse.base_path}/#{path}" + "#{Discourse.base_path}#{path}" end private diff --git a/spec/models/theme_field_spec.rb b/spec/models/theme_field_spec.rb index 9c26ac49315..8b99f55ef2c 100644 --- a/spec/models/theme_field_spec.rb +++ b/spec/models/theme_field_spec.rb @@ -504,6 +504,7 @@ HTML expect(val["theme_uploads"]["test_js"]).to eq(js_field.upload.url) expect(val["theme_uploads_local"]["test_js"]).to eq(js_field.javascript_cache.local_url) + expect(val["theme_uploads_local"]["test_js"]).to start_with("/theme-javascripts/") end