From 5c23cbe9bb25cdc3c39b89553b3497289af65366 Mon Sep 17 00:00:00 2001 From: ishikawa Date: Wed, 27 Mar 2019 17:22:56 +0900 Subject: [PATCH 1/2] Fix test not to raise exception --- .../_other_plugin_settings.html.erb | 1 + test/functional/admin_controller_test.rb | 8 ++- test/functional/settings_controller_test.rb | 11 +++- test/unit/lib/redmine/plugin_test.rb | 55 ++++++++++--------- 4 files changed, 44 insertions(+), 31 deletions(-) create mode 100644 test/fixtures/plugins/other_plugin/_other_plugin_settings.html.erb diff --git a/test/fixtures/plugins/other_plugin/_other_plugin_settings.html.erb b/test/fixtures/plugins/other_plugin/_other_plugin_settings.html.erb new file mode 100644 index 0000000000..44537d3c3a --- /dev/null +++ b/test/fixtures/plugins/other_plugin/_other_plugin_settings.html.erb @@ -0,0 +1 @@ +

<%= text_field_tag 'settings[sample_setting]', @settings['sample_setting'] %>

diff --git a/test/functional/admin_controller_test.rb b/test/functional/admin_controller_test.rb index 5817fc43f9..6d951f68ff 100644 --- a/test/functional/admin_controller_test.rb +++ b/test/functional/admin_controller_test.rb @@ -121,8 +121,10 @@ class AdminControllerTest < Redmine::ControllerTest description 'This is a test plugin' version '0.0.1' settings :default => {'sample_setting' => 'value', 'foo'=>'bar'}, :partial => 'foo/settings' + directory 'test/fixtures/plugins/foo_plugin' end - Redmine::Plugin.register :bar do + Redmine::Plugin.register :other do + directory 'test/fixtures/plugins/other_plugin' end get :plugins @@ -132,8 +134,8 @@ class AdminControllerTest < Redmine::ControllerTest assert_select 'td span.name', :text => 'Foo plugin' assert_select 'td.configure a[href="/settings/plugin/foo"]' end - assert_select 'tr#plugin-bar' do - assert_select 'td span.name', :text => 'Bar' + assert_select 'tr#plugin-other' do + assert_select 'td span.name', :text => 'Other' assert_select 'td.configure a', 0 end end diff --git a/test/functional/settings_controller_test.rb b/test/functional/settings_controller_test.rb index 3b9a47f6ca..fd24fbc486 100644 --- a/test/functional/settings_controller_test.rb +++ b/test/functional/settings_controller_test.rb @@ -201,6 +201,7 @@ class SettingsControllerTest < Redmine::ControllerTest ActionController::Base.append_view_path(File.join(Rails.root, "test/fixtures/plugins")) Redmine::Plugin.register :foo do settings :partial => "foo_plugin/foo_plugin_settings" + directory 'test/fixtures/plugins/foo_plugin' end Setting.plugin_foo = {'sample_setting' => 'Plugin setting value'} @@ -220,7 +221,9 @@ class SettingsControllerTest < Redmine::ControllerTest end def test_get_non_configurable_plugin_settings - Redmine::Plugin.register(:foo) {} + Redmine::Plugin.register(:foo) do + directory 'test/fixtures/plugins/foo_plugin' + end get :plugin, :params => {:id => 'foo'} assert_response 404 @@ -233,6 +236,7 @@ class SettingsControllerTest < Redmine::ControllerTest Redmine::Plugin.register(:foo) do settings :partial => 'not blank', # so that configurable? is true :default => {'sample_setting' => 'Plugin setting value'} + directory 'test/fixtures/plugins/foo_plugin' end post :plugin, :params => { @@ -248,6 +252,7 @@ class SettingsControllerTest < Redmine::ControllerTest Redmine::Plugin.register(:foo) do settings :partial => 'not blank', # so that configurable? is true :default => {'sample_setting' => 'Plugin setting value'} + directory 'test/fixtures/plugins/foo_plugin' end post :plugin, :params => { @@ -259,7 +264,9 @@ class SettingsControllerTest < Redmine::ControllerTest end def test_post_non_configurable_plugin_settings - Redmine::Plugin.register(:foo) {} + Redmine::Plugin.register(:foo) do + directory 'test/fixtures/plugins/foo_plugin' + end post :plugin, :params => { :id => 'foo', diff --git a/test/unit/lib/redmine/plugin_test.rb b/test/unit/lib/redmine/plugin_test.rb index efb28ffcd4..29facdd3aa 100644 --- a/test/unit/lib/redmine/plugin_test.rb +++ b/test/unit/lib/redmine/plugin_test.rb @@ -22,6 +22,9 @@ require File.expand_path('../../../../test_helper', __FILE__) class Redmine::PluginTest < ActiveSupport::TestCase def setup @klass = Redmine::Plugin + # 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 end @@ -31,7 +34,7 @@ class Redmine::PluginTest < ActiveSupport::TestCase end def test_register - @klass.register :foo do + @klass.register :foo_plugin do name 'Foo plugin' url 'http://example.net/plugins/foo' author 'John Smith' @@ -43,9 +46,9 @@ class Redmine::PluginTest < ActiveSupport::TestCase assert_equal 1, @klass.all.size - plugin = @klass.find('foo') + plugin = @klass.find('foo_plugin') assert plugin.is_a?(Redmine::Plugin) - assert_equal :foo, plugin.id + assert_equal :foo_plugin, plugin.id assert_equal 'Foo plugin', plugin.name assert_equal 'http://example.net/plugins/foo', plugin.url assert_equal 'John Smith', plugin.author @@ -55,14 +58,14 @@ class Redmine::PluginTest < ActiveSupport::TestCase end def test_installed - @klass.register(:foo) {} - assert_equal true, @klass.installed?(:foo) + @klass.register(:foo_plugin) {} + assert_equal true, @klass.installed?(:foo_plugin) assert_equal false, @klass.installed?(:bar) end def test_menu assert_difference 'Redmine::MenuManager.items(:project_menu).size' do - @klass.register :foo do + @klass.register :foo_plugin do menu :project_menu, :foo_menu_item, '/foo', :caption => 'Foo' end end @@ -77,7 +80,7 @@ class Redmine::PluginTest < ActiveSupport::TestCase def test_delete_menu_item Redmine::MenuManager.map(:project_menu).push(:foo_menu_item, '/foo', :caption => 'Foo') assert_difference 'Redmine::MenuManager.items(:project_menu).size', -1 do - @klass.register :foo do + @klass.register :foo_plugin do delete_menu_item :project_menu, :foo_menu_item end end @@ -88,18 +91,18 @@ class Redmine::PluginTest < ActiveSupport::TestCase def test_directory_with_override @klass.register(:foo) do - directory '/path/to/foo' + directory 'test/fixtures/plugins/foo_plugin' end - assert_equal '/path/to/foo', @klass.find('foo').directory + assert_equal 'test/fixtures/plugins/foo_plugin', @klass.find('foo').directory end def test_directory_without_override - @klass.register(:foo) {} - assert_equal File.join(@klass.directory, 'foo'), @klass.find('foo').directory + @klass.register(:other_plugin) {} + assert_equal File.join(@klass.directory, 'other_plugin'), @klass.find('other_plugin').directory end def test_requires_redmine - plugin = Redmine::Plugin.register(:foo) {} + plugin = Redmine::Plugin.register(:foo_plugin) {} Redmine::VERSION.stubs(:to_a).returns([2, 1, 3, "stable", 10817]) # Specific version without hash assert plugin.requires_redmine('2.1.3') @@ -148,24 +151,24 @@ class Redmine::PluginTest < ActiveSupport::TestCase def test_requires_redmine_plugin test = self other_version = '0.5.0' - @klass.register :other do + @klass.register :other_plugin do name 'Other' version other_version end - @klass.register :foo do - test.assert requires_redmine_plugin(:other, :version_or_higher => '0.1.0') - test.assert requires_redmine_plugin(:other, :version_or_higher => other_version) - test.assert requires_redmine_plugin(:other, other_version) + @klass.register :foo_plugin do + test.assert requires_redmine_plugin(:other_plugin, :version_or_higher => '0.1.0') + test.assert requires_redmine_plugin(:other_plugin, :version_or_higher => other_version) + test.assert requires_redmine_plugin(:other_plugin, other_version) test.assert_raise Redmine::PluginRequirementError do - requires_redmine_plugin(:other, :version_or_higher => '99.0.0') + requires_redmine_plugin(:other_plugin, :version_or_higher => '99.0.0') end - test.assert requires_redmine_plugin(:other, :version => other_version) - test.assert requires_redmine_plugin(:other, :version => [other_version, '99.0.0']) + test.assert requires_redmine_plugin(:other_plugin, :version => other_version) + test.assert requires_redmine_plugin(:other_plugin, :version => [other_version, '99.0.0']) test.assert_raise Redmine::PluginRequirementError do - requires_redmine_plugin(:other, :version => '99.0.0') + requires_redmine_plugin(:other_plugin, :version => '99.0.0') end test.assert_raise Redmine::PluginRequirementError do - requires_redmine_plugin(:other, :version => ['98.0.0', '99.0.0']) + requires_redmine_plugin(:other_plugin, :version => ['98.0.0', '99.0.0']) end # Missing plugin test.assert_raise Redmine::PluginRequirementError do @@ -181,17 +184,17 @@ class Redmine::PluginTest < ActiveSupport::TestCase end def test_settings_warns_about_possible_partial_collision - @klass.register(:foo) { settings :partial => 'foo/settings' } + @klass.register(:foo_plugin) { settings :partial => 'foo/settings' } Rails.logger.expects(:warn) - @klass.register(:bar) { settings :partial => 'foo/settings' } + @klass.register(:other_plugin) { settings :partial => 'foo/settings' } end def test_migrate_redmine_plugin - @klass.register :foo do + @klass.register :foo_plugin do name 'Foo plugin' version '0.0.1' end - assert Redmine::Plugin.migrate('foo') + assert Redmine::Plugin.migrate('foo_plugin') end end -- 2.20.1 (Apple Git-117)