From fd110b7a4178742363e79ed178cdc1bc1fde843d Mon Sep 17 00:00:00 2001 From: Travis Reeder Date: Sat, 25 Feb 2012 18:01:36 -0800 Subject: [PATCH] Moved test workers into their own directory. --- test/{ => models}/cool_model.rb | 0 test/{ => models}/db_model.rb | 0 test/quick_run.rb | 7 +++---- test/test_base.rb | 6 +++--- test/test_iron_worker.rb | 12 ++++++------ test/{ => workers}/awesome_job.rb | 0 test/{ => workers}/cool_worker.rb | 0 test/{ => workers}/db_worker.rb | 0 test/{ => workers}/fail_worker.rb | 2 ++ test/{ => workers}/gem_dependency_worker.rb | 0 test/{ => workers}/iw_test_worker.rb | 0 test/{ => workers}/iw_test_worker_2.rb | 4 ++-- test/{ => workers}/iw_test_worker_3.rb | 0 test/{ => workers}/merging_worker.rb | 0 test/{ => workers}/one_line_worker.rb | 0 test/{ => workers}/prawn_worker.rb | 0 test/{ => workers}/progress_worker.rb | 0 test/{ => workers}/rails_worker.rb | 0 test/{ => workers}/rails_worker2.rb | 0 test/{ => workers}/requiring_worker.rb | 0 test/{ => workers}/scheduled_worker.rb | 0 test/{ => workers}/second_worker.rb | 0 test/{ => workers}/third_worker.rb | 0 23 files changed, 16 insertions(+), 15 deletions(-) rename test/{ => models}/cool_model.rb (100%) rename test/{ => models}/db_model.rb (100%) rename test/{ => workers}/awesome_job.rb (100%) rename test/{ => workers}/cool_worker.rb (100%) rename test/{ => workers}/db_worker.rb (100%) rename test/{ => workers}/fail_worker.rb (87%) rename test/{ => workers}/gem_dependency_worker.rb (100%) rename test/{ => workers}/iw_test_worker.rb (100%) rename test/{ => workers}/iw_test_worker_2.rb (92%) rename test/{ => workers}/iw_test_worker_3.rb (100%) rename test/{ => workers}/merging_worker.rb (100%) rename test/{ => workers}/one_line_worker.rb (100%) rename test/{ => workers}/prawn_worker.rb (100%) rename test/{ => workers}/progress_worker.rb (100%) rename test/{ => workers}/rails_worker.rb (100%) rename test/{ => workers}/rails_worker2.rb (100%) rename test/{ => workers}/requiring_worker.rb (100%) rename test/{ => workers}/scheduled_worker.rb (100%) rename test/{ => workers}/second_worker.rb (100%) rename test/{ => workers}/third_worker.rb (100%) diff --git a/test/cool_model.rb b/test/models/cool_model.rb similarity index 100% rename from test/cool_model.rb rename to test/models/cool_model.rb diff --git a/test/db_model.rb b/test/models/db_model.rb similarity index 100% rename from test/db_model.rb rename to test/models/db_model.rb diff --git a/test/quick_run.rb b/test/quick_run.rb index 56e4d80..956901f 100644 --- a/test/quick_run.rb +++ b/test/quick_run.rb @@ -1,8 +1,7 @@ require_relative 'test_base' -require_relative 'one_line_worker' -require_relative 'progress_worker' -require_relative 'workers/qb_worker' -require_relative 'workers/big_gems_worker' +require_relative 'workers/one_line_worker' +require_relative 'workers/progress_worker' +require_relative 'workers/fail_worker' class QuickRun < TestBase diff --git a/test/test_base.rb b/test/test_base.rb index 0cba04e..1f8031c 100644 --- a/test/test_base.rb +++ b/test/test_base.rb @@ -16,9 +16,9 @@ IronWorker.config.merged_gems={} -require_relative "iw_test_worker" -require_relative "iw_test_worker_2" -require_relative "iw_test_worker_3" +require_relative "workers/iw_test_worker" +require_relative "workers/iw_test_worker_2" +require_relative "workers/iw_test_worker_3" class TestBase < Test::Unit::TestCase diff --git a/test/test_iron_worker.rb b/test/test_iron_worker.rb index 7e59662..bcf9e70 100644 --- a/test/test_iron_worker.rb +++ b/test/test_iron_worker.rb @@ -1,10 +1,10 @@ require_relative 'test_base' -require_relative 'cool_worker' -require_relative 'cool_model' -require_relative 'gem_dependency_worker' -require_relative 'fail_worker' -require_relative 'progress_worker' -require_relative 'one_line_worker' +require_relative 'workers/cool_worker' +require_relative 'models/cool_model' +require_relative 'workers/gem_dependency_worker' +require_relative 'workers/fail_worker' +require_relative 'workers/progress_worker' +require_relative 'workers/one_line_worker' require_relative 'workers/big_gems_worker' require_relative 'workers/tmp_dir_worker' require_relative 'workers/webhook_worker' diff --git a/test/awesome_job.rb b/test/workers/awesome_job.rb similarity index 100% rename from test/awesome_job.rb rename to test/workers/awesome_job.rb diff --git a/test/cool_worker.rb b/test/workers/cool_worker.rb similarity index 100% rename from test/cool_worker.rb rename to test/workers/cool_worker.rb diff --git a/test/db_worker.rb b/test/workers/db_worker.rb similarity index 100% rename from test/db_worker.rb rename to test/workers/db_worker.rb diff --git a/test/fail_worker.rb b/test/workers/fail_worker.rb similarity index 87% rename from test/fail_worker.rb rename to test/workers/fail_worker.rb index 1125c31..024de50 100644 --- a/test/fail_worker.rb +++ b/test/workers/fail_worker.rb @@ -1,6 +1,8 @@ # bump...... class FailWorker < IronWorker::Base + attr_accessor :x + def run puts "I am about to fail..." raise "Dang, I failed. Fail whale." diff --git a/test/gem_dependency_worker.rb b/test/workers/gem_dependency_worker.rb similarity index 100% rename from test/gem_dependency_worker.rb rename to test/workers/gem_dependency_worker.rb diff --git a/test/iw_test_worker.rb b/test/workers/iw_test_worker.rb similarity index 100% rename from test/iw_test_worker.rb rename to test/workers/iw_test_worker.rb diff --git a/test/iw_test_worker_2.rb b/test/workers/iw_test_worker_2.rb similarity index 92% rename from test/iw_test_worker_2.rb rename to test/workers/iw_test_worker_2.rb index 79e248f..7bf174f 100644 --- a/test/iw_test_worker_2.rb +++ b/test/workers/iw_test_worker_2.rb @@ -2,8 +2,8 @@ require_relative "one_line_worker" class TestWorker2 < IronWorker::Base - merge File.join(File.dirname(__FILE__), 'models', 'model_1.rb') - unmerge 'models/model_2.rb' + merge File.join(File.dirname(__FILE__), '../' 'models', 'model_1.rb') + unmerge '../models/model_2.rb' merge_worker File.join(File.dirname(__FILE__), 'second_worker.rb'), ' SecondWorker' merge_worker File.join(File.dirname(__FILE__), 'one_line_worker.rb'), OneLineWorker #merge_worker 'second_worker.rb', 'SecondWorker' diff --git a/test/iw_test_worker_3.rb b/test/workers/iw_test_worker_3.rb similarity index 100% rename from test/iw_test_worker_3.rb rename to test/workers/iw_test_worker_3.rb diff --git a/test/merging_worker.rb b/test/workers/merging_worker.rb similarity index 100% rename from test/merging_worker.rb rename to test/workers/merging_worker.rb diff --git a/test/one_line_worker.rb b/test/workers/one_line_worker.rb similarity index 100% rename from test/one_line_worker.rb rename to test/workers/one_line_worker.rb diff --git a/test/prawn_worker.rb b/test/workers/prawn_worker.rb similarity index 100% rename from test/prawn_worker.rb rename to test/workers/prawn_worker.rb diff --git a/test/progress_worker.rb b/test/workers/progress_worker.rb similarity index 100% rename from test/progress_worker.rb rename to test/workers/progress_worker.rb diff --git a/test/rails_worker.rb b/test/workers/rails_worker.rb similarity index 100% rename from test/rails_worker.rb rename to test/workers/rails_worker.rb diff --git a/test/rails_worker2.rb b/test/workers/rails_worker2.rb similarity index 100% rename from test/rails_worker2.rb rename to test/workers/rails_worker2.rb diff --git a/test/requiring_worker.rb b/test/workers/requiring_worker.rb similarity index 100% rename from test/requiring_worker.rb rename to test/workers/requiring_worker.rb diff --git a/test/scheduled_worker.rb b/test/workers/scheduled_worker.rb similarity index 100% rename from test/scheduled_worker.rb rename to test/workers/scheduled_worker.rb diff --git a/test/second_worker.rb b/test/workers/second_worker.rb similarity index 100% rename from test/second_worker.rb rename to test/workers/second_worker.rb diff --git a/test/third_worker.rb b/test/workers/third_worker.rb similarity index 100% rename from test/third_worker.rb rename to test/workers/third_worker.rb