Skip to content

Commit

Permalink
Require all backends for running the tests (sorry, if you're gonna co…
Browse files Browse the repository at this point in the history
…ntribute, then you gotta make sure all the tests pass)
  • Loading branch information
bkeepers committed Mar 26, 2010
1 parent b5cabbd commit 3a7c29e
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 27 deletions.
3 changes: 2 additions & 1 deletion Rakefile
Expand Up @@ -23,6 +23,7 @@ Jeweler::Tasks.new do |s|
s.add_dependency "daemons"
s.add_development_dependency "rspec"
s.add_development_dependency "sqlite3-ruby"
s.add_development_dependency "mongo_mapper"
end

require 'spec/rake/spectask'
Expand All @@ -32,7 +33,7 @@ task :default => :spec
desc 'Run the specs'
Spec::Rake::SpecTask.new(:spec) do |t|
t.libs << 'lib'
t.pattern = 'spec/*_spec.rb'
t.pattern = 'spec/**/*_spec.rb'
t.verbose = true
end
task :spec => :check_dependencies
Expand Down
1 change: 1 addition & 0 deletions spec/backend/active_record_job_spec.rb
@@ -1,4 +1,5 @@
require 'spec_helper'
require 'backend/shared_backend_spec'
require 'delayed/backend/active_record'

describe Delayed::Job do
Expand Down
2 changes: 1 addition & 1 deletion spec/backend/mongo_mapper_job_spec.rb
@@ -1,5 +1,5 @@
require 'spec_helper'

require 'backend/shared_backend_spec'
require 'delayed/backend/mongo_mapper'

describe Delayed::Backend::MongoMapper::Job do
Expand Down
2 changes: 1 addition & 1 deletion spec/setup/active_record.rb
@@ -1,7 +1,7 @@
require 'active_record'

ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ':memory:')
ActiveRecord::Base.logger = DELAYED_JOB_LOGGER
ActiveRecord::Base.logger = Delayed::Worker.logger
ActiveRecord::Migration.verbose = false

ActiveRecord::Schema.define do
Expand Down
4 changes: 3 additions & 1 deletion spec/setup/mongo_mapper.rb
@@ -1,4 +1,6 @@
MongoMapper.connection = Mongo::Connection.new nil, nil, :logger => DELAYED_JOB_LOGGER
require 'mongo_mapper'

MongoMapper.connection = Mongo::Connection.new nil, nil, :logger => Delayed::Worker.logger
MongoMapper.database = 'delayed_job'

unless defined?(Story)
Expand Down
27 changes: 5 additions & 22 deletions spec/spec_helper.rb
Expand Up @@ -4,32 +4,15 @@
require 'spec'
require 'logger'

backends_available = []
%w(active_record mongo_mapper).each do |backend|
begin
require backend
backends_available << backend
rescue LoadError => e
$stderr.puts "The backend '#{backend}' is not available. Skipping tests"
end
end

if backends_available.empty?
raise LoadError, "Cannot run delayed_job specs. No backends available"
end

require 'delayed_job'
require 'sample_jobs'
require 'backend/shared_backend_spec'

DELAYED_JOB_LOGGER = Logger.new('/tmp/dj.log')
Delayed::Worker.logger = DELAYED_JOB_LOGGER

DEFAULT_BACKEND = backends_available.first.to_sym
Delayed::Worker.logger = Logger.new('/tmp/dj.log')

Delayed::Worker.backend = DEFAULT_BACKEND
BACKENDS = [:active_record, :mongo_mapper]

backends_available.each do |backend|
BACKENDS.each do |backend|
require "setup/#{backend}"
require "backend/#{backend}_job_spec"
end

Delayed::Worker.backend = BACKENDS.first
2 changes: 1 addition & 1 deletion spec/worker_spec.rb
Expand Up @@ -19,7 +19,7 @@ def job_create(opts = {})
end
end

[:active_record, :mongo_mapper].each do |backend|
BACKENDS.each do |backend|
describe "with the #{backend} backend" do
before do
Delayed::Worker.backend = backend
Expand Down

0 comments on commit 3a7c29e

Please sign in to comment.