From 7c3c17a4187dbc6c450ab4c5c3d20c61a6f6fe8d Mon Sep 17 00:00:00 2001
From: Raphael <raphael@joindiaspora.com>
Date: Thu, 6 Jan 2011 16:00:39 -0800
Subject: [PATCH] Move fantasy_resque to the fake_resque file, add services to
 the mysql export fixture

---
 lib/tasks/fixtures.rake     |  9 +++++++++
 spec/helper_methods.rb      |  8 --------
 spec/spec_helper.rb         |  2 +-
 spec/support/fake_resque.rb | 10 ++++++++++
 4 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/lib/tasks/fixtures.rake b/lib/tasks/fixtures.rake
index 4d41da041..8fa3ad9c7 100644
--- a/lib/tasks/fixtures.rake
+++ b/lib/tasks/fixtures.rake
@@ -76,6 +76,15 @@ namespace :fixtures do
       user3.reload
       user4.receive(remote_photo.to_diaspora_xml, remote_person)
       user3.reload
+
+
+      facebook = Services::Facebook.new(:access_token => "yeah")
+      user3.services << facebook
+      facebook.save!
+
+      twitter = Services::Twitter.new(:access_token => "yeah", :access_secret => "foobar")
+      user2.services << twitter
+      twitter.save!
     end
     puts "Done generating fixtures, you can now export"
 
diff --git a/spec/helper_methods.rb b/spec/helper_methods.rb
index d97a84d59..d8b5991bd 100644
--- a/spec/helper_methods.rb
+++ b/spec/helper_methods.rb
@@ -8,14 +8,6 @@ module HelperMethods
     Mocha::Mockery.instance.stubba.unstub_all
   end
 
-  def fantasy_resque
-    former_value = $process_queue
-    $process_queue = true
-    result = yield
-    $process_queue = former_value
-    result
-  end
-
   def connect_users(user1, aspect1, user2, aspect2)
     Contact.create!(:user => user1,
                     :person => user2.person,
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index cf8572166..7c8672584 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -14,11 +14,11 @@ require 'webmock/rspec'
 
 include Devise::TestHelpers
 include WebMock::API
-include HelperMethods
 #
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
+include HelperMethods
 
 RSpec.configure do |config|
   config.mock_with :mocha
diff --git a/spec/support/fake_resque.rb b/spec/support/fake_resque.rb
index 165d9ea10..e08eb0a03 100644
--- a/spec/support/fake_resque.rb
+++ b/spec/support/fake_resque.rb
@@ -7,3 +7,13 @@ module Resque
     end
   end
 end
+
+module HelperMethods
+  def fantasy_resque
+    former_value = $process_queue
+    $process_queue = true
+    result = yield
+    $process_queue = former_value
+    result
+  end
+end