From 8b6146e075d006ecddb26a07fab9253653a5147d Mon Sep 17 00:00:00 2001 From: Brandon Keepers Date: Sat, 19 Dec 2009 10:34:03 -0500 Subject: [PATCH] declare development dependencies --- Rakefile | 4 ++++ spec/delayed_method_spec.rb | 2 +- spec/job_spec.rb | 3 +-- spec/{database.rb => spec_helper.rb} | 12 +++++------- spec/story_spec.rb | 2 +- spec/worker_spec.rb | 3 +-- 6 files changed, 13 insertions(+), 13 deletions(-) rename spec/{database.rb => spec_helper.rb} (85%) diff --git a/Rakefile b/Rakefile index a389a1e5a..f9257421f 100644 --- a/Rakefile +++ b/Rakefile @@ -19,6 +19,9 @@ Jeweler::Tasks.new do |s| s.extra_rdoc_files = ["README.textile"] s.test_files = Dir['spec/**/*'] + + s.add_development_dependency "rspec" + s.add_development_dependency "sqlite3-ruby" end require 'spec/rake/spectask' @@ -31,4 +34,5 @@ Spec::Rake::SpecTask.new(:spec) do |t| t.pattern = 'spec/**/*_spec.rb' t.verbose = true end +task :spec => :check_dependencies diff --git a/spec/delayed_method_spec.rb b/spec/delayed_method_spec.rb index 51c3c1c71..8513eaec3 100644 --- a/spec/delayed_method_spec.rb +++ b/spec/delayed_method_spec.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/database' +require 'spec_helper' class SimpleJob cattr_accessor :runs; self.runs = 0 diff --git a/spec/job_spec.rb b/spec/job_spec.rb index 5e4aefbf0..eb15c9290 100644 --- a/spec/job_spec.rb +++ b/spec/job_spec.rb @@ -1,5 +1,4 @@ -require File.dirname(__FILE__) + '/database' -require File.dirname(__FILE__) + '/sample_jobs' +require 'spec_helper' describe Delayed::Job do before do diff --git a/spec/database.rb b/spec/spec_helper.rb similarity index 85% rename from spec/database.rb rename to spec/spec_helper.rb index 505b06fa9..1af64929e 100644 --- a/spec/database.rb +++ b/spec/spec_helper.rb @@ -1,15 +1,12 @@ $:.unshift(File.dirname(__FILE__) + '/../lib') -$:.unshift(File.dirname(__FILE__) + '/../../rspec/lib') require 'rubygems' -require 'active_record' -gem 'sqlite3-ruby' - -require File.dirname(__FILE__) + '/../init' require 'spec' +require 'active_record' +require 'delayed_job' ActiveRecord::Base.logger = Logger.new('/tmp/dj.log') -ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => '/tmp/jobs.sqlite') +ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ':memory:') ActiveRecord::Migration.verbose = false ActiveRecord::Schema.define do @@ -32,7 +29,6 @@ end - # Purely useful for test cases... class Story < ActiveRecord::Base def tell; text; end @@ -40,3 +36,5 @@ def whatever(n, _); tell*n; end handle_asynchronously :whatever end + +require 'sample_jobs' diff --git a/spec/story_spec.rb b/spec/story_spec.rb index 0144b44d4..61d5f3a61 100644 --- a/spec/story_spec.rb +++ b/spec/story_spec.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/database' +require 'spec_helper' describe "A story" do diff --git a/spec/worker_spec.rb b/spec/worker_spec.rb index 928f43e86..430c49822 100644 --- a/spec/worker_spec.rb +++ b/spec/worker_spec.rb @@ -1,5 +1,4 @@ -require File.dirname(__FILE__) + '/database' -require File.dirname(__FILE__) + '/sample_jobs' +require 'spec_helper' describe Delayed::Worker do def job_create(opts = {})