* perfdata complete with one entire test (sarcasm)
This commit is contained in:
parent
16df6f9106
commit
d8730fa521
|
|
@ -5,6 +5,7 @@ class ApiMusicSessionsController < ApiController
|
|||
# have to be signed in currently to see this screen
|
||||
before_filter :api_signed_in_user
|
||||
before_filter :lookup_session, only: [:show, :update, :delete]
|
||||
skip_before_filter :api_signed_in_user, only: [:perf_upload]
|
||||
|
||||
respond_to :json
|
||||
|
||||
|
|
@ -166,7 +167,7 @@ class ApiMusicSessionsController < ApiController
|
|||
|
||||
def perf_upload
|
||||
# URI.unescape(bucket_gen.objects[@perfdata.uri].url_for(:read, :expires => SampleApp::Application.config.perf_data_signed_url_timeout, :response_content_type => 'text/csv').to_s)
|
||||
music_session = MusicSession.find(params[:id])
|
||||
music_session = MusicSessionHistory.find_by_music_session_id(params[:id])
|
||||
|
||||
@perfdata = MusicSessionPerfData.new()
|
||||
@perfdata.music_session = music_session
|
||||
|
|
@ -189,7 +190,7 @@ class ApiMusicSessionsController < ApiController
|
|||
else
|
||||
if params[:redirected_back].nil? || !params[:redirected_back]
|
||||
# first time that a client has asked to do a PUT (not redirected back here)
|
||||
redirect_to request.fullpath + '&redirected_back=true'
|
||||
redirect_to request.fullpath + '?redirected_back=true'
|
||||
else
|
||||
# we should store it here to aid in development, but we don't have to until someone wants the feature
|
||||
# so... just return 200
|
||||
|
|
|
|||
|
|
@ -116,7 +116,7 @@ if defined?(Bundler)
|
|||
|
||||
|
||||
# perf_data configs
|
||||
config.perf_data_bucket_key = "perf_data"
|
||||
#config.perf_data_bucket_key = "perf_data"
|
||||
config.perf_data_signed_url_timeout = 3600 # 1 hour
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -57,10 +57,14 @@ FactoryGirl.define do
|
|||
approval_required false
|
||||
musician_access true
|
||||
legal_terms true
|
||||
|
||||
after(:create) { |session|
|
||||
MusicSessionHistory.save(session)
|
||||
}
|
||||
end
|
||||
|
||||
|
||||
factory :connection, :class => JamRuby::Connection do
|
||||
sequence(:client_id) { |n| "Client#{n}" }
|
||||
ip_address "1.1.1.1"
|
||||
as_musician true
|
||||
sequence(:client_id) { |n| "client_id#{n}"}
|
||||
|
|
|
|||
|
|
@ -561,6 +561,10 @@ describe "Music Session API ", :type => :api do
|
|||
music_session = FactoryGirl.create(:music_session, :creator => user, :description => "My Session")
|
||||
client = FactoryGirl.create(:connection, :user => user)
|
||||
|
||||
|
||||
|
||||
puts MusicSessionHistory.find_by_music_session_id(music_session.id)
|
||||
|
||||
put "/api/sessions/#{music_session.id}/perf.json", "CONTENT_TYPE" => "application/json"
|
||||
last_response.status.should == 302
|
||||
redirect = last_response.headers["Location"]
|
||||
|
|
@ -573,7 +577,7 @@ describe "Music Session API ", :type => :api do
|
|||
|
||||
music_session_perf_data = MusicSessionPerfData.find(perf_data_id)
|
||||
music_session_perf_data.should_not be_nil
|
||||
music_session_perf_data.music_session.should == music_session
|
||||
music_session_perf_data.music_session.should == MusicSessionHistory.find_by_music_session_id(music_session.id)
|
||||
end
|
||||
|
||||
end
|
||||
|
|
|
|||
Loading…
Reference in New Issue