fixed some dependency loading problems

ninjudd · Jun 3, 2010 · 0742bce · 0742bce
1 parent e680d0a
commit 0742bce
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/lib/sweatshop.rb b/lib/sweatshop.rb
@@ -189,5 +189,5 @@ def constantize(str)
 end
 
 if defined?(RAILS_ROOT)
-  Dir.glob(RAILS_ROOT + '/app/workers/*.rb').each{|worker| require worker }
+  Dir.glob(RAILS_ROOT + '/app/workers/*.rb').each{|worker| require_or_load worker }
 end
diff --git a/test/hello_worker.rb b/test/hello_worker.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../lib/sweatshop'
+require File.expand_path(File.dirname(__FILE__) + '/../lib/sweatshop')
 class HelloWorker < Sweatshop::Worker
   TEST_FILE = File.dirname(__FILE__) + '/test.txt' unless defined?(TEST_FILE)
 

diff --git a/test/test_functional_worker.rb b/test/test_functional_worker.rb
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../lib/sweatshop'
-require File.dirname(__FILE__) + '/test_helper'
-require File.dirname(__FILE__) + '/hello_worker'
+require File.expand_path(File.dirname(__FILE__) + '/../lib/sweatshop')
+require File.expand_path(File.dirname(__FILE__) + '/test_helper'     )
+require File.expand_path(File.dirname(__FILE__) + '/hello_worker'    )
 
 class WorkerTest < Test::Unit::TestCase
 

diff --git a/test/test_sweatshop.rb b/test/test_sweatshop.rb
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/test_helper'
-require File.dirname(__FILE__) + '/../lib/sweatshop'
+require File.expand_path(File.dirname(__FILE__) + '/test_helper'     )
+require File.expand_path(File.dirname(__FILE__) + '/../lib/sweatshop')
 
 class SweatshopTest < Test::Unit::TestCase
   Sweatshop.workers = []