raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

Even more pipeline fixes

Browse Source
This commit is contained in:
STEPHANVS 2021-07-22 23:34:16 +02:00
parent d109bd55d5
commit 10f172edad
No known key found for this signature in database
GPG Key ID: 4EFE47E471FD62A9
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openlp/plugins/songs/lib/__init__.py
View File

@ -812,7 +812,7 @@ def transpose_chord(chord, transpose_value, notation, key, lastchord, isbass):
note = scales[notation][key][note_number] note = scales[notation][key][note_number]
transposed_chord += note + minor + chord transposed_chord += note + minor + chord
else: else:
transposed_chord += chord transposed_chord += note + chord
if thischordchangeskey: if thischordchangeskey:
key = note + minor key = note + minor
else: else:

14
tests/openlp_plugins/songs/test_lib.py
View File

@ -284,7 +284,7 @@ def test_transpose_chord_up():
# THEN: The chord should be transposed up one note # THEN: The chord should be transposed up one note
assert new_chord == 'C#', 'The chord should be transposed up.' assert new_chord == 'C#', 'The chord should be transposed up.'
assert key == None, 'The key should not be set' assert key is None, 'The key should not be set'
assert lastchord == 'C#', 'If not isbass, then lastchord should be returned' assert lastchord == 'C#', 'If not isbass, then lastchord should be returned'
@ -308,7 +308,7 @@ def test_transpose_chord_up_adv():
# THEN: The chord should be transposed up one note # THEN: The chord should be transposed up one note
assert new_chord == '(Eb', 'The chord should be transposed up.' assert new_chord == '(Eb', 'The chord should be transposed up.'
assert new_bass == 'G)', 'Bass should be transposed up.' assert new_bass == 'G)', 'Bass should be transposed up.'
assert key == None, 'no key should be defined' assert key is None, 'no key should be defined'
assert lastchord == 'Eb', 'lastchord is generated' assert lastchord == 'Eb', 'lastchord is generated'
def test_transpose_chord_down(): def test_transpose_chord_down():
@ -326,7 +326,7 @@ def test_transpose_chord_down():
# THEN: The chord should be transposed down one note # THEN: The chord should be transposed down one note
assert new_chord == 'B', 'The chord should be transposed down.' assert new_chord == 'B', 'The chord should be transposed down.'
assert key == None, 'The key should not be set' assert key is None, 'The key should not be set'
assert lastchord == 'B', 'If not isbass, then lastchord should be returned' assert lastchord == 'B', 'If not isbass, then lastchord should be returned'
@ -363,10 +363,10 @@ def test_transpose_lyrics(mocked_transpose_verse, mock_settings):
transpose_lyrics(lyrics, 1) transpose_lyrics(lyrics, 1)
# THEN: transpose_verse should have been called # THEN: transpose_verse should have been called
mocked_transpose_verse.assert_any_call('', 1, 'english') mocked_transpose_verse.assert_any_call('', 1, 'english', None)
mocked_transpose_verse.assert_any_call('\nAmazing grace how sweet the sound\n', 1, 'english') mocked_transpose_verse.assert_any_call('\nAmazing grace how sweet the sound\n', 1, 'english', None)
mocked_transpose_verse.assert_any_call('\nThat saved a wretch like me.\n', 1, 'english') mocked_transpose_verse.assert_any_call('\nThat saved a wretch like me.\n', 1, 'english', None)
mocked_transpose_verse.assert_any_call('\nI once was lost but now I\'m found.', 1, 'english') mocked_transpose_verse.assert_any_call('\nI once was lost but now I\'m found.', 1, 'english', None)
def test_translated_tag(): def test_translated_tag():