github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-31 21:25:24 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Allow importing themes with subdirectories in extra_js

Browse Source 
The folder/file detection was broken by 9fea43e46a7bb9ee1f8a3ce9d22bb41664f0852a. 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

7
spec/models/remote_theme_spec.rb
View File

@ -11,8 +11,8 @@ describe RemoteTheme do
`cd #{repo_dir} && git init . `
`cd #{repo_dir} && git config user.email 'someone@cool.com'`
`cd #{repo_dir} && git config user.name 'The Cool One'`
`cd #{repo_dir} && mkdir desktop mobile common assets locales scss stylesheets`
files.each do |name, data|
FileUtils.mkdir_p(Pathname.new("#{repo_dir}/#{name}").dirname)
File.write("#{repo_dir}/#{name}", data)
`cd #{repo_dir} && git add #{name}`
end
@ -52,6 +52,7 @@ describe RemoteTheme do
"scss/oldpath.scss" => ".class2{color:blue}",
"stylesheets/file.scss" => ".class1{color:red}",
"stylesheets/empty.scss" => "",
"javascripts/discourse/controllers/test.js.es6" => "console.log('test');",
"common/header.html" => "I AM HEADER",
"common/random.html" => "I AM SILLY",
"common/embedded.scss" => "EMBED",
@ -83,7 +84,7 @@ describe RemoteTheme do
expect(remote.theme_version).to eq("1.0")
expect(remote.minimum_discourse_version).to eq("1.0.0")
expect(@theme.theme_fields.length).to eq(8)
expect(@theme.theme_fields.length).to eq(9)
mapped = Hash[*@theme.theme_fields.map { |f| ["#{f.target_id}-#{f.name}", f.value] }.flatten]
expect(mapped["0-header"]).to eq("I AM HEADER")
@ -96,7 +97,7 @@ describe RemoteTheme do
expect(mapped["4-en"]).to eq("sometranslations")
expect(mapped.length).to eq(8)
expect(mapped.length).to eq(9)
expect(@theme.settings.length).to eq(1)
expect(@theme.settings.first.value).to eq(true)