diff options
| author | maxwell <maxwell@joindiaspora.com> | 2010-10-25 23:28:45 +0400 |
|---|---|---|
| committer | danielvincent <danielgrippi@gmail.com> | 2010-10-26 04:41:58 +0400 |
| commit | be39df75fed3c7495be1e6a25781a745c1400610 (patch) | |
| tree | 83f4113bbb88a2aba4a8077037abf49690a8559d | |
| parent | fdd222003a0ca72026b2db1f4deefc9c49af9d60 (diff) | |
removed fb_status from the factories. whoops.
| -rw-r--r-- | Gemfile.lock | 18 | ||||
| -rw-r--r-- | spec/factories.rb | 7 |
2 files changed, 0 insertions, 25 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 0a8a3eb65..1a3128822 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -190,21 +190,8 @@ GEM launchy (0.3.7) configuration (>= 0.0.5) rake (>= 0.8.1) -<<<<<<< HEAD -<<<<<<< HEAD linecache19 (0.5.11) ruby_core_source (>= 0.1.4) -======= - linecache (0.43) -======= - linecache19 (0.5.11) - 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 @@ -326,17 +313,12 @@ GEM columnize (>= 0.3.1) linecache19 (>= 0.5.11) ruby-debug-base19 (>= 0.11.19) -<<<<<<< HEAD - ruby_core_source (0.1.4) - archive-tar-minitar (>= 0.5.2) -======= ruby-openid (2.1.8) ruby-openid-apps-discovery (1.2.0) ruby-openid (>= 2.1.7) ruby_core_source (0.1.4) archive-tar-minitar (>= 0.5.2) rubyntlm (0.1.1) ->>>>>>> twitter oauth dance complete rubyzip (0.9.4) selenium-webdriver (0.0.29) childprocess (>= 0.0.7) diff --git a/spec/factories.rb b/spec/factories.rb index 6c6d69f4f..b64cbbc5e 100644 --- a/spec/factories.rb +++ b/spec/factories.rb @@ -68,10 +68,3 @@ 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 |