Remove useless load path modifications
This commit is contained in:
parent
a00228c1a3
commit
36dd1857dc
|
@ -21,9 +21,6 @@
|
|||
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
#++
|
||||
|
||||
actionpack_path = File.expand_path('../../../actionpack/lib', __FILE__)
|
||||
$:.unshift(actionpack_path) if File.directory?(actionpack_path) && !$:.include?(actionpack_path)
|
||||
|
||||
require 'abstract_controller'
|
||||
require 'action_view'
|
||||
require 'action_mailer/version'
|
||||
|
|
|
@ -8,9 +8,6 @@ silence_warnings do
|
|||
Encoding.default_external = "UTF-8"
|
||||
end
|
||||
|
||||
lib = File.expand_path("#{File.dirname(__FILE__)}/../lib")
|
||||
$:.unshift(lib) unless $:.include?('lib') || $:.include?(lib)
|
||||
|
||||
require 'minitest/autorun'
|
||||
require 'action_mailer'
|
||||
require 'action_mailer/test_case'
|
||||
|
|
|
@ -1,6 +1,3 @@
|
|||
activesupport_path = File.expand_path('../../../activesupport/lib', __FILE__)
|
||||
$:.unshift(activesupport_path) if File.directory?(activesupport_path) && !$:.include?(activesupport_path)
|
||||
|
||||
require 'action_pack'
|
||||
require 'active_support/concern'
|
||||
require 'active_support/dependencies/autoload'
|
||||
|
|
|
@ -21,12 +21,6 @@
|
|||
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
#++
|
||||
|
||||
activesupport_path = File.expand_path('../../../activesupport/lib', __FILE__)
|
||||
$:.unshift(activesupport_path) if File.directory?(activesupport_path) && !$:.include?(activesupport_path)
|
||||
|
||||
activemodel_path = File.expand_path('../../../activemodel/lib', __FILE__)
|
||||
$:.unshift(activemodel_path) if File.directory?(activemodel_path) && !$:.include?(activemodel_path)
|
||||
|
||||
require 'active_support'
|
||||
require 'active_support/dependencies/autoload'
|
||||
require 'active_support/core_ext/module/attribute_accessors'
|
||||
|
|
|
@ -1,11 +1,5 @@
|
|||
require File.expand_path('../../../load_paths', __FILE__)
|
||||
|
||||
lib = File.expand_path("#{File.dirname(__FILE__)}/../lib")
|
||||
$:.unshift(lib) unless $:.include?('lib') || $:.include?(lib)
|
||||
|
||||
activemodel_path = File.expand_path('../../../activemodel/lib', __FILE__)
|
||||
$:.unshift(activemodel_path) if File.directory?(activemodel_path) && !$:.include?(activemodel_path)
|
||||
|
||||
$:.unshift(File.dirname(__FILE__) + '/lib')
|
||||
$:.unshift(File.dirname(__FILE__) + '/fixtures/helpers')
|
||||
$:.unshift(File.dirname(__FILE__) + '/fixtures/alternate_helpers')
|
||||
|
|
|
@ -1,6 +1,3 @@
|
|||
$:.unshift(File.dirname(__FILE__))
|
||||
$:.unshift(File.dirname(__FILE__) + '/../../activesupport/lib')
|
||||
|
||||
require 'minitest/autorun'
|
||||
require 'rbconfig'
|
||||
require 'abstract_unit'
|
||||
|
|
|
@ -21,8 +21,6 @@
|
|||
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
#++
|
||||
|
||||
activesupport_path = File.expand_path('../../../activesupport/lib', __FILE__)
|
||||
$:.unshift(activesupport_path) if File.directory?(activesupport_path) && !$:.include?(activesupport_path)
|
||||
require 'active_support'
|
||||
require 'active_model/version'
|
||||
|
||||
|
|
|
@ -1,8 +1,5 @@
|
|||
require File.expand_path('../../../../load_paths', __FILE__)
|
||||
|
||||
lib = File.expand_path("#{File.dirname(__FILE__)}/../../lib")
|
||||
$:.unshift(lib) unless $:.include?('lib') || $:.include?(lib)
|
||||
|
||||
require 'config'
|
||||
require 'active_model'
|
||||
require 'active_support/core_ext/string/access'
|
||||
|
|
|
@ -7,9 +7,6 @@ ensure
|
|||
$VERBOSE = old
|
||||
end
|
||||
|
||||
lib = File.expand_path("#{File.dirname(__FILE__)}/../lib")
|
||||
$:.unshift(lib) unless $:.include?('lib') || $:.include?(lib)
|
||||
|
||||
require 'active_support/core_ext/kernel/reporting'
|
||||
require 'active_support/core_ext/string/encoding'
|
||||
|
||||
|
|
|
@ -1,5 +1,3 @@
|
|||
$:.unshift(File.dirname(__FILE__) + '/../../activesupport/lib')
|
||||
|
||||
require 'minitest/autorun'
|
||||
require 'active_support/test_case'
|
||||
require 'rbconfig'
|
||||
|
|
|
@ -20,7 +20,8 @@ namespace :test do
|
|||
'test',
|
||||
'lib',
|
||||
"#{File.dirname(__FILE__)}/../activesupport/lib",
|
||||
"#{File.dirname(__FILE__)}/../actionpack/lib"
|
||||
"#{File.dirname(__FILE__)}/../actionpack/lib",
|
||||
"#{File.dirname(__FILE__)}/../activemodel/lib"
|
||||
]
|
||||
ruby "-I#{dash_i.join ':'}", file
|
||||
end
|
||||
|
|
|
@ -17,8 +17,8 @@ RAILS_FRAMEWORK_ROOT = File.expand_path("#{File.dirname(__FILE__)}/../../..")
|
|||
|
||||
# These files do not require any others and are needed
|
||||
# to run the tests
|
||||
require "#{RAILS_FRAMEWORK_ROOT}/activesupport/lib/active_support/testing/isolation"
|
||||
require "#{RAILS_FRAMEWORK_ROOT}/activesupport/lib/active_support/core_ext/kernel/reporting"
|
||||
require "active_support/testing/isolation"
|
||||
require "active_support/core_ext/kernel/reporting"
|
||||
|
||||
module TestHelpers
|
||||
module Paths
|
||||
|
@ -248,7 +248,6 @@ module TestHelpers
|
|||
|
||||
def use_frameworks(arr)
|
||||
to_remove = [:actionmailer,
|
||||
:activemodel,
|
||||
:activerecord] - arr
|
||||
if to_remove.include? :activerecord
|
||||
remove_from_config "config.active_record.whitelist_attributes = true"
|
||||
|
|
Loading…
Reference in New Issue