From 40ffbff49d82d959927660574c1127e0b982b88e Mon Sep 17 00:00:00 2001 From: Marius Balteanu Date: Thu, 24 Mar 2022 16:47:54 +0000 Subject: Fix Redmine::Plugin.assets_directory is not working after r21283 (#36835). Patch by Go MAEDA. git-svn-id: https://svn.redmine.org/redmine/trunk@21498 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- lib/redmine/plugin.rb | 4 ++-- test/unit/lib/redmine/plugin_test.rb | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/redmine/plugin.rb b/lib/redmine/plugin.rb index cdc6defb3..fb42a8fa9 100644 --- a/lib/redmine/plugin.rb +++ b/lib/redmine/plugin.rb @@ -104,7 +104,7 @@ module Redmine raise PluginNotFound, "Plugin not found. The directory for plugin #{p.id} should be #{p.directory}." end - p.path = PluginLoader.directories{ |d| d.dir == p.directory } + p.path = PluginLoader.directories.find {|d| d.to_s == p.directory} # Adds plugin locales if any # YAML translation files should be found under /config/locales/ @@ -183,7 +183,7 @@ module Redmine # Returns the absolute path to the plugin assets directory def assets_directory - path.assedts_dir + path.assets_dir end def <=>(plugin) diff --git a/test/unit/lib/redmine/plugin_test.rb b/test/unit/lib/redmine/plugin_test.rb index 75c8ece9b..54394ab57 100644 --- a/test/unit/lib/redmine/plugin_test.rb +++ b/test/unit/lib/redmine/plugin_test.rb @@ -27,6 +27,10 @@ class Redmine::PluginTest < ActiveSupport::TestCase @klass.directory = Rails.root.join('test/fixtures/plugins') # In case some real plugins are installed @klass.clear + + # Change plugin loader's directory for testing + Redmine::PluginLoader.directory = @klass.directory + Redmine::PluginLoader.setup end def teardown @@ -55,6 +59,7 @@ class Redmine::PluginTest < ActiveSupport::TestCase assert_equal 'http://example.net/jsmith', plugin.author_url assert_equal 'This is a test plugin', plugin.description assert_equal '0.0.1', plugin.version + assert_equal File.join(@klass.directory, 'foo_plugin', 'assets'), plugin.assets_directory end def test_register_should_raise_error_if_plugin_directory_does_not_exist -- cgit v1.2.3