seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

fix merge

This commit is contained in:
Brian Smith 2014-06-23 01:56:44 -04:00
parent e211871168
commit c5d9f41242
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ruby/spec/factories.rb
View File

@ -125,8 +125,8 @@ FactoryGirl.define do
addr 0
locidispid 0
client_type 'client'
last_jam_audio_latency { user.last_jam_audio_latency if user }
# sequence(:channel_id) { |n| "Channel#{n}"}
last_jam_audio_latency { user.last_jam_audio_latency if user }
sequence(:channel_id) { |n| "Channel#{n}"}
association :user, factory: :user
end

3
web/spec/factories.rb
View File

@ -143,8 +143,7 @@ FactoryGirl.define do
addr {JamIsp.ip_to_num(ip_address)}
locidispid 0
client_type 'client'
last_jam_audio_latency { user.last_jam_audio_latency if user }
# sequence(:channel_id) { |n| "Channel#{n}"}
sequence(:channel_id) { |n| "Channel#{n}"}
end
factory :friendship, :class => JamRuby::Friendship do