nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed failing specs due to omitted factories.

Browse source
This commit is contained in:
maxwell 2010-10-25 12:14:27 -07:00 committed by danielvincent
parent 154b6e0ee7
commit fdd222003a
2 changed files with 29 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
Gemfile.lock
View file

@ -182,13 +182,15 @@ GEM
hashie (0.4.0) hashie (0.4.0)
highline (1.6.1) highline (1.6.1)
http_connection (1.4.0) http_connection (1.4.0)
httparty (0.6.1)
crack (= 0.1.8)
i18n (0.4.1) i18n (0.4.1)
json (1.4.6) json (1.4.6)
json_pure (1.4.6) json_pure (1.4.6)
<<<<<<< HEAD
launchy (0.3.7) launchy (0.3.7)
configuration (>= 0.0.5) configuration (>= 0.0.5)
rake (>= 0.8.1) rake (>= 0.8.1)
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
linecache19 (0.5.11) linecache19 (0.5.11)
ruby_core_source (>= 0.1.4) ruby_core_source (>= 0.1.4)
@ -199,6 +201,10 @@ GEM
ruby_core_source (>= 0.1.4) ruby_core_source (>= 0.1.4)
>>>>>>> twitter oauth dance complete >>>>>>> twitter oauth dance complete
>>>>>>> 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) mail (2.2.7)
activesupport (>= 2.3.6) activesupport (>= 2.3.6)
mime-types mime-types
@ -229,15 +235,6 @@ GEM
net-ssh-gateway (1.0.1) net-ssh-gateway (1.0.1)
net-ssh (>= 1.99.1) net-ssh (>= 1.99.1)
nokogiri (1.4.3.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) oa-basic (0.1.5)
multi_json (~> 0.0.2) multi_json (~> 0.0.2)
nokogiri (~> 1.4.2) nokogiri (~> 1.4.2)
@ -265,13 +262,19 @@ GEM
oauth2 (0.0.13) oauth2 (0.0.13)
faraday (~> 0.4.1) faraday (~> 0.4.1)
multi_json (>= 0.0.4) 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) omniauth (0.1.5)
oa-basic (= 0.1.5) oa-basic (= 0.1.5)
oa-core (= 0.1.5) oa-core (= 0.1.5)
oa-enterprise (= 0.1.5) oa-enterprise (= 0.1.5)
oa-oauth (= 0.1.5) oa-oauth (= 0.1.5)
oa-openid (= 0.1.5) oa-openid (= 0.1.5)
>>>>>>> twitter oauth dance complete
plucky (0.3.6) plucky (0.3.6)
mongo (~> 1.1) mongo (~> 1.1)
polyglot (0.3.1) polyglot (0.3.1)
@ -350,6 +353,11 @@ GEM
thor (0.14.3) thor (0.14.3)
treetop (1.4.8) treetop (1.4.8)
polyglot (>= 0.3.1) 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) tzinfo (0.3.23)
uuidtools (2.1.1) uuidtools (2.1.1)
warden (0.10.7) warden (0.10.7)
@ -398,5 +406,6 @@ DEPENDENCIES
ruby-debug19 ruby-debug19
sprinkle! sprinkle!
thin thin
twitter
webmock webmock
will_paginate (= 3.0.pre2) will_paginate (= 3.0.pre2)

9
spec/factories.rb
View file

@ -66,3 +66,12 @@ Factory.define :omniauth_service do |service|
service.sequence(:access_secret) { |token| "98765#{token}" } service.sequence(:access_secret) { |token| "98765#{token}" }
end 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