From 9afd9d232c6b533578c7b86df245aa75939091e5 Mon Sep 17 00:00:00 2001 From: Arthur Neves Date: Thu, 5 Mar 2015 09:58:17 -0500 Subject: method_source needs to be a hard dependency on railties --- railties/lib/rails/generators/rails/app/templates/Gemfile | 4 ---- 1 file changed, 4 deletions(-) (limited to 'railties/lib/rails') diff --git a/railties/lib/rails/generators/rails/app/templates/Gemfile b/railties/lib/rails/generators/rails/app/templates/Gemfile index 82a0315379..c11bb58bfa 100644 --- a/railties/lib/rails/generators/rails/app/templates/Gemfile +++ b/railties/lib/rails/generators/rails/app/templates/Gemfile @@ -36,10 +36,6 @@ group :development, :test do # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring gem 'spring' <% end -%> - - # Adds `Method#source` and `Method#comment` to get the source code of a - # method from the console - gem 'method_source' <% end -%> end <% if RUBY_PLATFORM.match(/bccwin|cygwin|emx|mingw|mswin|wince|java/) -%> -- cgit v1.2.3 From 4bb92684743e56217bf2b465aed6e82797d05b5f Mon Sep 17 00:00:00 2001 From: Arthur Neves Date: Thu, 5 Mar 2015 11:31:03 -0500 Subject: Fix test rake when passing multiple arguments bundle exec db:migrate rake was not working, with the new runner, before this commit --- railties/lib/rails/test_unit/testing.rake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'railties/lib/rails') diff --git a/railties/lib/rails/test_unit/testing.rake b/railties/lib/rails/test_unit/testing.rake index f3a43a12db..0f26621b59 100644 --- a/railties/lib/rails/test_unit/testing.rake +++ b/railties/lib/rails/test_unit/testing.rake @@ -5,8 +5,8 @@ task default: :test desc "Runs all tests in test folder" task :test do $: << "test" - ARGV.shift if ARGV[0] == "test" - Rails::TestRunner.run(ARGV) + args = ARGV[0] == "test" ? ARGV[1..-1] : [] + Rails::TestRunner.run(args) end namespace :test do -- cgit v1.2.3 From a9eb12393fa1245620533a58ed36f651558ecae8 Mon Sep 17 00:00:00 2001 From: Arthur Neves Date: Thu, 5 Mar 2015 14:20:20 -0500 Subject: Use absolute path on find_method location for the runner --- railties/lib/rails/test_unit/runner.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'railties/lib/rails') diff --git a/railties/lib/rails/test_unit/runner.rb b/railties/lib/rails/test_unit/runner.rb index aec4707947..6700d90a33 100644 --- a/railties/lib/rails/test_unit/runner.rb +++ b/railties/lib/rails/test_unit/runner.rb @@ -129,7 +129,7 @@ module Rails location = method.source_location start_line = location.last end_line = method.source.split("\n").size + start_line - 1 - methods_map << [location.first, test_method, start_line, end_line] + methods_map << [File.expand_path(location.first), test_method, start_line, end_line] end end methods_map -- cgit v1.2.3