From 3736b93968cbc8829d82130c348cd73a27e4f452 Mon Sep 17 00:00:00 2001
From: Anthony Davis <anthony@jamkazam.com>
Date: Mon, 26 May 2014 12:20:01 -0500
Subject: [PATCH] VRFS-1021 - tests were implicitly order-dependent, also
 fixing to use new ActiveMusicSession model

---
 web/spec/features/recordings_spec.rb | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/web/spec/features/recordings_spec.rb b/web/spec/features/recordings_spec.rb
index 11518092a..030fb26ed 100644
--- a/web/spec/features/recordings_spec.rb
+++ b/web/spec/features/recordings_spec.rb
@@ -105,6 +105,8 @@ describe "Session Recordings", :js => true, :type => :feature, :capybara_feature
 
       RecordedTrack.delete_all
       ClaimedRecording.delete_all
+      MusicSession.delete_all
+      ActiveMusicSession.delete_all
 
       start_recording_with(creator, [joiner1], some_genre)
 
@@ -117,7 +119,7 @@ describe "Session Recordings", :js => true, :type => :feature, :capybara_feature
     end
 
     it "discard the recording" do
-      pending "fails intermittently on the build server"
+      # pending "fails intermittently on the build server"
       in_client(creator) do
         find('#recording-finished-dialog h1')
         find('#discard-session-recording').trigger(:click)
@@ -142,7 +144,7 @@ describe "Session Recordings", :js => true, :type => :feature, :capybara_feature
     end
 
     it "claim recording with unique names/descriptions" do
-      pending "intermittent failure on build server, hard to repro on local system"
+      # pending "intermittent failure on build server, hard to repro on local system"
       @users.each do |user|
         name = "#{user.name}'s recording"
         desc = "#{user.name}'s description"
@@ -155,7 +157,7 @@ describe "Session Recordings", :js => true, :type => :feature, :capybara_feature
           expect(claimed_recording.name).to eq(name)
           expect(claimed_recording.description).to eq(desc)
           expect(claimed_recording.is_public).to be_true
-          expect(claimed_recording.genre).to eq(music_session.genres[0])
+          expect(claimed_recording.genre).to eq(music_session.genre)
         end
       end
     end
@@ -168,13 +170,12 @@ describe "Session Recordings", :js => true, :type => :feature, :capybara_feature
           fill_in "claim-recording-description",    with: "my description"
           find('#keep-session-recording').trigger(:click)
           should have_content("can't be blank")
-          save_screenshot("tmp/name#{user.name}.png")
         end
       end
     end
 
     it "a 'Description' is optional" do
-      pending "intermittent failure on build server, hard to repro on local system"
+      # pending "intermittent failure on build server, hard to repro on local system"
       @users.each do |user|
         in_client(user) do
           claim_recording("my recording", '')
@@ -184,7 +185,7 @@ describe "Session Recordings", :js => true, :type => :feature, :capybara_feature
           expect(claimed_recording.name).to eq("my recording")
           expect(claimed_recording.description).to eq('')
           expect(claimed_recording.is_public).to be_true
-          expect(claimed_recording.genre).to eq(music_session.genres[0])
+          expect(claimed_recording.genre).to eq(music_session.genre)
         end
       end
     end