diff --git a/app/views/layouts/application-ng.rhtml b/app/views/layouts/application-ng.rhtml
index 8e16388..fd446d2 100644
--- a/app/views/layouts/application-ng.rhtml
+++ b/app/views/layouts/application-ng.rhtml
@@ -14,7 +14,7 @@
     <%= stylesheet_link_tag theme_stylesheet_path %>
     <%= stylesheet_link_tag jquery_ui_theme_stylesheet_path %>
     <% @plugins.enabled_plugins.each do |plugin| %>
-      <% if plugin.stylesheet? %>
+      <% if plugin.stylesheets? %>
         <%= stylesheet_tag plugin.class.public_path('style.css'), {} %>
       <% end %>
     <% end %>
diff --git a/lib/noosfero/plugin.rb b/lib/noosfero/plugin.rb
index 0f9f265..2c2ea8f 100644
--- a/lib/noosfero/plugin.rb
+++ b/lib/noosfero/plugin.rb
@@ -64,7 +64,7 @@ class Noosfero::Plugin
 
   # -> If true, noosfero will include plugin_dir/public/style.css into
   # application
-  def stylesheet?
+  def stylesheets?
     false
   end
 
diff --git a/test/functional/application_controller_test.rb b/test/functional/application_controller_test.rb
index f228ec6..2071eef 100644
--- a/test/functional/application_controller_test.rb
+++ b/test/functional/application_controller_test.rb
@@ -441,6 +441,89 @@ class ApplicationControllerTest < Test::Unit::TestCase
     assert_tag :html, :attributes => { :lang => 'es' }
   end
 
