From 5599aa94052063783ee4dec72b02f69b1b8a4c48 Mon Sep 17 00:00:00 2001 From: Seth Call Date: Wed, 3 Oct 2012 00:05:33 -0500 Subject: [PATCH] * VRFS-15; making musicians hang off of root uri take 2; I had a bad test that was a false positive --- app/controllers/api_music_sessions_controller.rb | 3 +-- spec/requests/music_session_pages_spec.rb | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/controllers/api_music_sessions_controller.rb b/app/controllers/api_music_sessions_controller.rb index 72e302947..10cd7e41b 100644 --- a/app/controllers/api_music_sessions_controller.rb +++ b/app/controllers/api_music_sessions_controller.rb @@ -45,8 +45,7 @@ class ApiMusicSessionsController < ApplicationController end def client_delete - @music_session = MusicSession.find(params[:id]) - @music_session_client = MusicSessionClient.find_by_user_id_and_music_session_id(current_user, @music_session) + @music_session_client = MusicSessionClient.find(params[:id]) @music_session_client.delete respond_with @music_session_client, responder: ApiResponder diff --git a/spec/requests/music_session_pages_spec.rb b/spec/requests/music_session_pages_spec.rb index 57a80be27..5b55829a2 100644 --- a/spec/requests/music_session_pages_spec.rb +++ b/spec/requests/music_session_pages_spec.rb @@ -90,7 +90,7 @@ describe "Music Session API ", :type => :api do musician["ip_address"].should == "1.2.3.4" # now delete that musician - delete "/api/musicians/#{music_session["id"]}.json", '', "CONTENT_TYPE" => 'application/json' + delete "/api/musicians/#{musician["id"]}.json", '', "CONTENT_TYPE" => 'application/json' last_response.status.should eql(204) # re-fetch the session now that there is not a musician