From 3f6c343e4c885be7094a0b505d2206b000c1adbd Mon Sep 17 00:00:00 2001 From: Seth Call Date: Sat, 13 Oct 2012 17:51:51 -0500 Subject: [PATCH] * client_id required by /api/sessions/#id/participants now --- app/controllers/api_music_sessions_controller.rb | 1 + app/views/api_music_sessions/member_show.rabl | 2 +- app/views/api_music_sessions/show.rabl | 2 +- spec/requests/music_session_pages_spec.rb | 5 ++++- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app/controllers/api_music_sessions_controller.rb b/app/controllers/api_music_sessions_controller.rb index 90a7b9d25..c0a1d9639 100644 --- a/app/controllers/api_music_sessions_controller.rb +++ b/app/controllers/api_music_sessions_controller.rb @@ -37,6 +37,7 @@ class ApiMusicSessionsController < ApplicationController @music_session_client = MusicSessionClient.new() @music_session_client.ip_address = params[:ip_address] + @music_session_client.client_id = params[:client_id] @music_session_client.music_session = @music_session @music_session_client.user = current_user @music_session_client.save diff --git a/app/views/api_music_sessions/member_show.rabl b/app/views/api_music_sessions/member_show.rabl index 1f5ffadb2..d6959b545 100644 --- a/app/views/api_music_sessions/member_show.rabl +++ b/app/views/api_music_sessions/member_show.rabl @@ -1,3 +1,3 @@ object @music_session_client -attributes :id, :ip_address \ No newline at end of file +attributes :id, :ip_address, :client_id \ No newline at end of file diff --git a/app/views/api_music_sessions/show.rabl b/app/views/api_music_sessions/show.rabl index dd6989eca..518a4eb75 100644 --- a/app/views/api_music_sessions/show.rabl +++ b/app/views/api_music_sessions/show.rabl @@ -4,5 +4,5 @@ attributes :id, :description child(:music_session_clients => :participants) { collection @music_sessions, :object_root => false - attributes :id, :ip_address + attributes :id, :ip_address, :client_id } diff --git a/spec/requests/music_session_pages_spec.rb b/spec/requests/music_session_pages_spec.rb index 97b98a0f8..c24a6fc37 100644 --- a/spec/requests/music_session_pages_spec.rb +++ b/spec/requests/music_session_pages_spec.rb @@ -73,7 +73,7 @@ describe "Music Session API ", :type => :api do music_session["participants"].length.should == 0 # create a member - post "/api/sessions/#{music_session["id"]}/participants.json", '{ "ip_address" : "1.2.3.4" }', "CONTENT_TYPE" => 'application/json' + post "/api/sessions/#{music_session["id"]}/participants.json", '{ "ip_address" : "1.2.3.4", "client_id" : "1" }', "CONTENT_TYPE" => 'application/json' last_response.status.should eql(201) musician = JSON.parse(last_response.body) @@ -89,6 +89,9 @@ describe "Music Session API ", :type => :api do # and that musician should have the same IP address musician["ip_address"].should == "1.2.3.4" + # and that musician should have the same IP address + musician["client_id"].should == "1" + # now delete that musician delete "/api/participants/#{musician["id"]}.json", '', "CONTENT_TYPE" => 'application/json' last_response.status.should eql(204)