kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't clear plugins in tests (#16258). 

git-svn-id: http://svn.redmine.org/redmine/trunk@12988 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2014-03-21 01:12:11 +00:00
parent 913c8cd2e6
commit abf24a7d92
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/redmine/plugin.rb
View File

@ -113,6 +113,12 @@ module Redmine #:nodoc:
@registered_plugins = {} @registered_plugins = {}
end end
# Removes a plugin from the registered plugins
# It doesn't unload the plugin
def self.unregister(id)
@registered_plugins.delete(id)
end
# Checks if a plugin is installed # Checks if a plugin is installed
# #
# @param [String] id name of the plugin # @param [String] id name of the plugin

9
test/functional/settings_controller_test.rb
View File

@ -148,7 +148,8 @@ class SettingsControllerTest < ActionController::TestCase
assert_tag 'form', :attributes => {:action => '/settings/plugin/foo'}, assert_tag 'form', :attributes => {:action => '/settings/plugin/foo'},
:descendant => {:tag => 'input', :attributes => {:name => 'settings[sample_setting]', :value => 'Plugin setting value'}} :descendant => {:tag => 'input', :attributes => {:name => 'settings[sample_setting]', :value => 'Plugin setting value'}}
Redmine::Plugin.clear ensure
Redmine::Plugin.unregister(:foo)
end end
def test_get_invalid_plugin_settings def test_get_invalid_plugin_settings
@ -162,7 +163,8 @@ class SettingsControllerTest < ActionController::TestCase
get :plugin, :id => 'foo' get :plugin, :id => 'foo'
assert_response 404 assert_response 404
Redmine::Plugin.clear ensure
Redmine::Plugin.unregister(:foo)
end end
def test_post_plugin_settings def test_post_plugin_settings
@ -181,6 +183,7 @@ class SettingsControllerTest < ActionController::TestCase
post :plugin, :id => 'foo', :settings => {'sample_setting' => 'Value'} post :plugin, :id => 'foo', :settings => {'sample_setting' => 'Value'}
assert_response 404 assert_response 404
Redmine::Plugin.clear ensure
Redmine::Plugin.unregister(:foo)
end end
end end