Skip to content

Commit

Permalink
Use mysql to run specs
Browse files Browse the repository at this point in the history
  • Loading branch information
bkeepers committed Sep 26, 2010
1 parent 234fcf8 commit dca7dd7
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 1 deletion.
2 changes: 2 additions & 0 deletions Gemfile.lock
Expand Up @@ -49,6 +49,7 @@ GEM
mime-types
treetop (>= 1.4.5)
mime-types (1.16)
mysql (2.8.1)
polyglot (0.3.1)
rack (1.2.1)
rack-mount (0.6.13)
Expand Down Expand Up @@ -88,6 +89,7 @@ DEPENDENCIES
activesupport (~> 3.0)
daemons
delayed_job!
mysql
rails (~> 3.0)
rake
rspec
Expand Down
1 change: 1 addition & 0 deletions delayed_job.gemspec
Expand Up @@ -24,5 +24,6 @@ This gem is collectiveidea's fork (http://github.com/collectiveidea/delayed_job)
s.add_development_dependency 'rails', '~>3.0'
s.add_development_dependency 'sqlite3-ruby'
s.add_development_dependency 'ruby-debug'
s.add_development_dependency 'mysql'
end

4 changes: 4 additions & 0 deletions lib/delayed/backend/active_record.rb
Expand Up @@ -30,6 +30,10 @@ class Job < ::ActiveRecord::Base
}
scope :by_priority, order('priority ASC, run_at ASC')

def self.before_fork
::ActiveRecord::Base.clear_all_connections!
end

def self.after_fork
::ActiveRecord::Base.establish_connection
end
Expand Down
4 changes: 4 additions & 0 deletions spec/database.yml
@@ -0,0 +1,4 @@
mysql:
adapter: mysql
database: delayed_job
username: root
5 changes: 4 additions & 1 deletion spec/spec_helper.rb
Expand Up @@ -13,8 +13,11 @@

Delayed::Worker.logger = Logger.new('/tmp/dj.log')
ENV['RAILS_ENV'] = 'test'
require 'rails'

ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ':memory:')
config = YAML.load(File.read('spec/database.yml'))
ActiveRecord::Base.configurations = {'test' => config['mysql']}
ActiveRecord::Base.establish_connection
ActiveRecord::Base.logger = Delayed::Worker.logger
ActiveRecord::Migration.verbose = false

Expand Down

0 comments on commit dca7dd7

Please sign in to comment.