diff --git a/openlp/plugins/presentations/lib/mediaitem.py b/openlp/plugins/presentations/lib/mediaitem.py index c9f11a5d8..6e5f20646 100644 --- a/openlp/plugins/presentations/lib/mediaitem.py +++ b/openlp/plugins/presentations/lib/mediaitem.py @@ -66,7 +66,7 @@ class PresentationMediaItem(MediaManagerItem): Registry().register_function(u'mediaitem_presentation_rebuild', self.populate_display_types) Registry().register_function(u'mediaitem_suffixes', self.build_file_mask_string) # Allow DnD from the desktop - # self.list_view.activateDnD() + self.list_view.activateDnD() def retranslateUi(self): """ diff --git a/tests/functional/openlp_plugins/presentations/__init__.py b/tests/functional/openlp_plugins/presentations/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/tests/interfaces/openlp_plugins/custom/forms/test_customform.py b/tests/interfaces/openlp_plugins/custom/forms/test_customform.py index 41671403b..fbf613661 100644 --- a/tests/interfaces/openlp_plugins/custom/forms/test_customform.py +++ b/tests/interfaces/openlp_plugins/custom/forms/test_customform.py @@ -80,9 +80,7 @@ class TestEditCustomForm(TestCase): # GIVEN: Mocked methods. with patch(u'openlp.plugins.custom.forms.editcustomform.critical_error_message_box') as \ mocked_critical_error_message_box: - mocked_displayText = MagicMock() - mocked_displayText.return_value = u'' - self.form.title_edit.displayText = mocked_displayText + self.form.title_edit.displayText = MagicMock(return_value=u'') mocked_setFocus = MagicMock() self.form.title_edit.setFocus = mocked_setFocus @@ -101,12 +99,8 @@ class TestEditCustomForm(TestCase): # GIVEN: Mocked methods. with patch(u'openlp.plugins.custom.forms.editcustomform.critical_error_message_box') as \ mocked_critical_error_message_box: - mocked_displayText = MagicMock() - mocked_displayText.return_value = u'something' - self.form.title_edit.displayText = mocked_displayText - mocked_count = MagicMock() - mocked_count.return_value = 0 - self.form.slide_list_view.count = mocked_count + self.form.title_edit.displayText = MagicMock(return_value=u'something') + self.form.slide_list_view.count = MagicMock(return_value=0) # WHEN: Call the method. result = self.form._validate()