diff --git a/openlp/plugins/songs/lib/importers/songbeamer.py b/openlp/plugins/songs/lib/importers/songbeamer.py index 56709dad7..0146cb45b 100644 --- a/openlp/plugins/songs/lib/importers/songbeamer.py +++ b/openlp/plugins/songs/lib/importers/songbeamer.py @@ -242,7 +242,7 @@ class SongBeamerImport(SongImport): elif tag_val[0] == '#TextAlign': pass elif tag_val[0] == '#Title': - self.title = str(tag_val[1]) + self.title = str(tag_val[1]).strip() elif tag_val[0] == '#TitleAlign': pass elif tag_val[0] == '#TitleFontSize': diff --git a/tests/functional/openlp_core_lib/test_htmlbuilder.py b/tests/functional/openlp_core_lib/test_htmlbuilder.py index 7199464bc..181c485f5 100644 --- a/tests/functional/openlp_core_lib/test_htmlbuilder.py +++ b/tests/functional/openlp_core_lib/test_htmlbuilder.py @@ -4,11 +4,11 @@ Package to test the openlp.core.lib.htmlbuilder module. from unittest import TestCase -from PyQt5 import QtCore +from PyQt5 import QtCore, QtWebKit from openlp.core.common import Settings from openlp.core.lib.htmlbuilder import build_html, build_background_css, build_lyrics_css, build_lyrics_outline_css, \ - build_lyrics_format_css, build_footer_css + build_lyrics_format_css, build_footer_css, webkit_version from openlp.core.lib.theme import HorizontalType, VerticalType from tests.functional import MagicMock, patch from tests.helpers.testmixin import TestMixin @@ -358,3 +358,14 @@ class Htmbuilder(TestCase, TestMixin): # THEN: Footer should wrap self.assertEqual(FOOTER_CSS_WRAP, css, 'The footer strings should be equal.') + + def webkit_version_test(self): + """ + Test the webkit_version() function + """ + # GIVEN: Webkit + webkit_ver = float(QtWebKit.qWebKitVersion()) + # WHEN: Retrieving the webkit version + # THEN: Webkit versions should match + self.assertEquals(webkit_version(), webkit_ver, "The returned webkit version doesn't match the installed one") + diff --git a/tests/resources/songbeamersongs/Lobsinget dem Herrn.sng b/tests/resources/songbeamersongs/Lobsinget dem Herrn.sng index c93a143fa..dd4649fc8 100644 --- a/tests/resources/songbeamersongs/Lobsinget dem Herrn.sng +++ b/tests/resources/songbeamersongs/Lobsinget dem Herrn.sng @@ -1,5 +1,5 @@ #LangCount=1 -#Title=GL 1 - Lobsinget dem Herrn +#Title= GL 1 - Lobsinget dem Herrn #Author=Carl Brockhaus #Melody=Johann Jakob Vetter #Editor=SongBeamer 4.20