From fdd222003a0ca72026b2db1f4deefc9c49af9d60 Mon Sep 17 00:00:00 2001
From: maxwell <maxwell@joindiaspora.com>
Date: Mon, 25 Oct 2010 12:14:27 -0700
Subject: [PATCH] fixed failing specs due to omitted factories.

---
 Gemfile.lock      | 31 ++++++++++++++++++++-----------
 spec/factories.rb |  9 +++++++++
 2 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 7a1caf8ce8..0a8a3eb651 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -182,13 +182,15 @@ GEM
     hashie (0.4.0)
     highline (1.6.1)
     http_connection (1.4.0)
+    httparty (0.6.1)
+      crack (= 0.1.8)
     i18n (0.4.1)
     json (1.4.6)
     json_pure (1.4.6)
-<<<<<<< HEAD
     launchy (0.3.7)
       configuration (>= 0.0.5)
       rake (>= 0.8.1)
+<<<<<<< HEAD
 <<<<<<< HEAD
     linecache19 (0.5.11)
       ruby_core_source (>= 0.1.4)
@@ -199,6 +201,10 @@ GEM
       ruby_core_source (>= 0.1.4)
 >>>>>>> twitter oauth dance complete
 >>>>>>> twitter oauth dance complete
+=======
+    linecache19 (0.5.11)
+      ruby_core_source (>= 0.1.4)
+>>>>>>> fixed failing specs due to omitted factories.
     mail (2.2.7)
       activesupport (>= 2.3.6)
       mime-types
@@ -229,15 +235,6 @@ GEM
     net-ssh-gateway (1.0.1)
       net-ssh (>= 1.99.1)
     nokogiri (1.4.3.1)
-<<<<<<< HEAD
-    ohai (0.5.8)
-      extlib
-      json (>= 1.4.4, <= 1.4.6)
-      mixlib-cli
-      mixlib-config
-      mixlib-log
-      systemu
-=======
     oa-basic (0.1.5)
       multi_json (~> 0.0.2)
       nokogiri (~> 1.4.2)
@@ -265,13 +262,19 @@ GEM
     oauth2 (0.0.13)
       faraday (~> 0.4.1)
       multi_json (>= 0.0.4)
+    ohai (0.5.8)
+      extlib
+      json (>= 1.4.4, <= 1.4.6)
+      mixlib-cli
+      mixlib-config
+      mixlib-log
+      systemu
     omniauth (0.1.5)
       oa-basic (= 0.1.5)
       oa-core (= 0.1.5)
       oa-enterprise (= 0.1.5)
       oa-oauth (= 0.1.5)
       oa-openid (= 0.1.5)
->>>>>>> twitter oauth dance complete
     plucky (0.3.6)
       mongo (~> 1.1)
     polyglot (0.3.1)
@@ -350,6 +353,11 @@ GEM
     thor (0.14.3)
     treetop (1.4.8)
       polyglot (>= 0.3.1)
+    twitter (0.9.12)
+      hashie (~> 0.4.0)
+      httparty (~> 0.6.1)
+      multi_json (~> 0.0.4)
+      oauth (~> 0.4.3)
     tzinfo (0.3.23)
     uuidtools (2.1.1)
     warden (0.10.7)
@@ -398,5 +406,6 @@ DEPENDENCIES
   ruby-debug19
   sprinkle!
   thin
+  twitter
   webmock
   will_paginate (= 3.0.pre2)
diff --git a/spec/factories.rb b/spec/factories.rb
index 81f001a172..6c6d69f4fb 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -66,3 +66,12 @@ Factory.define :omniauth_service do |service|
   service.sequence(:access_secret) { |token| "98765#{token}" }
 end
 
+Factory.define(:comment) {}
+
+Factory.define :fb_status do |s|
+   s.graph_id "367501354973"
+   s.author_name "Bret Taylor"
+   s.author_id "220439"
+   s.message "Pigs run from our house in fear. Tonight, I am wrapping the pork tenderloin in bacon and putting pancetta in the corn."
+   s.updated_time Time.parse "2010-03-06T02:57:48+0000"
+end
-- 
GitLab