From ef968fb29dd6e467131eebc2bcd78a28d9d3ed9c Mon Sep 17 00:00:00 2001 From: Seth Call Date: Sat, 13 Oct 2012 17:51:08 -0500 Subject: [PATCH] * fixing tests for new client_id field --- lib/jam_ruby/message_factory.rb | 11 ++++++++++- spec/jam_ruby/models/music_session_spec.rb | 4 ++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/lib/jam_ruby/message_factory.rb b/lib/jam_ruby/message_factory.rb index 11ac5ff0b..96912edee 100644 --- a/lib/jam_ruby/message_factory.rb +++ b/lib/jam_ruby/message_factory.rb @@ -96,6 +96,7 @@ return Jampb::ClientMessage.new(:type => ClientMessage::Type::TEST_SESSION_MESSAGE, :route_to => SESSION_TARGET_PREFIX + session_id, :test_session_message => test) end + ############## P2P CLIENT MESSAGES ################# # send a request to do a ping def ping_request(client_id, from) @@ -109,7 +110,15 @@ return Jampb::ClientMessage.new(:type => ClientMessage::Type::PING_ACK, :route_to => CLIENT_TARGET_PREFIX + client_id, :from => from, :ping_ack => ping_ack) end - # create a heartbeat + # create a test message to send in session + def test_client_message(client_id, from, msg) + test = Jampb::TestClientMessage.new(:msg => msg) + return Jampb::ClientMessage.new(:type => ClientMessage::Type::TEST_CLIENT_MESSAGE, :route_to => CLIENT_TARGET_PREFIX + client_id, :from => from, :test_client_message => test) + end + + #################################################### + + # create a heartbeat def heartbeat() heartbeat = Jampb::Heartbeat.new return Jampb::ClientMessage.new(:type => ClientMessage::Type::HEARTBEAT, :route_to => SERVER_TARGET, :heartbeat => heartbeat) diff --git a/spec/jam_ruby/models/music_session_spec.rb b/spec/jam_ruby/models/music_session_spec.rb index 5fbcdbbb7..ad93f9558 100644 --- a/spec/jam_ruby/models/music_session_spec.rb +++ b/spec/jam_ruby/models/music_session_spec.rb @@ -10,8 +10,8 @@ describe MusicSession do music_session = FactoryGirl.create(:music_session, :creator => user1) - music_session_member1 = FactoryGirl.create(:music_session_client, :user => user1, :music_session => music_session, :ip_address => "1.1.1.1") - music_session_member2 = FactoryGirl.create(:music_session_client, :user => user2, :music_session => music_session, :ip_address => "2.2.2.2") + music_session_member1 = FactoryGirl.create(:music_session_client, :user => user1, :music_session => music_session, :ip_address => "1.1.1.1", :client_id => "1") + music_session_member2 = FactoryGirl.create(:music_session_client, :user => user2, :music_session => music_session, :ip_address => "2.2.2.2", :client_id => "2") music_session.access?(user1).should == true music_session.access?(user2).should == true