Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop

# By Anthony Davis (3) and Seth Call (2)
# Via Anthony Davis (2) and Seth Call (1)
* 'develop' of bitbucket.org:jamkazam/jam-cloud:
  VRFS-923 wrong sdk/method
  * removing print because tests passed on build server
  minor refactor in recordings spec
  VRFS-923 'jamkazam-testing' s3 bucket is emptied after tests
  * adding some prints to debug failing tests

ruby/spec/support/utilities.rb

@@ -23,9 +23,7 @@ def wipe_s3_test_bucket
   s3 = AWS::S3.new(:access_key_id => test_config.aws_access_key_id,
                    :secret_access_key => test_config.aws_secret_access_key)
   test_bucket = s3.buckets[JAMKAZAM_TESTING_BUCKET]
-
   if test_bucket.name == JAMKAZAM_TESTING_BUCKET
-    puts "Ruby - Pretending to delete all contents of #{test_bucket.name}"
-    #test_bucket.delete_all
+    test_bucket.clear!
   end
 end

web/spec/features/recordings_spec.rb

@@ -12,6 +12,7 @@ describe "Session Recordings", :js => true, :type => :feature, :capybara_feature
 
   let(:creator) { FactoryGirl.create(:user) }
   let(:joiner1) { FactoryGirl.create(:user) }
+  let(:joiner2) { FactoryGirl.create(:user) }
   let(:some_genre) { random_genre }
 
   before(:each) do
@@ -21,18 +22,14 @@ describe "Session Recordings", :js => true, :type => :feature, :capybara_feature
   # creates a recording, and stops it, and confirms the 'Finished Recording' dialog shows for both
   it "creator start/stop" do
     start_recording_with(creator, [joiner1])
-
     in_client(creator) { stop_recording }
-
     check_recording_finished_for([creator, joiner1])
   end
 
   # confirms that anyone can start/stop a recording
   it "creator starts and other stops" do
     start_recording_with(creator, [joiner1])
-
     in_client(joiner1) { stop_recording }
-
     check_recording_finished_for([creator, joiner1])
   end
 
@@ -64,8 +61,6 @@ describe "Session Recordings", :js => true, :type => :feature, :capybara_feature
   end
 
   it "creator starts/stops, with 3 total participants" do
-    joiner2 = FactoryGirl.create(:user)
-
     start_recording_with(creator, [joiner1, joiner2])
 
     in_client(creator) do
@@ -76,7 +71,6 @@ describe "Session Recordings", :js => true, :type => :feature, :capybara_feature
   end
 
   it "creator starts with session leave to stop, with 3 total participants" do
-    joiner2 = FactoryGirl.create(:user)
     start_recording_with(creator, [joiner1, joiner2])
 
     in_client(creator) do
@@ -90,7 +84,6 @@ describe "Session Recordings", :js => true, :type => :feature, :capybara_feature
 
   # confirms that if someone leaves 'ugly' (without calling 'Leave' REST API), that the recording is junked with 3 participants
   it "creator starts and then abruptly leave with 3 participants" do
-    joiner2 = FactoryGirl.create(:user)
     start_recording_with(creator, [joiner1, joiner2])
 
     in_client(creator) do
@@ -160,7 +153,8 @@ describe "Session Recordings", :js => true, :type => :feature, :capybara_feature
           claim_recording(name, desc)
           music_session = MusicSession.first()
           recording = music_session.recordings.first()
-          claimed_recording = ClaimedRecording.find_by_user_id(user.id)
+          #puts recording.claimed_recordings.inspect
+          claimed_recording = recording.claimed_recordings.where(:user_id => user.id).first
           claimed_recording.name.should == name
           claimed_recording.description.should == desc
           claimed_recording.is_public.should be_true
@@ -189,7 +183,8 @@ describe "Session Recordings", :js => true, :type => :feature, :capybara_feature
           claim_recording("my recording", '')
           music_session = MusicSession.first()
           recording = music_session.recordings.first()
-          claimed_recording = ClaimedRecording.find_by_user_id(user.id)
+          #puts recording.claimed_recordings.inspect
+          claimed_recording = recording.claimed_recordings.where(:user_id => user.id).first
           claimed_recording.name.should == "my recording"
           claimed_recording.description.should == ''
           claimed_recording.is_public.should be_true

web/spec/support/utilities.rb

@@ -37,8 +37,7 @@ def wipe_s3_test_bucket
                    :secret_access_key => Rails.application.config.aws_secret_access_key)
   test_bucket = s3.buckets[JAMKAZAM_TESTING_BUCKET]
   if test_bucket.name == JAMKAZAM_TESTING_BUCKET
-    puts "Web - Pretending to delete all contents of #{test_bucket.name}"
-    #test_bucket.delete_all
+    test_bucket.clear!
   end
 end