Skip to content
Browse files

Refactor File.expand_path usage to remove additional File.join

  • Loading branch information...
1 parent 84eac5d commit 01ef2c1943cd813f3fd262602f518640f66db834 @notalex notalex committed
View
2 actionview/test/actionpack/abstract/helper_test.rb
@@ -52,7 +52,7 @@ class AbstractHelpersBlock < ControllerWithHelpers
class AbstractInvalidHelpers < AbstractHelpers
include ActionController::Helpers
- path = File.join(File.expand_path('../../../fixtures', __FILE__), "helpers_missing")
+ path = File.expand_path('../../../fixtures/helpers_missing', __FILE__)
$:.unshift(path)
self.helpers_path = path
end
View
2 railties/bin/rails
@@ -1,6 +1,6 @@
#!/usr/bin/env ruby
-git_path = File.join(File.expand_path('../../..', __FILE__), '.git')
+git_path = File.expand_path('../../../.git', __FILE__)
if File.exist?(git_path)
railties_path = File.expand_path('../../lib', __FILE__)
View
2 railties/lib/rails/generators/rails/app/app_generator.rb
@@ -324,7 +324,7 @@ def prepare!
end
def self.default_rc_file
- File.join(File.expand_path('~'), '.railsrc')
+ File.expand_path('~/.railsrc')
end
private

0 comments on commit 01ef2c1

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