From 0517ae9ba347649535ad8ee76a4aad2875513bb5 Mon Sep 17 00:00:00 2001 From: Brian Smith Date: Wed, 16 Oct 2013 21:39:00 -0400 Subject: [PATCH] VRFS-758 fix unit test - still need to clean up message --- web/app/controllers/api_join_requests_controller.rb | 3 +-- web/spec/requests/join_requests_api_spec.rb | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/web/app/controllers/api_join_requests_controller.rb b/web/app/controllers/api_join_requests_controller.rb index 152843c11..6ef30f4aa 100644 --- a/web/app/controllers/api_join_requests_controller.rb +++ b/web/app/controllers/api_join_requests_controller.rb @@ -27,8 +27,7 @@ class ApiJoinRequestsController < ApiController if @join_request.errors.any? response.status = :unprocessable_entity - respond_with "You cannot join the session at this time." - # respond_with @join_request + respond_with @join_request else # send notification Notification.send_join_request(music_session, @join_request, text) diff --git a/web/spec/requests/join_requests_api_spec.rb b/web/spec/requests/join_requests_api_spec.rb index 9ff0c0fc0..d73c8370e 100644 --- a/web/spec/requests/join_requests_api_spec.rb +++ b/web/spec/requests/join_requests_api_spec.rb @@ -80,7 +80,6 @@ describe "Join Request API", :type => :api do end it "can't create duplicate join_request" do - pending login(other) post '/api/join_requests.json', { :music_session => user.music_sessions[0].id, :text => "lemme in" }.to_json, "CONTENT_TYPE" => 'application/json'