Merge branch 'I13-fix_partial_for_class' into stable

Victor Costa
2 parents 9d30d2f5 36b7ff2f
Showing 1 changed file with 14 additions and 0 deletions Show diff stats
test/unit/application_helper_test.rb
@@ -49,6 +49,20 @@ class ApplicationHelperTest &lt; ActionView::TestCase
     end
   end
  
+  should 'plugins path take precedence over core path' do
+    core_path = 'core/'
+    plugin_path = 'path/'
+    @controller = mock()
+    @controller.stubs(:view_paths).returns([plugin_path, core_path])
+    self.stubs(:params).returns({:controller => 'test'})
+
+    File.stubs(:exists?).returns(false)
+    File.stubs(:exists?).with(core_path+"test/_block.html.erb").returns(true)
+    File.stubs(:exists?).with(plugin_path+"test/_raw_html_block.html.erb").returns(true)
+
+    assert_equal 'raw_html_block', partial_for_class(RawHTMLBlock)
+  end
+
   should 'generate link to stylesheet' do
     File.stubs(:exists?).returns(false)
     File.expects(:exists?).with(Rails.root.join('public', 'stylesheets', 'something.css')).returns(true)
...	...	@@ -49,6 +49,20 @@ class ApplicationHelperTest < ActionView::TestCase
49	49	end
50	50	end
51	51
	52	+ should 'plugins path take precedence over core path' do
	53	+ core_path = 'core/'
	54	+ plugin_path = 'path/'
	55	+ @controller = mock()
	56	+ @controller.stubs(:view_paths).returns([plugin_path, core_path])
	57	+ self.stubs(:params).returns({:controller => 'test'})
	58	+
	59	+ File.stubs(:exists?).returns(false)
	60	+ File.stubs(:exists?).with(core_path+"test/_block.html.erb").returns(true)
	61	+ File.stubs(:exists?).with(plugin_path+"test/_raw_html_block.html.erb").returns(true)
	62	+
	63	+ assert_equal 'raw_html_block', partial_for_class(RawHTMLBlock)
	64	+ end
	65	+
52	66	should 'generate link to stylesheet' do
53	67	File.stubs(:exists?).returns(false)
54	68	File.expects(:exists?).with(Rails.root.join('public', 'stylesheets', 'something.css')).returns(true)
...	...