From c564b05f362ae9edcc4fe6cb249e3791a59b4394 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Wed, 27 Feb 2013 21:27:32 +0000 Subject: [PATCH] Fix merge comments --- .../functional/openlp_core_lib/test_pluginmanager.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/tests/functional/openlp_core_lib/test_pluginmanager.py b/tests/functional/openlp_core_lib/test_pluginmanager.py index 5682ca669..b2281c2d9 100644 --- a/tests/functional/openlp_core_lib/test_pluginmanager.py +++ b/tests/functional/openlp_core_lib/test_pluginmanager.py @@ -78,19 +78,22 @@ class TestPluginManager(TestCase): assert mocked_plugin.createMediaManagerItem.call_count == 0, \ u'The createMediaManagerItem() method should not have been called.' - def hook_settings_tabs_with_disabled_plugin_and_mocked_form_test(self): + def hook_settings_tabs_with_active_plugin_and_no_form_test(self): """ - Test running the hook_settings_tabs() method with a disabled plugin and a mocked form + Test running the hook_settings_tabs() method with an active plugin and no settings form """ - # GIVEN: A PluginManager instance and a list with a mocked up plugin whose status is set to Disabled + # GIVEN: A PluginManager instance and a list with a mocked up plugin whose status is set to Active mocked_plugin = MagicMock() - mocked_plugin.status = PluginStatus.Disabled + mocked_plugin.status = PluginStatus.Active plugin_manager = PluginManager() plugin_manager.plugins = [mocked_plugin] # WHEN: We run hook_settings_tabs() plugin_manager.hook_settings_tabs() + # THEN: The createSettingsTab() method should have been called + mocked_plugin.createSettingsTab.assert_called_with(self.mocked_settings_form) + def hook_settings_tabs_with_active_plugin_and_mocked_form_test(self): """ Test running the hook_settings_tabs() method with an active plugin and a mocked settings form