Get rid of scale name in scale-generator

The code does nothing interesting with the name of the scale.
It's accepted as an argument to the initialize method, and then
gets assigned to a value so that it can be read by the test.

Author: kytrinyx

exercises/practice/scale-generator/.meta/example.rb

@@ -4,17 +4,12 @@ class Scale
   FLAT_CHROMATIC_SCALE = %w(C Db D Eb E F Gb G Ab A Bb B)
   FLAT_KEYS = %w(F Bb Eb Ab Db Gb d g c f bb eb)
 
-  def initialize(tonic, scale_name, pattern = nil)
+  def initialize(tonic, pattern = nil)
     @tonic = tonic.capitalize
-    @scale_name = scale_name
     @pattern = pattern
     @chromatic_scale = FLAT_KEYS.include?(tonic) ? FLAT_CHROMATIC_SCALE : CHROMATIC_SCALE
   end
 
-  def name
-    "#{tonic} #{scale_name}"
-  end
-
   def pitches
     return reorder_chromatic_scale unless pattern
     last_index = 0
@@ -26,7 +21,7 @@ def pitches
 
   private
 
-  attr_reader :tonic, :scale_name, :pattern, :chromatic_scale
+  attr_reader :tonic, :pattern, :chromatic_scale
 
   def reorder_chromatic_scale
     return chromatic_scale if tonic == 'C'

exercises/practice/scale-generator/scale_generator_test.rb

@@ -2,144 +2,129 @@
 require_relative 'scale_generator'
 
 class ScaleGeneratorTest < Minitest::Test
-  def test_naming_scale
-    chromatic = Scale.new('c', :chromatic)
-    expected = 'C chromatic'
-    actual = chromatic.name
-    assert_equal expected, actual
-  end
-
   def test_chromatic_scale
     skip
-    chromatic = Scale.new('C', :chromatic)
+    chromatic = Scale.new('C')
     expected = %w[C C# D D# E F F# G G# A A# B]
     actual = chromatic.pitches
     assert_equal expected, actual
   end
 
   def test_another_chromatic_scale
     skip
-    chromatic = Scale.new('F', :chromatic)
+    chromatic = Scale.new('F')
     expected = %w[F Gb G Ab A Bb B C Db D Eb E]
     actual = chromatic.pitches
     assert_equal expected, actual
   end
 
-  def test_naming_major_scale
-    skip
-    major = Scale.new('G', :major, 'MMmMMMm')
-    expected = 'G major'
-    actual = major.name
-    assert_equal expected, actual
-  end
-
   def test_major_scale
     skip
-    major = Scale.new('C', :major, 'MMmMMMm')
+    major = Scale.new('C', 'MMmMMMm')
     expected = %w[C D E F G A B]
     actual = major.pitches
     assert_equal expected, actual
   end
 
   def test_another_major_scale
     skip
-    major = Scale.new('G', :major, 'MMmMMMm')
+    major = Scale.new('G', 'MMmMMMm')
     expected = %w[G A B C D E F#]
     actual = major.pitches
     assert_equal expected, actual
   end
 
   def test_minor_scale
     skip
-    minor = Scale.new('f#', :minor, 'MmMMmMM')
+    minor = Scale.new('f#', 'MmMMmMM')
     expected = %w[F# G# A B C# D E]
     actual = minor.pitches
     assert_equal expected, actual
   end
 
   def test_another_minor_scale
     skip
-    minor = Scale.new('bb', :minor, 'MmMMmMM')
+    minor = Scale.new('bb', 'MmMMmMM')
     expected = %w[Bb C Db Eb F Gb Ab]
     actual = minor.pitches
     assert_equal expected, actual
   end
 
   def test_dorian_mode
     skip
-    dorian = Scale.new('d', :dorian, 'MmMMMmM')
+    dorian = Scale.new('d', 'MmMMMmM')
     expected = %w[D E F G A B C]
     actual = dorian.pitches
     assert_equal expected, actual
   end
 
   def test_mixolydian_mode
     skip
-    mixolydian = Scale.new('Eb', :mixolydian, 'MMmMMmM')
+    mixolydian = Scale.new('Eb', 'MMmMMmM')
     expected = %w[Eb F G Ab Bb C Db]
     actual = mixolydian.pitches
     assert_equal expected, actual
   end
 
   def test_lydian_mode
     skip
-    lydian = Scale.new('a', :lydian, 'MMMmMMm')
+    lydian = Scale.new('a', 'MMMmMMm')
     expected = %w[A B C# D# E F# G#]
     actual = lydian.pitches
     assert_equal expected, actual
   end
 
   def test_phrygian_mode
     skip
-    phrygian = Scale.new('e', :phrygian, 'mMMMmMM')
+    phrygian = Scale.new('e', 'mMMMmMM')
     expected = %w[E F G A B C D]
     actual = phrygian.pitches
     assert_equal expected, actual
   end
 
   def test_locrian_mode
     skip
-    locrian = Scale.new('g', :locrian, 'mMMmMMM')
+    locrian = Scale.new('g', 'mMMmMMM')
     expected = %w[G Ab Bb C Db Eb F]
     actual = locrian.pitches
     assert_equal expected, actual
   end
 
   def test_harmonic_minor
     skip
-    harmonic_minor = Scale.new('d', :harmonic_minor, 'MmMMmAm')
+    harmonic_minor = Scale.new('d', 'MmMMmAm')
     expected = %w[D E F G A Bb Db]
     actual = harmonic_minor.pitches
     assert_equal expected, actual
   end
 
   def test_octatonic
     skip
-    octatonic = Scale.new('C', :octatonic, 'MmMmMmMm')
+    octatonic = Scale.new('C', 'MmMmMmMm')
     expected = %w[C D D# F F# G# A B]
     actual = octatonic.pitches
     assert_equal expected, actual
   end
 
   def test_hexatonic
     skip
-    hexatonic = Scale.new('Db', :hexatonic, 'MMMMMM')
+    hexatonic = Scale.new('Db', 'MMMMMM')
     expected = %w[Db Eb F G A B]
     actual = hexatonic.pitches
     assert_equal expected, actual
   end
 
   def test_pentatonic
     skip
-    pentatonic = Scale.new('A', :pentatonic, 'MMAMA')
+    pentatonic = Scale.new('A', 'MMAMA')
     expected = %w[A B C# E F#]
     actual = pentatonic.pitches
     assert_equal expected, actual
   end
 
   def test_enigmatic
     skip
-    enigmatic = Scale.new('G', :enigma, 'mAMMMmM')
+    enigmatic = Scale.new('G', 'mAMMMmM')
     expected = %w[G G# B C# D# F F#]
     actual = enigmatic.pitches
     assert_equal expected, actual