IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: Allow importing themes with subdirectories in extra_js

Browse Source 
The folder/file detection was broken by 9fea43e46a. This commit fixes and adds relevant specs
This commit is contained in:
David Taylor
2019-11-13 23:45:09 +00:00
parent 0ba0aa00e7
commit d095c2cee7
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spec/requests/admin/themes_controller_spec.rb
View File

@@ -44,6 +44,7 @@ describe Admin::ThemesController do
theme = Fabricate(:theme, name: "Awesome Theme")
theme.set_field(target: :common, name: :scss, value: '.body{color: black;}')
theme.set_field(target: :desktop, name: :after_header, value: '<b>test</b>')
theme.set_field(target: :extra_js, name: "discourse/controller/blah", value: 'console.log("test");')
theme.save!
get "/admin/customize/themes/#{theme.id}/export"
@@ -64,7 +65,7 @@ describe Admin::ThemesController do
json = ::JSON.parse(response.body)
expect(json["theme"]["name"]).to eq("Awesome Theme")
expect(json["theme"]["theme_fields"].length).to eq(2)
expect(json["theme"]["theme_fields"].length).to eq(3)
end
end