Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Style bikeshed: prefer obvious string paths with / separator to args …

…lists with ', ' separator
  • Loading branch information...
commit 4b8576a0c69f9d8497bfb47afcfca9f1832ea6a3 1 parent 697dda5
@jeremy jeremy authored
Showing with 6 additions and 6 deletions.
  1. +6 −6 railties/test/initializer/test_helper.rb
View
12 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 @@ def vendor_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 @@ def boot!
end
# All that for this:
-Rails.boot!
+Rails.boot!

1 comment on commit 4b8576a

@ncr

Good change, here's some info if anyone asks an obvious question: http://blade.nagaokaut.ac.jp/cgi-bin/scat.rb/ruby/ruby-talk/58000

Please sign in to comment.
Something went wrong with that request. Please try again.