Reverts r22507, r22508 and r22510 (#36320, #39803).

git-svn-id: https://svn.redmine.org/redmine/trunk@22515 e93f8b46-1217-0410-a6f0-8f06a7374b81

2 files changed, 5 insertions, 7 deletions

diff --git a/test/unit/lib/redmine/plugin_loader_test.rb b/test/unit/lib/redmine/plugin_loader_test.rb
index a0bec218e..ed5943346 100644
--- a/test/unit/lib/redmine/plugin_loader_test.rb
+++ b/test/unit/lib/redmine/plugin_loader_test.rb
@@ -23,9 +23,8 @@ class Redmine::PluginLoaderTest < ActiveSupport::TestCase
   def setup
     clear_public
 
-    # Change plugin directory for testing to default in config/environments/tesr.rb.
-    # plugins/foo => test/fixtures/plugins/foo
     @klass = Redmine::PluginLoader
+    @klass.directory = Rails.root.join('test/fixtures/plugins')
     @klass.public_directory = Rails.root.join('tmp/public/plugin_assets')
     @klass.load
   end
@@ -56,10 +55,6 @@ class Redmine::PluginLoaderTest < ActiveSupport::TestCase
     assert File.exist?("#{@klass.public_directory}/foo_plugin/stylesheets/foo.css")
   end
 
-  def test_autoload
-    assert_equal true, Object.const_defined?(:Foo)
-  end
-
   def clear_public
     FileUtils.rm_rf 'tmp/public'
   end
diff --git a/test/unit/lib/redmine/plugin_test.rb b/test/unit/lib/redmine/plugin_test.rb
index d27668247..02df23236 100644
--- a/test/unit/lib/redmine/plugin_test.rb
+++ b/test/unit/lib/redmine/plugin_test.rb
@@ -22,11 +22,14 @@ require_relative '../../../test_helper'
 class Redmine::PluginTest < ActiveSupport::TestCase
   def setup
     @klass = Redmine::Plugin
-    # Change plugin directory for testing to default in config/environments/test.rb.
+    # Change plugin directory for testing to default
     # plugins/foo => test/fixtures/plugins/foo
+    @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