Drop temporary plugin view_paths integration

Antonio Terceiro · Paulo Meireles
1 parent 95d3259f
Showing 5 changed files with 4 additions and 41 deletions Show diff stats
app/controllers/my_profile/cms_controller.rb
app/controllers/public/content_viewer_controller.rb
lib/noosfero/plugin.rb
plugins/mezuro/lib/mezuro_plugin.rb
test/functional/cms_controller_test.rb
@@ -79,7 +79,6 @@ class CmsController &lt; MyProfileController
   end
   def edit
-	  plugins_prepend_view_paths
     @article = profile.articles.find(params[:id])
     @parent_id = params[:parent_id]
     @type = params[:type] || @article.class.to_s
@@ -103,7 +102,6 @@ class CmsController &lt; MyProfileController
   end
   def new
-	  plugins_prepend_view_paths
     # FIXME this method should share some logic wirh edit !!!
     # user must choose an article type first
@@ -355,12 +353,6 @@ class CmsController &lt; MyProfileController
     end.to_json
   end
-  def plugins_prepend_view_paths
-    @plugins.map(:view_path).each do |view_path|
-      prepend_view_path(view_path)
-    end
-  end
-  
   def content_editor?
     true
   end
@@ -6,7 +6,6 @@ class ContentViewerController &lt; ApplicationController
   helper TagsHelper
   def view_page
-    plugins_prepend_view_paths
     path = params[:page].join('/')
     if path.blank?
@@ -152,12 +151,5 @@ class ContentViewerController &lt; ApplicationController
       end
     end
   end
-  
-  # FIXME duplicated
-  def plugins_prepend_view_paths
-    @plugins.map(:view_path).each do |view_path|
-      prepend_view_path(view_path)
-    end
-  end
 end
@@ -111,12 +111,6 @@ class Noosfero::Plugin
     nil
   end
-  # -> Can be used to add plugin-specific view paths to controllers
-  # returns = { plugins' view paths }
-  def view_path
-    nil
-  end
-
   # -> Adds content to calalog item
   # returns = lambda block that creates a html code
   def catalog_item_extras(item)
@@ -12,10 +12,6 @@ class MezuroPlugin &lt; Noosfero::Plugin
     MezuroPlugin::ProjectContent
   end
-  def view_path
-    File.join(RAILS_ROOT, "plugins", "mezuro", "views")
-  end
-
   def stylesheet?
     true
   end
@@ -24,4 +20,4 @@ class MezuroPlugin &lt; Noosfero::Plugin
     'javascripts/collapsable.js'
   end
-end
 \ No newline at end of file
+end
@@ -1514,25 +1514,14 @@ class CmsControllerTest &lt; ActionController::TestCase
     plugins = mock()
     plugins.stubs(:map).with(:content_types).returns(types)
     plugins.stubs(:map).with(:body_beginning).returns([])
+    plugins.stubs(:map).with(:head_ending).returns([])
     plugins.stubs(:enabled_plugins).returns([])
-    Noosfero::Plugin::Manager.expects(:new).returns(plugins) 
+    Noosfero::Plugin::Manager.expects(:new).returns(plugins)
     get :index, :profile => profile.identifier
     assert_includes @controller.special_article_types, Integer
-    assert_includes @controller.special_article_types, Float 
-  end
-
-  should 'include plugins view paths on partial search' do
-    view_path = '/example/view_path'
-    plugins = mock()
-    plugins.stubs(:map).with(:view_path).returns(view_path)
-    plugins.stubs(:enabled_plugins).returns([])
-    Noosfero::Plugin::Manager.expects(:new).returns(plugins)
-
-    get :new, :profile => profile.identifier
-
-		assert_equal view_path, @controller.view_paths[0]
+    assert_includes @controller.special_article_types, Float
   end
 end
	@@ -111,12 +111,6 @@ class Noosfero::Plugin		@@ -111,12 +111,6 @@ class Noosfero::Plugin
111	nil	111	nil
112	end	112	end
113		113
114	- # -> Can be used to add plugin-specific view paths to controllers
115	- # returns = { plugins' view paths }
116	- def view_path
117	- nil
118	- end
119	-
120	# -> Adds content to calalog item	114	# -> Adds content to calalog item
121	# returns = lambda block that creates a html code	115	# returns = lambda block that creates a html code
122	def catalog_item_extras(item)	116	def catalog_item_extras(item)