From cfd80927f9bc571afb1817ca76c7cef9559a80f0 Mon Sep 17 00:00:00 2001 From: Seth Call Date: Tue, 17 Mar 2015 13:39:21 -0500 Subject: [PATCH] * fix broken tests that occurred when removing mount_uploader from jam_track_track --- ruby/spec/jam_ruby/models/jam_track_right_spec.rb | 10 +++++----- ruby/spec/jam_ruby/models/jam_track_track_spec.rb | 7 ++++--- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/ruby/spec/jam_ruby/models/jam_track_right_spec.rb b/ruby/spec/jam_ruby/models/jam_track_right_spec.rb index bd8e48196..e1e99c3f2 100644 --- a/ruby/spec/jam_ruby/models/jam_track_right_spec.rb +++ b/ruby/spec/jam_ruby/models/jam_track_right_spec.rb @@ -58,15 +58,15 @@ describe JamTrackRight do user = FactoryGirl.create(:user) jam_track_track = FactoryGirl.create(:jam_track_track) jam_track = jam_track_track.jam_track - - uploader = JamTrackTrackUploader.new(jam_track_track, :url_48) - uploader.store!(File.open(ogg_path, 'rb')) + + s3 = S3Manager.new(APP_CONFIG.aws_bucket, APP_CONFIG.aws_access_key_id, APP_CONFIG.aws_secret_access_key) + + s3.upload(jam_track_track.manually_uploaded_filename(:url_48), ogg_path) + jam_track_track[:url_48] = jam_track_track.manually_uploaded_filename(:url_48) jam_track_track.save! - jam_track_track[:url_48].should == jam_track_track.manually_uploaded_filename(:url_48) # verify it's on S3 - s3 = S3Manager.new(APP_CONFIG.aws_bucket, APP_CONFIG.aws_access_key_id, APP_CONFIG.aws_secret_access_key) s3.exists?(jam_track_track[:url_48]).should be_true s3.length(jam_track_track[:url_48]).should == File.size?(ogg_path) diff --git a/ruby/spec/jam_ruby/models/jam_track_track_spec.rb b/ruby/spec/jam_ruby/models/jam_track_track_spec.rb index 5d2f934a4..bce440ad8 100644 --- a/ruby/spec/jam_ruby/models/jam_track_track_spec.rb +++ b/ruby/spec/jam_ruby/models/jam_track_track_spec.rb @@ -46,9 +46,11 @@ describe JamTrackTrack do end it "uploads to s3 with correct name, and then downloads via signed URL" do + s3 = S3Manager.new(APP_CONFIG.aws_bucket, APP_CONFIG.aws_access_key_id, APP_CONFIG.aws_secret_access_key) + jam_track_track = FactoryGirl.create(:jam_track_track) - uploader = JamTrackTrackUploader.new(jam_track_track, :url_48) - uploader.store!(File.open(TRACK_NAME)) # uploads file + s3.upload(jam_track_track.manually_uploaded_filename(:url_48), TRACK_NAME) + jam_track_track[:url_48] = jam_track_track.manually_uploaded_filename(:url_48) jam_track_track.save! jam_track_track.reload @@ -56,7 +58,6 @@ describe JamTrackTrack do jam_track_track[:url_48].should == jam_track_track.manually_uploaded_filename(:url_48) # verify it's on S3 - s3 = S3Manager.new(APP_CONFIG.aws_bucket, APP_CONFIG.aws_access_key_id, APP_CONFIG.aws_secret_access_key) s3.exists?(jam_track_track[:url_48]).should be_true s3.length(jam_track_track[:url_48]).should == 'abc'.length