aboutsummaryrefslogtreecommitdiffstats
path: root/test/helper.rb
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2014-05-19 10:56:08 +0200
committerDavid Heinemeier Hansson <david@loudthinking.com>2014-05-19 10:56:08 +0200
commitdc20f7d4d40648e9a5af999a6436a5130ddad607 (patch)
tree1adac42a96f52fd3e4d67edffd1412e5515b0fb7 /test/helper.rb
parentc334bea36228319b3f624443f303447e48e29f3d (diff)
parente06e64efd3ebf6e3351cd490f55273bd2e756b0b (diff)
downloadrails-dc20f7d4d40648e9a5af999a6436a5130ddad607.tar.gz
rails-dc20f7d4d40648e9a5af999a6436a5130ddad607.tar.bz2
rails-dc20f7d4d40648e9a5af999a6436a5130ddad607.zip
Merge branch 'master' of github.com:rails/activejob
Diffstat (limited to 'test/helper.rb')
-rw-r--r--test/helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/helper.rb b/test/helper.rb
index df0a2a53f8..fc3e2642df 100644
--- a/test/helper.rb
+++ b/test/helper.rb
@@ -1,7 +1,7 @@
require 'bundler'
Bundler.setup
-$LOAD_PATH << File.dirname(__FILE__ + "/../lib")
+$LOAD_PATH << File.dirname(__FILE__) + "/../lib"
require 'active_job'
require "adapters/#{ENV['AJADAPTER'] || 'inline'}"