2 files changed, 5 insertions, 11 deletions
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index 4c5dd70a88..00a7932267 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -443,13 +443,6 @@ class AppGeneratorTest < Rails::Generators::TestCase
     end
   end
 
-  def test_inclusion_of_method_source
-    run_generator
-    assert_file "Gemfile" do |content|
-      assert_gem 'method_source'
-    end
-  end
-
   def test_template_from_dir_pwd
     FileUtils.cd(Rails.root)
     assert_match(/It works from file!/, run_generator([destination_root, "-m", "lib/template.rb"]))
diff --git a/railties/test/test_unit/runner_test.rb b/railties/test/test_unit/runner_test.rb
index c040c71635..9ea8b2c114 100644
--- a/railties/test/test_unit/runner_test.rb
+++ b/railties/test/test_unit/runner_test.rb
@@ -41,7 +41,7 @@ class TestUnitTestRunnerTest < ActiveSupport::TestCase
 
   test "parse the filename and line" do
     file = "test/test_unit/runner_test.rb"
-    absolute_file = __FILE__
+    absolute_file = File.expand_path __FILE__
     options = @options.parse(["#{file}:20"])
     assert_equal absolute_file, options[:filename]
     assert_equal 20, options[:line]
@@ -90,21 +90,22 @@ class TestUnitTestRunnerTest < ActiveSupport::TestCase
 
   test "run multiple files and run one file by line" do
     line = __LINE__
+    absolute_file = File.expand_path(__FILE__)
     options = @options.parse([__dir__, "#{__FILE__}:#{line}"])
 
     assert_equal ["#{__dir__}/**/*_test.rb"], options[:patterns]
-    assert_equal __FILE__, options[:filename]
+    assert_equal absolute_file, options[:filename]
     assert_equal line, options[:line]
 
     runner = Rails::TestRunner.new(options)
-    assert_equal [__FILE__], runner.test_files, 'Only returns the file that running by line'
+    assert_equal [absolute_file], runner.test_files, 'Only returns the file that running by line'
   end
 
   test "running multiple files passing line number" do
     line = __LINE__
     options = @options.parse(["foobar.rb:8", "#{__FILE__}:#{line}"])
 
-    assert_equal __FILE__, options[:filename], 'Returns the last file'
+    assert_equal File.expand_path(__FILE__), options[:filename], 'Returns the last file'
     assert_equal line, options[:line]
   end
 end