Fix active_record specs

jamesrose · Sep 5, 2010 · df9cf7e · df9cf7e
1 parent 1815f28
commit df9cf7e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/spec/backend/active_record_job_spec.rb b/spec/backend/active_record_job_spec.rb
@@ -1,5 +1,5 @@
 require 'spec_helper'
-require 'backend/shared_backend_spec'
+require 'delayed/backend/shared_spec'
 require 'delayed/backend/active_record'
 
 describe Delayed::Backend::ActiveRecord::Job do
@@ -16,7 +16,7 @@
     Time.zone = nil
   end
 
-  it_should_behave_like 'a backend'
+  it_should_behave_like 'a delayed_job backend'
 
   context "db_time_now" do
     it "should return time in current time zone if set" do

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -7,7 +7,6 @@
 gem 'activerecord', ENV['RAILS_VERSION'] if ENV['RAILS_VERSION']
 
 require 'delayed_job'
-require 'sample_jobs'
 
 Delayed::Worker.logger = Logger.new('/tmp/dj.log')
 RAILS_ENV = 'test'
@@ -28,4 +27,4 @@
 Delayed::Worker.backend = BACKENDS.first
 
 # Add this directory so the ActiveSupport autoloading works
-ActiveSupport::Dependencies.load_paths << File.dirname(__FILE__)
+ActiveSupport::Dependencies.autoload_paths << File.dirname(__FILE__)
diff --git a/spec/worker_spec.rb b/spec/worker_spec.rb
@@ -121,7 +121,7 @@ def job_create(opts = {})
           @worker.run(@job)
           @job.reload
           @job.last_error.should =~ /did not work/
-          @job.last_error.should =~ /sample_jobs.rb:8:in `perform'/
+          @job.last_error.should =~ /sample_jobs.rb:\d+:in `perform'/
           @job.attempts.should == 1
           @job.run_at.should > Delayed::Job.db_time_now - 10.minutes
           @job.run_at.should < Delayed::Job.db_time_now + 10.minutes