+  should 'include stylesheets supplied by plugins' do
+    plugin1 = mock()
+    plugin1.stubs(:stylesheets?).returns(true)
+    plugin1.stubs(:js_files).returns([])
+    plugin1_class = mock()
+    plugin1_path = '/plugin1/style.css'
+    plugin1_class.stubs(:public_path).with('style.css').returns(plugin1_path)
+    plugin1.stubs(:class).returns(plugin1_class)
+
+    plugin2 = mock()
+    plugin2.stubs(:stylesheets?).returns(true)
+    plugin2.stubs(:js_files).returns([])
+    plugin2_class = mock()
+    plugin2_path = '/plugin2/style.css'
+    plugin2_class.stubs(:public_path).with('style.css').returns(plugin2_path)
+    plugin2.stubs(:class).returns(plugin2_class)
+
+    enabled_plugins = [plugin1, plugin2]
+
+    plugins = mock()
+    plugins.stubs(:map).with(:body_beginning).returns([])
+    plugins.stubs(:enabled_plugins).returns(enabled_plugins)
+    Noosfero::Plugin::Manager.stubs(:new).returns(plugins)
+
+    get :index
+
+    assert_tag :tag => 'link', :attributes => {:href => /#{plugin1_path}/, :type => 'text/css', :rel => 'stylesheet'}
+    assert_tag :tag => 'link', :attributes => {:href => /#{plugin2_path}/, :type => 'text/css', :rel => 'stylesheet'}
+  end
+
+  should 'include javascripts supplied by plugins' do
+    js1 = 'js1.js'
+    plugin1 = mock()
+    plugin1.stubs(:stylesheets?).returns(false)
+    plugin1.stubs(:js_files).returns([js1])
+    plugin1_class = mock()
+    plugin1_path = '/plugin1/'+js1
+    plugin1_class.stubs(:public_path).with(js1).returns(plugin1_path)
+    plugin1.stubs(:class).returns(plugin1_class)
+
+    js2 = 'js2.js'
+    js3 = 'js3.js'
+    plugin2 = mock()
+    plugin2.stubs(:stylesheets?).returns(false)
+    plugin2.stubs(:js_files).returns([js2, js3])
+    plugin2_class = mock()
+    plugin2_path2 = '/plugin2/'+js2
+    plugin2_path3 = '/plugin2/'+js3
+    plugin2_class.stubs(:public_path).with(js2).returns(plugin2_path2)
+    plugin2_class.stubs(:public_path).with(js3).returns(plugin2_path3)
+    plugin2.stubs(:class).returns(plugin2_class)
+
+    enabled_plugins = [plugin1, plugin2]
+
+    plugins = mock()
+    plugins.stubs(:map).with(:body_beginning).returns([])
+    plugins.stubs(:enabled_plugins).returns(enabled_plugins)
+    Noosfero::Plugin::Manager.stubs(:new).returns(plugins)
+
+    get :index
+
+    assert_tag :tag => 'script', :attributes => {:src => /#{plugin1_path}/, :type => 'text/javascript'}
+    assert_tag :tag => 'script', :attributes => {:src => /#{plugin2_path2}/, :type => 'text/javascript'}
+    assert_tag :tag => 'script', :attributes => {:src => /#{plugin2_path3}/, :type => 'text/javascript'}
+  end
+
+  should 'include content in the beginning of body supplied by plugins regardless it is a block or html code' do
+    plugin1_local_variable = "Plugin1"
+    plugin1_content = lambda {"<span id='plugin1'>This is #{plugin1_local_variable} speaking!</span>"}
+    plugin2_content = "<span id='plugin2'>This is Plugin2 speaking!</span>"
+    contents = [plugin1_content, plugin2_content]
+
+    plugins = mock()
+    plugins.stubs(:enabled_plugins).returns([])
+    plugins.stubs(:map).with(:body_beginning).returns(contents)
+    Noosfero::Plugin::Manager.stubs(:new).returns(plugins)
+
+    get :index
+
+    assert_tag :tag => 'span', :content => 'This is ' + plugin1_local_variable + ' speaking!', :attributes => {:id => 'plugin1'}
+    assert_tag :tag => 'span', :content => 'This is Plugin2 speaking!', :attributes => {:id => 'plugin2'}
+  end
+
   if ActiveRecord::Base.connection.adapter_name == 'PostgreSQL'
 
     should 'change postgresql schema' do
diff --git a/test/functional/catalog_controller_test.rb b/test/functional/catalog_controller_test.rb
index 3fbc747..2f6c279 100644
--- a/test/functional/catalog_controller_test.rb
+++ b/test/functional/catalog_controller_test.rb
@@ -93,4 +93,24 @@ class CatalogControllerTest < Test::Unit::TestCase
     end
   end
 
+  should 'include extra content supplied by plugins on catalog item extras' do
+    product = fast_create(Product, :enterprise_id => @enterprise.id)
+    plugin1_local_variable = "Plugin1"
+    plugin1_content = lambda {"<span id='plugin1'>This is #{plugin1_local_variable} speaking!</span>"}
+    plugin2_local_variable = "Plugin2"
+    plugin2_content = lambda {"<span id='plugin2'>This is #{plugin2_local_variable} speaking!</span>"}
+    contents = [plugin1_content, plugin2_content]
+
+    plugins = mock()
+    plugins.stubs(:enabled_plugins).returns([])
+    plugins.stubs(:map).with(:body_beginning).returns([])
+    plugins.stubs(:map).with(:catalog_item_extras, product).returns(contents)
+    Noosfero::Plugin::Manager.stubs(:new).returns(plugins)
+
+    get :index, :profile => @enterprise.identifier
+
+    assert_tag :tag => 'span', :content => 'This is ' + plugin1_local_variable + ' speaking!', :attributes => {:id => 'plugin1'}
+    assert_tag :tag => 'span', :content => 'This is ' + plugin2_local_variable + ' speaking!', :attributes => {:id => 'plugin2'}
+  end
+
 end
diff --git a/test/functional/manage_products_controller_test.rb b/test/functional/manage_products_controller_test.rb
index 1409938..cbbc86a 100644
--- a/test/functional/manage_products_controller_test.rb
+++ b/test/functional/manage_products_controller_test.rb
@@ -421,6 +421,26 @@ class ManageProductsControllerTest < Test::Unit::TestCase
     assert_tag :tag => 'div', :attributes => { :id => "product-#{product.id}-tabs" }, :descendant => {:tag => 'a', :attributes => {:href => '#product-inputs'}, :content => 'Inputs and raw material'}
   end
 
+  should 'include extra content supplied by plugins on products info extras' do
+    product = fast_create(Product, :enterprise_id => @enterprise.id)
+    plugin1_local_variable = "Plugin1"
+    plugin1_content = lambda {"<span id='plugin1'>This is #{plugin1_local_variable} speaking!</span>"}
+    plugin2_local_variable = "Plugin2"
+    plugin2_content = lambda {"<span id='plugin2'>This is #{plugin2_local_variable} speaking!</span>"}
+    contents = [plugin1_content, plugin2_content]
+
+    plugins = mock()
+    plugins.stubs(:enabled_plugins).returns([])
+    plugins.stubs(:map).with(:body_beginning).returns([])
+    plugins.stubs(:map).with(:product_info_extras, product).returns(contents)
+    Noosfero::Plugin::Manager.stubs(:new).returns(plugins)
+
+    get :show, :id => product.id, :profile => @enterprise.identifier
+
+    assert_tag :tag => 'span', :content => 'This is ' + plugin1_local_variable + ' speaking!', :attributes => {:id => 'plugin1'}
+    assert_tag :tag => 'span', :content => 'This is ' + plugin2_local_variable + ' speaking!', :attributes => {:id => 'plugin2'}
+  end
+
   should 'remove price detail of a product' do
     product = fast_create(Product, :enterprise_id => @enterprise.id, :product_category_id => @product_category.id)
     cost = fast_create(ProductionCost, :owner_id => Environment.default.id, :owner_type => 'Environment')
--
libgit2 0.21.2