From c5d9f41242490ff0cd223b41fea60e43bf157075 Mon Sep 17 00:00:00 2001 From: Brian Smith Date: Mon, 23 Jun 2014 01:56:44 -0400 Subject: [PATCH] fix merge --- ruby/spec/factories.rb | 4 ++-- web/spec/factories.rb | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/ruby/spec/factories.rb b/ruby/spec/factories.rb index 9bf6d117f..35a13c770 100644 --- a/ruby/spec/factories.rb +++ b/ruby/spec/factories.rb @@ -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 diff --git a/web/spec/factories.rb b/web/spec/factories.rb index 57caddff0..5c959cc4c 100644 --- a/web/spec/factories.rb +++ b/web/spec/factories.rb @@ -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