github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-04-19 15:49:05 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Allow plugins to provide test directories with transpiled .js

Browse Source
This commit is contained in:
Robin Ward 2020-06-16 14:30:25 -04:00
parent c52191d49e
commit 7f8c5cf70b
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/plugin/instance.rb
View File

@ -548,6 +548,9 @@ class Plugin::Instance
if transpile_js if transpile_js
DiscourseJsProcessor.plugin_transpile_paths << root_path.sub(Rails.root.to_s, '').sub(/^\/*/, '') DiscourseJsProcessor.plugin_transpile_paths << root_path.sub(Rails.root.to_s, '').sub(/^\/*/, '')
DiscourseJsProcessor.plugin_transpile_paths << admin_path.sub(Rails.root.to_s, '').sub(/^\/*/, '') DiscourseJsProcessor.plugin_transpile_paths << admin_path.sub(Rails.root.to_s, '').sub(/^\/*/, '')
test_path = "#{root_dir_name}/test/javascripts"
DiscourseJsProcessor.plugin_transpile_paths << test_path.sub(Rails.root.to_s, '').sub(/^\/*/, '')
end end
end end

7
test/javascripts/plugin_tests.js.erb
View File

@ -12,8 +12,9 @@
Discourse.plugins.each do |p| Discourse.plugins.each do |p|
root_path = "#{File.dirname(p.path)}/test/javascripts" root_path = "#{File.dirname(p.path)}/test/javascripts"
Dir.glob(root_path + '/**/**.es6').each do |f| to_glob = [root_path + '/**/**.es6']
require_asset(f) to_glob << (root_path + '/**/**.js') if p.transpile_js
end
Dir.glob(to_glob) { |f| require_asset(f) }
end end
%> %>