diff --git a/vendor/plugins/design/test/design_test.rb b/vendor/plugins/design/test/design_test.rb index e99d66e..af50dfb 100644 --- a/vendor/plugins/design/test/design_test.rb +++ b/vendor/plugins/design/test/design_test.rb @@ -50,4 +50,10 @@ class DesignTest < Test::Unit::TestCase assert_equal File.join(RAILS_ROOT, 'public'), Design.public_filesystem_root end + def test_subclass_controller_can_override_superclass_design_holder + assert_equal 'sample_object', ProxyDesignHolderTestController.send(:design_plugin_config)[:holder] + assert_equal 'another_object', InheritanceDesignTestController.send(:design_plugin_config)[:holder] + + end + end diff --git a/vendor/plugins/design/test/test_helper.rb b/vendor/plugins/design/test/test_helper.rb index d628750..ea44229 100644 --- a/vendor/plugins/design/test/test_helper.rb +++ b/vendor/plugins/design/test/test_helper.rb @@ -56,6 +56,14 @@ class ProxyDesignHolderTestController < ActionController::Base end end +class AnotherTestDesignHolder + attr_accessor :template, :theme, :icon_theme, :boxes +end + +class InheritanceDesignTestController < ProxyDesignHolderTestController + design :holder => 'another_object' +end + class DesignEditorTestController < ActionController::Base design_editor :holder => 'sample_object' def initialize -- libgit2 0.21.2