aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2009-09-14 12:56:53 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2009-09-14 13:04:43 -0700
commit4b8576a0c69f9d8497bfb47afcfca9f1832ea6a3 (patch)
tree2366261da3b3a9d238188f77d91797d6417a2a98 /railties
parent697dda5f29acc1d9144770022b74aabb06f4cee0 (diff)
downloadrails-4b8576a0c69f9d8497bfb47afcfca9f1832ea6a3.tar.gz
rails-4b8576a0c69f9d8497bfb47afcfca9f1832ea6a3.tar.bz2
rails-4b8576a0c69f9d8497bfb47afcfca9f1832ea6a3.zip
Style bikeshed: prefer obvious string paths with / separator to args lists with ', ' separator
Diffstat (limited to 'railties')
-rw-r--r--railties/test/initializer/test_helper.rb12
1 files changed, 6 insertions, 6 deletions
diff --git a/railties/test/initializer/test_helper.rb b/railties/test/initializer/test_helper.rb
index 4cb9c1b814..f6a2547efc 100644
--- a/railties/test/initializer/test_helper.rb
+++ b/railties/test/initializer/test_helper.rb
@@ -2,16 +2,16 @@
# boot from scratch in vendored mode. This file should really only be
# required in test cases that use the isolation helper so that requires
# can be reset correctly.
-RAILS_ROOT = File.join(File.dirname(__FILE__), "root")
-RAILS_FRAMEWORK_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..'))
+RAILS_ROOT = "#{File.dirname(__FILE__)}/root"
+RAILS_FRAMEWORK_ROOT = File.expand_path("#{File.dirname(__FILE__)}/../../..")
require 'rubygems'
gem 'rack', '~> 1.0.0'
require "test/unit"
# We are purposely avoiding adding things to the load path to catch bugs that only happen in the genuine article
-require File.join(RAILS_FRAMEWORK_ROOT, 'activesupport', 'lib', 'active_support', 'testing', 'isolation')
-require File.join(RAILS_FRAMEWORK_ROOT, 'activesupport', 'lib', 'active_support', 'testing', 'declarative')
+require "#{RAILS_FRAMEWORK_ROOT}/activesupport/lib/active_support/testing/isolation"
+require "#{RAILS_FRAMEWORK_ROOT}/activesupport/lib/active_support/testing/declarative"
class Test::Unit::TestCase
extend ActiveSupport::Testing::Declarative
@@ -38,7 +38,7 @@ module Rails
def boot!
# Require the initializer
- require File.join(RAILS_FRAMEWORK_ROOT, 'railties', 'lib', 'initializer')
+ require "#{RAILS_FRAMEWORK_ROOT}/railties/lib/initializer"
# Run the initializer the same way boot.rb does it
Rails::Initializer.run(:install_gem_spec_stubs)
Rails::GemDependency.add_frozen_gem_path
@@ -48,4 +48,4 @@ module Rails
end
# All that for this:
-Rails.boot! \ No newline at end of file
+Rails.boot!