From d5541c43674f115a6fffe1dea361b754e58cf676 Mon Sep 17 00:00:00 2001 From: Andy Mikula Date: Thu, 13 Oct 2016 08:56:35 -0600 Subject: [PATCH 1/2] Add minor key type to music --- lib/faker/music.rb | 4 ++++ test/test_faker_music.rb | 9 ++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/lib/faker/music.rb b/lib/faker/music.rb index 96e2ef69fd..2fc9a6a881 100644 --- a/lib/faker/music.rb +++ b/lib/faker/music.rb @@ -16,6 +16,10 @@ def keys def key_variants ['b', '#', ''] end + + def key_types + ['', 'm'] + end end end end diff --git a/test/test_faker_music.rb b/test/test_faker_music.rb index 9ea2420b99..061e8368ca 100644 --- a/test/test_faker_music.rb +++ b/test/test_faker_music.rb @@ -20,8 +20,15 @@ def test_key_variants end end + def test_key_types + assert @tester.key_types.size == 2 + @tester.key_types.each do |key_type| + assert !key_variant.nil? + end + end + def test_key - assert @tester.name.match(/([A-Z])+(b|#){0,1}/) + assert @tester.name.match(/([A-Z])+(b|#){0,1}+(m){0,1}/) end def test_instrument From 810d5c6d03cd01061e537dc57e9b1de09eb3cafd Mon Sep 17 00:00:00 2001 From: Andy Mikula Date: Thu, 13 Oct 2016 08:58:39 -0600 Subject: [PATCH 2/2] Assert key_type, not key_variant --- test/test_faker_music.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/test_faker_music.rb b/test/test_faker_music.rb index 061e8368ca..0db495853d 100644 --- a/test/test_faker_music.rb +++ b/test/test_faker_music.rb @@ -23,7 +23,7 @@ def test_key_variants def test_key_types assert @tester.key_types.size == 2 @tester.key_types.each do |key_type| - assert !key_variant.nil? + assert !key_type.nil? end end