From 989544bb35df9cfff3969b2b9334273e9c4cc9d8 Mon Sep 17 00:00:00 2001
From: Seth Call <sethcall@gmail.com>
Date: Mon, 3 Dec 2012 22:08:17 -0600
Subject: [PATCH] * fixing broken test in rspec

---
 spec/factories.rb                  | 11 +++++++++--
 spec/jam_websockets/router_spec.rb |  5 ++---
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/spec/factories.rb b/spec/factories.rb
index 6c5bac31c..bcd30e8c1 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -1,9 +1,15 @@
 FactoryGirl.define do
   factory :user, :class => JamRuby::User do
     sequence(:email) { |n| "person_#{n}@example.com"}
+    sequence(:first_name)  { |n| "Person" }
+    sequence(:last_name)  { |n| "#{n}" }
     password "foobar"
     password_confirmation "foobar"
-
+    email_confirmed true
+    musician true
+    city "Apex"
+    state "NC"
+    country "USA"
 
     factory :admin do
       admin true
@@ -12,7 +18,7 @@ FactoryGirl.define do
 
   factory :music_session, :class => JamRuby::MusicSession do
     sequence(:description) { |n| "Jam Session #{n}" }
-    fan_chat true
+        fan_chat true
     fan_access true
     approval_required false
     musician_access true
@@ -20,5 +26,6 @@ FactoryGirl.define do
 
   factory :connection, :class => JamRuby::Connection do
     ip_address "1.1.1.1"
+    as_musician true
   end
 end
diff --git a/spec/jam_websockets/router_spec.rb b/spec/jam_websockets/router_spec.rb
index d7f80e176..1cd1b8613 100644
--- a/spec/jam_websockets/router_spec.rb
+++ b/spec/jam_websockets/router_spec.rb
@@ -188,10 +188,9 @@ describe Router do
 
     it "should allow login of valid user", :mq => true do
       #em do
-        @user = User.new(:name => "Example User", :email => "user@example.com",
+        @user = FactoryGirl.create(:user, 
                          :password => "foobar", :password_confirmation => "foobar")
-        @user.save
-
+    
         client1 = login(@router, @user, "foobar", "1")
         done
       #end