diff --git a/openlp/plugins/songs/lib/mediaitem.py b/openlp/plugins/songs/lib/mediaitem.py index 3c728aadf..4e048c6bb 100644 --- a/openlp/plugins/songs/lib/mediaitem.py +++ b/openlp/plugins/songs/lib/mediaitem.py @@ -653,7 +653,6 @@ class SongMediaItem(MediaManagerItem): authors=create_separated_list(authors_none))) else: item.raw_footer.append("{authors}".format(authors=create_separated_list(authors_none))) - if authors_words_music: item.raw_footer.append("{text}: {authors}".format(text=AuthorType.Types[AuthorType.WordsAndMusic], authors=create_separated_list(authors_words_music))) diff --git a/tests/functional/openlp_plugins/songs/test_mediaitem.py b/tests/functional/openlp_plugins/songs/test_mediaitem.py index 969c27ba1..89fc1ded6 100644 --- a/tests/functional/openlp_plugins/songs/test_mediaitem.py +++ b/tests/functional/openlp_plugins/songs/test_mediaitem.py @@ -295,11 +295,18 @@ class TestMediaItem(TestCase, TestMixin): mock_qlist_widget.setData.assert_called_once_with(MockedUserRole, mock_song.id) self.media_item.list_view.addItem.assert_called_once_with(mock_qlist_widget) - def test_build_song_footer_one_author(self): + @patch(u'openlp.plugins.songs.lib.mediaitem.Settings') + def test_build_song_footer_one_author_show_written_by(self, MockedSettings): """ Test build songs footer with basic song and one author """ - # GIVEN: A Song and a Service Item + # GIVEN: A Song and a Service Item, mocked settings: True for 'songs/display written by' + # and False for 'core/ccli number' (ccli will cause traceback if true) + + mocked_settings = MagicMock() + mocked_settings.value.side_effect = [True, False] + MockedSettings.return_value = mocked_settings + mock_song = MagicMock() mock_song.title = 'My Song' mock_song.authors_songs = []