spec/note_spec.rb in music-transcription-0.3.0 vs spec/note_spec.rb in music-transcription-0.4.0

@@ -5,61 +5,34 @@
     @pitch = C4
   end
   
   context '.new' do
     it 'should assign :duration that is given during construction' do
-      note = Note.new :duration => 2
+      note = Note.new 2
       note.duration.should eq(2)
     end
     
-    it "should assign :sustain, :attack, and :separation parameters if given during construction" do
-      note = Note.new :duration => 2, :sustain => 0.1, :attack => 0.2, :separation => 0.3
-      note.sustain.should eq(0.1)
-      note.attack.should eq(0.2)
-      note.separation.should eq(0.3)
+    it "should assign :accent parameter if given during construction" do
+      note = Note.new 2, accent: Accent::Stacatto.new
+      note.accent.class.should eq(Accent::Stacatto)
     end
     
-    it 'should have no intervals if not given' do
-      Note.new(:duration => 2).intervals.should be_empty
+    it 'should have no pitches if not given' do
+      Note.new(2).pitches.should be_empty
     end
     
-    it 'should assign intervals when given' do
-      intervals = [
-        Interval.new(:pitch => C2),
-        Interval.new(:pitch => D2),
-      ]
-      Note.new(:duration => 2, :intervals => intervals).intervals.should eq(intervals)
+    it 'should assign pitches when given' do
+      pitches = [ C2, D2 ]
+      n = Note.new(2, pitches)
+      n.pitches.should include(pitches[0])
+      n.pitches.should include(pitches[1])
     end
   end
   
   context '#duration=' do
     it 'should assign duration' do
-      note = Note.new :pitch => @pitch, :duration => 2
+      note = Note.new 2, [@pitch]
       note.duration = 3
       note.duration.should eq 3
     end
-  end
-  
-  context '#sustain=' do
-    it "should assign sustain" do
-      note = Note.new :pitch => @pitch, :duration => 2
-      note.sustain = 0.123
-      note.sustain.should eq 0.123
-    end
-  end
-
-  context '#attack=' do
-    it "should assign attack" do
-      note = Note.new :pitch => @pitch, :duration => 2
-      note.attack = 0.123
-      note.attack.should eq 0.123
-    end
-  end
-  
-  context '#separation=' do
-    it "should assign separation" do
-      note = Note.new :pitch => @pitch, :duration => 2
-      note.separation = 0.123
-      note.separation.should eq 0.123
-    end
-  end
+  end  
 end