From 356ed1a35203e1fabc2e1762759c28090de75c15 Mon Sep 17 00:00:00 2001
From: Victor Costa <vfcosta@gmail.com>
Date: Mon, 27 Apr 2015 17:57:35 -0300
Subject: [PATCH] Fix inclusion of javascript files from plugins

---
 app/helpers/layout_helper.rb    |  2 +-
 test/unit/layout_helper_test.rb | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/app/helpers/layout_helper.rb b/app/helpers/layout_helper.rb
index 7fd0def..e78aa11 100644
--- a/app/helpers/layout_helper.rb
+++ b/app/helpers/layout_helper.rb
@@ -28,7 +28,7 @@ module LayoutHelper
   end
 
   def noosfero_javascript
-    plugins_javascripts = @plugins.flat_map{ |plugin| plugin.js_files.map{ |js| plugin.class.public_path(js, true) } }.flatten
+    plugins_javascripts = @plugins.flat_map{ |plugin| Array.wrap(plugin.js_files).map{ |js| plugin.class.public_path(js, true) } }.flatten
 
     output = ''
     output += render 'layouts/javascript'
diff --git a/test/unit/layout_helper_test.rb b/test/unit/layout_helper_test.rb
index 3e38946..6286c1d 100644
--- a/test/unit/layout_helper_test.rb
+++ b/test/unit/layout_helper_test.rb
@@ -30,4 +30,17 @@ class LayoutHelperTest < ActionView::TestCase
     assert_match /<link [^<]*href="\/designs\/themes\/my-theme\/global.css"/, css
   end
 
+  should 'append javascript files of enabled plugins in noosfero javascripts' do
+    plugin1 = Noosfero::Plugin.new
+    plugin1.expects(:js_files).returns(['plugin1.js'])
+    plugin2 = Noosfero::Plugin.new
+    plugin2.expects(:js_files).returns('plugin2.js')
+    @plugins = [plugin1, plugin2]
+    expects(:environment).returns(Environment.default).at_least_once
+    expects(:profile).returns(nil).at_least_once
+    js_tag = noosfero_javascript
+    assert_match /plugin1\.js/, js_tag
+    assert_match /plugin2\.js/, js_tag
+  end
+
 end
--
libgit2 0.21.2