Move fantasy_resque to the fake_resque file, add services to the mysql export fixture
This commit is contained in:
parent
cff387d651
commit
7c3c17a418
4 changed files with 20 additions and 9 deletions
|
|
@ -76,6 +76,15 @@ namespace :fixtures do
|
||||||
user3.reload
|
user3.reload
|
||||||
user4.receive(remote_photo.to_diaspora_xml, remote_person)
|
user4.receive(remote_photo.to_diaspora_xml, remote_person)
|
||||||
user3.reload
|
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
|
end
|
||||||
puts "Done generating fixtures, you can now export"
|
puts "Done generating fixtures, you can now export"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -8,14 +8,6 @@ module HelperMethods
|
||||||
Mocha::Mockery.instance.stubba.unstub_all
|
Mocha::Mockery.instance.stubba.unstub_all
|
||||||
end
|
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)
|
def connect_users(user1, aspect1, user2, aspect2)
|
||||||
Contact.create!(:user => user1,
|
Contact.create!(:user => user1,
|
||||||
:person => user2.person,
|
:person => user2.person,
|
||||||
|
|
|
||||||
|
|
@ -14,11 +14,11 @@ require 'webmock/rspec'
|
||||||
|
|
||||||
include Devise::TestHelpers
|
include Devise::TestHelpers
|
||||||
include WebMock::API
|
include WebMock::API
|
||||||
include HelperMethods
|
|
||||||
#
|
#
|
||||||
# Requires supporting files with custom matchers and macros, etc,
|
# Requires supporting files with custom matchers and macros, etc,
|
||||||
# in ./support/ and its subdirectories.
|
# in ./support/ and its subdirectories.
|
||||||
Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
|
Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
|
||||||
|
include HelperMethods
|
||||||
|
|
||||||
RSpec.configure do |config|
|
RSpec.configure do |config|
|
||||||
config.mock_with :mocha
|
config.mock_with :mocha
|
||||||
|
|
|
||||||
|
|
@ -7,3 +7,13 @@ module Resque
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
module HelperMethods
|
||||||
|
def fantasy_resque
|
||||||
|
former_value = $process_queue
|
||||||
|
$process_queue = true
|
||||||
|
result = yield
|
||||||
|
$process_queue = former_value
|
||||||
|
result
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue