This commit is contained in:
Brian Smith 2014-05-29 01:28:40 -04:00
parent 69c92e1f76
commit b640c31301
2 changed files with 12 additions and 2 deletions

View File

@ -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

View File

@ -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