gitara 1.0.1 → 1.2.0

data/spec/lib/gitara/node/tab_spec.rb

@@ -3,63 +3,63 @@ require 'spec_helper'
 describe Gitara::Node::Tab do
   describe "#voices" do
     it "should create a max_number_of_voices voices" do
-      tab = FactoryGirl.build(:tab, :children => [
-        FactoryGirl.build(:bar, :children => [
-          FactoryGirl.build(:note_set),
-          FactoryGirl.build(:note_set)
+      tab = FactoryBot.build(:tab, :children => [
+        FactoryBot.build(:bar, :children => [
+          FactoryBot.build(:note_set),
+          FactoryBot.build(:note_set)
         ])
       ])
       voices = tab.voices
-      voices.should have(2).values
-      voices[0].id.should == 1
-      voices[1].id.should == 2
-      voices.map(&:parent).uniq.should == [tab]
+      expect(voices.size).to eq(2)
+      expect(voices[0].id).to eq(1)
+      expect(voices[1].id).to eq(2)
+      expect(voices.map(&:parent).uniq).to eq([tab])
     end
   end
 
   describe "#max_number_of_voices" do
     it "should be the max number of note_sets in a bar" do
-      tab = FactoryGirl.build(:tab, :children => [
-        FactoryGirl.build(:bar, :children => [
-          FactoryGirl.build(:note_set),
-          FactoryGirl.build(:note_set)
+      tab = FactoryBot.build(:tab, :children => [
+        FactoryBot.build(:bar, :children => [
+          FactoryBot.build(:note_set),
+          FactoryBot.build(:note_set)
         ])
       ])
 
-      tab.max_number_of_voices.should == 2
+      expect(tab.max_number_of_voices).to eq(2)
     end
   end
 
   describe "#playable_child" do
     it "should be the last child of the tab" do
-      tab = FactoryGirl.build(:tab, :children => [
-        FactoryGirl.build(:bar, :name => 'Intro', :children => [
-          FactoryGirl.build(:note_set),
-          FactoryGirl.build(:note_set)
+      tab = FactoryBot.build(:tab, :children => [
+        FactoryBot.build(:bar, :name => 'Intro', :children => [
+          FactoryBot.build(:note_set),
+          FactoryBot.build(:note_set)
         ]),
-        FactoryGirl.build(:bar, :name => 'Intro')
+        FactoryBot.build(:bar, :name => 'Intro')
       ])
 
-      tab.playable_child.id.should == 2
+      expect(tab.playable_child.id).to eq(2)
     end
   end
 
   describe "#midi_instrument" do
     it "should have acoustic guitar (nylon) as default" do
-      tab = FactoryGirl.build(:tab)
-      tab.midi_instrument.should == 'acoustic guitar (nylon)'
+      tab = FactoryBot.build(:tab)
+      expect(tab.midi_instrument).to eq('acoustic guitar (nylon)')
     end
   end
 
   describe "#time_signature" do
     it "should be based on time if it exists" do
-      tab = FactoryGirl.build(:tab, :time => '3/4')
-      tab.time_signature.value.should == '3/4'
+      tab = FactoryBot.build(:tab, :time => '3/4')
+      expect(tab.time_signature.value).to eq('3/4')
     end
 
     it "should be 4/4 if time is not set" do
-      tab = FactoryGirl.build(:tab, :time => nil)
-      tab.time_signature.value.should == '4/4'
+      tab = FactoryBot.build(:tab, :time => nil)
+      expect(tab.time_signature.value).to eq('4/4')
     end
   end
 end

data/spec/lib/gitara/time_signature_spec.rb

@@ -3,33 +3,33 @@ require 'spec_helper'
 describe Gitara::TimeSignature do
   describe "#rest_bar_value" do
     it "should be r1 if the time signature generates whole note bars" do
-      FactoryGirl.build(:time_signature, :value => '4/4').rest_bar_value.should == "r1"
+      expect(FactoryBot.build(:time_signature, :value => '4/4').rest_bar_value).to eq("r1")
     end
 
     it "should be based on beat unit and beats per bar if the time signature does not generate whole note bars" do
-      FactoryGirl.build(:time_signature, :value => '3/4').rest_bar_value.should == "r4 r4 r4"
+      expect(FactoryBot.build(:time_signature, :value => '3/4').rest_bar_value).to eq("r4 r4 r4")
     end
   end
 
   describe "#generates_whole_note_bars?" do
     it "should be true if the beat unit is the same as the beats per bar" do
-      FactoryGirl.build(:time_signature, :value => '4/4').generates_whole_note_bars?.should be_true
+      expect(FactoryBot.build(:time_signature, :value => '4/4').generates_whole_note_bars?).to be_truthy
     end
 
     it "should be false if the beat unit is not the same as the beats per bar" do
-      FactoryGirl.build(:time_signature, :value => '3/4').generates_whole_note_bars?.should be_false
+      expect(FactoryBot.build(:time_signature, :value => '3/4').generates_whole_note_bars?).to be_falsy
     end
   end
 
   describe "beat_unit" do
     it "is the second part of the value" do
-      FactoryGirl.build(:time_signature, :value => '3/4').beat_unit.should == 4
+      expect(FactoryBot.build(:time_signature, :value => '3/4').beat_unit).to eq(4)
     end
   end
 
   describe "beats_per_bar" do
     it "is the first part of the value" do
-      FactoryGirl.build(:time_signature, :value => '3/4').beats_per_bar.should == 3
+      expect(FactoryBot.build(:time_signature, :value => '3/4').beats_per_bar).to eq(3)
     end
   end
 end

data/spec/lib/gitara/voice_spec.rb

@@ -3,83 +3,83 @@ require 'spec_helper'
 describe Gitara::Voice do
   describe "#call_name" do
     it "should be the variable name of the node when called inside lilypond" do
-      voice = FactoryGirl.build(:voice, :id => 1)
-      voice.call_name.should == '\vOne'
+      voice = FactoryBot.build(:voice, :id => 1)
+      expect(voice.call_name).to eq('\vOne')
     end
   end
 
   describe "#definition_name" do
     it "should be the name of the voice in a lilypond variable definition statement" do
-      voice = FactoryGirl.build(:voice, :id => 1)
-      voice.definition_name.should == "vOne"
+      voice = FactoryBot.build(:voice, :id => 1)
+      expect(voice.definition_name).to eq("vOne")
     end
   end
 
   describe "#id_as_word" do
     it "should convert the id to word" do
-      node = FactoryGirl.build(:voice, :id => 1)
-      node.id_as_word.should == "One"
+      node = FactoryBot.build(:voice, :id => 1)
+      expect(node.id_as_word).to eq("One")
     end
   end
 
   describe "#stem_type" do
     it "should be the lilypond stem type for the voice" do
-      voice = FactoryGirl.build(:voice, :id => 1)
-      voice.stem_type.should == '\voiceOne'
+      voice = FactoryBot.build(:voice, :id => 1)
+      expect(voice.stem_type).to eq('\voiceOne')
     end
   end
 
   describe "#transposition" do
     it "should be based on the tab's transposition and the voice's octave" do
-      tab = FactoryGirl.build(:tab,
+      tab = FactoryBot.build(:tab,
         :transposition => 'd',
         :children => [
-          FactoryGirl.build(:bar, :children => [
-            FactoryGirl.build(:note_set),
-            FactoryGirl.build(:note_set)
+          FactoryBot.build(:bar, :children => [
+            FactoryBot.build(:note_set),
+            FactoryBot.build(:note_set)
           ])
         ]
       )
-      tab.max_number_of_voices.should == 2
+      expect(tab.max_number_of_voices).to eq(2)
 
-      voice = FactoryGirl.build(:voice, :parent => tab, :id => 1)
-      voice.transposition.should == "d''"
+      voice = FactoryBot.build(:voice, :parent => tab, :id => 1)
+      expect(voice.transposition).to eq("d''")
 
-      voice = FactoryGirl.build(:voice, :parent => tab, :id => 2)
-      voice.transposition.should == "d'"
+      voice = FactoryBot.build(:voice, :parent => tab, :id => 2)
+      expect(voice.transposition).to eq("d'")
     end
 
     it "should be blank if the tab has no transposition" do
-      tab = FactoryGirl.build(:tab,
+      tab = FactoryBot.build(:tab,
         :children => [
-          FactoryGirl.build(:bar, :children => [
-            FactoryGirl.build(:note_set),
-            FactoryGirl.build(:note_set)
+          FactoryBot.build(:bar, :children => [
+            FactoryBot.build(:note_set),
+            FactoryBot.build(:note_set)
           ])
         ]
       )
-      tab.max_number_of_voices.should == 2
+      expect(tab.max_number_of_voices).to eq(2)
 
-      voice = FactoryGirl.build(:voice, :parent => tab, :id => 1)
-      voice.transposition.should be_nil
+      voice = FactoryBot.build(:voice, :parent => tab, :id => 1)
+      expect(voice.transposition).to be_nil
     end
   end
 
   describe "#octave" do
     it "should be based on the voice's position in the tab" do
-      tab = FactoryGirl.build(:tab, :children => [
-        FactoryGirl.build(:bar, :children => [
-          FactoryGirl.build(:note_set),
-          FactoryGirl.build(:note_set)
+      tab = FactoryBot.build(:tab, :children => [
+        FactoryBot.build(:bar, :children => [
+          FactoryBot.build(:note_set),
+          FactoryBot.build(:note_set)
         ])
       ])
-      tab.max_number_of_voices.should == 2
+      expect(tab.max_number_of_voices).to eq(2)
 
-      voice = FactoryGirl.build(:voice, :parent => tab, :id => 1)
-      voice.octave.should == 2
+      voice = FactoryBot.build(:voice, :parent => tab, :id => 1)
+      expect(voice.octave).to eq(2)
 
-      voice = FactoryGirl.build(:voice, :parent => tab, :id => 2)
-      voice.octave.should == 1
+      voice = FactoryBot.build(:voice, :parent => tab, :id => 2)
+      expect(voice.octave).to eq(1)
     end
   end
 end

data/spec/lib/gitara_spec.rb

@@ -3,9 +3,9 @@ require 'spec_helper'
 describe Gitara do
   describe ".tab" do
     it "should create a tab instance if it does not exist" do
-      Gitara.tab.should be_nil
+      expect(Gitara.tab).to be_nil
       Gitara.define
-      Gitara.tab.should be_a(Node::Tab)
+      expect(Gitara.tab).to be_a(Node::Tab)
     end
   end
 
@@ -18,8 +18,8 @@ describe Gitara do
       end
 
       bars = tab.definitions(Node::Bar)
-      bars.size.should == 1
-      bars[0].name.should == 'Intro'
+      expect(bars.size).to eq(1)
+      expect(bars[0].name).to eq('Intro')
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,19 +1,21 @@
-require 'factory_girl'
+require 'factory_bot'
 require 'gitara'
-require 'pry'
+require 'byebug'
 
 RSpec.configure do |config|
   include Gitara
   require 'factories'
   require 'support/app_tester'
 
+  config.example_status_persistence_file_path = 'spec/support/examples.txt'
+
   config.before :each do
-    test_tmp_dir.delete! if test_tmp_dir.exists? && ! run_lilypond?
+    test_tmp_dir.delete! if test_tmp_dir.exist? && ! run_lilypond?
     Gitara.instance_variable_set :@tab, nil
   end
 
   def test_tmp_dir
-    Pow('tmp/test')
+    Pathname.new('tmp/test')
   end
   
   def run_lilypond?

data/spec/support/app_tester.rb

@@ -4,18 +4,18 @@ class AppTester < Valuable
   has_value :run_lilypond, :klass => :boolean, :default => false
 
   def run
-    app = FactoryGirl.build(:app)
+    app = FactoryBot.build(:app)
     app.invoke :export, ["examples/#{name}.rb"], 
       "target-directory" => test_tmp_dir.path, 
       "run-lilypond" => self.run_lilypond?
-    (Pow("tmp") / "#{name}.ly").write actual if self.expected != self.actual
+    (Pathname.new("tmp") / "#{name}.ly").write actual if self.expected != self.actual
   end
 
   def expected
-    @expected ||= Utilities.read!(Pow("examples/#{name}.ly")).gsub(/\n\s+\n/, "\n")
-  rescue PowError => e
+    @expected ||= Utilities.read!(Pathname.new("examples/#{name}.ly")).gsub(/\n\s+\n/, "\n")
+  rescue Utilities::PathnameDoesNotExist => e
     puts "#{e.message}. Copying actual result..."
-    Pow("examples/#{name}.ly").write actual
+    Pathname.new("examples/#{name}.ly").write actual
     retry
   end