From b640c31301edff0e2644a0a5c1678f5df7c90e8e Mon Sep 17 00:00:00 2001 From: Brian Smith Date: Thu, 29 May 2014 01:28:40 -0400 Subject: [PATCH] fix test --- ruby/lib/jam_ruby/models/music_session.rb | 12 +++++++++++- web/spec/requests/active_music_sessions_api_spec.rb | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ruby/lib/jam_ruby/models/music_session.rb b/ruby/lib/jam_ruby/models/music_session.rb index bacf999c2..53cb4450c 100644 --- a/ruby/lib/jam_ruby/models/music_session.rb +++ b/ruby/lib/jam_ruby/models/music_session.rb @@ -294,7 +294,17 @@ module JamRuby end def language_description - ISO_639.find_by_code(self.language).english_name + if self.language.blank? + self.language = "en" + end + + iso639Details = ISO_639.find_by_code(self.language) + + unless iso639Details.blank? + return iso639Details.english_name + else + return "English" + end end def scheduled_start_time diff --git a/web/spec/requests/active_music_sessions_api_spec.rb b/web/spec/requests/active_music_sessions_api_spec.rb index e2e3f62a5..aac4f1c2a 100755 --- a/web/spec/requests/active_music_sessions_api_spec.rb +++ b/web/spec/requests/active_music_sessions_api_spec.rb @@ -754,7 +754,7 @@ describe "Active Music Session API ", :type => :api do music_session = FactoryGirl.create(:active_music_session, :creator => user, :musician_access => true) # music_session.connections << connection music_session.save - connection.join_the_session(music_session, true, nil) + connection.join_the_session(music_session, true, nil, user) recording = Recording.start(music_session, user) recording.stop recording.reload