From ea491653cc27faec6e945de4a95bcfc940b1fc75 Mon Sep 17 00:00:00 2001 From: Prathamesh Sonpatki Date: Wed, 2 Mar 2016 10:19:08 +0530 Subject: [PATCH] Remove requiring load_paths from tools/test.rb - Instead require and setup Bundler - `tools/test.rb` is used internally from all `bin/test` scripts inside component gems. - Followup of https://github.com/rails/rails/commit/2abcdfd978fdcd491576a237e8c6be04ddaf884d. --- tools/test.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/test.rb b/tools/test.rb index 70f295b554..62e0faa3db 100644 --- a/tools/test.rb +++ b/tools/test.rb @@ -1,5 +1,8 @@ $: << File.expand_path("test", COMPONENT_ROOT) -require File.expand_path("../../load_paths", __FILE__) + +require 'bundler' +Bundler.setup + require "rails/test_unit/minitest_plugin" module Rails