mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Fix test load paths for those not using bundler
This commit is contained in:
parent
7cff54f5d3
commit
eec2d301d4
22 changed files with 95 additions and 51 deletions
|
@ -1,4 +1,7 @@
|
||||||
require File.expand_path('../../../load_paths', __FILE__)
|
require File.expand_path('../../../bundler', __FILE__)
|
||||||
|
|
||||||
|
lib = File.expand_path("#{File.dirname(__FILE__)}/../lib")
|
||||||
|
$:.unshift(lib) unless $:.include?('lib') || $:.include?(lib)
|
||||||
|
|
||||||
require 'test/unit'
|
require 'test/unit'
|
||||||
require 'action_mailer'
|
require 'action_mailer'
|
||||||
|
@ -14,7 +17,7 @@ ActionView::Template.register_template_handler :bak, lambda { |template| "Lame b
|
||||||
FIXTURE_LOAD_PATH = File.expand_path('fixtures', File.dirname(__FILE__))
|
FIXTURE_LOAD_PATH = File.expand_path('fixtures', File.dirname(__FILE__))
|
||||||
ActionMailer::Base.view_paths = FIXTURE_LOAD_PATH
|
ActionMailer::Base.view_paths = FIXTURE_LOAD_PATH
|
||||||
|
|
||||||
class MockSMTP
|
class MockSMTP
|
||||||
def self.deliveries
|
def self.deliveries
|
||||||
@@deliveries
|
@@deliveries
|
||||||
end
|
end
|
||||||
|
|
|
@ -1,3 +1,6 @@
|
||||||
|
railties_path = File.expand_path('../../../railties/lib', __FILE__)
|
||||||
|
$:.unshift(railties_path) if File.directory?(railties_path) && !$:.include?(railties_path)
|
||||||
|
|
||||||
require "abstract_unit"
|
require "abstract_unit"
|
||||||
require "rails/subscriber/test_helper"
|
require "rails/subscriber/test_helper"
|
||||||
require "action_mailer/railties/subscriber"
|
require "action_mailer/railties/subscriber"
|
||||||
|
|
|
@ -1,4 +1,10 @@
|
||||||
require File.expand_path('../../../load_paths', __FILE__)
|
require File.expand_path('../../../bundler', __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__) + '/lib')
|
||||||
$:.unshift(File.dirname(__FILE__) + '/fixtures/helpers')
|
$:.unshift(File.dirname(__FILE__) + '/fixtures/helpers')
|
||||||
|
|
|
@ -1,3 +1,6 @@
|
||||||
|
railties_path = File.expand_path('../../../../railties/lib', __FILE__)
|
||||||
|
$:.unshift(railties_path) if File.directory?(railties_path) && !$:.include?(railties_path)
|
||||||
|
|
||||||
require 'active_record_unit'
|
require 'active_record_unit'
|
||||||
require 'active_record/railties/controller_runtime'
|
require 'active_record/railties/controller_runtime'
|
||||||
require 'fixtures/project'
|
require 'fixtures/project'
|
||||||
|
@ -12,7 +15,7 @@ class ControllerRuntimeSubscriberTest < ActionController::TestCase
|
||||||
render :inline => "<%= Project.all %>"
|
render :inline => "<%= Project.all %>"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
include Rails::Subscriber::TestHelper
|
include Rails::Subscriber::TestHelper
|
||||||
tests SubscriberController
|
tests SubscriberController
|
||||||
|
|
||||||
|
@ -31,7 +34,7 @@ class ControllerRuntimeSubscriberTest < ActionController::TestCase
|
||||||
def set_logger(logger)
|
def set_logger(logger)
|
||||||
ActionController::Base.logger = logger
|
ActionController::Base.logger = logger
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_log_with_active_record
|
def test_log_with_active_record
|
||||||
get :show
|
get :show
|
||||||
wait
|
wait
|
||||||
|
@ -39,4 +42,4 @@ class ControllerRuntimeSubscriberTest < ActionController::TestCase
|
||||||
assert_equal 2, @logger.logged(:info).size
|
assert_equal 2, @logger.logged(:info).size
|
||||||
assert_match /\(Views: [\d\.]+ms | ActiveRecord: [\d\.]+ms\)/, @logger.logged(:info)[1]
|
assert_match /\(Views: [\d\.]+ms | ActiveRecord: [\d\.]+ms\)/, @logger.logged(:info)[1]
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -1,3 +1,6 @@
|
||||||
|
railties_path = File.expand_path('../../../../railties/lib', __FILE__)
|
||||||
|
$:.unshift(railties_path) if File.directory?(railties_path) && !$:.include?(railties_path)
|
||||||
|
|
||||||
require "abstract_unit"
|
require "abstract_unit"
|
||||||
require "rails/subscriber/test_helper"
|
require "rails/subscriber/test_helper"
|
||||||
require "action_controller/railties/subscriber"
|
require "action_controller/railties/subscriber"
|
||||||
|
|
|
@ -1,3 +1,6 @@
|
||||||
|
railties_path = File.expand_path('../../../../railties/lib', __FILE__)
|
||||||
|
$:.unshift(railties_path) if File.directory?(railties_path) && !$:.include?(railties_path)
|
||||||
|
|
||||||
require "abstract_unit"
|
require "abstract_unit"
|
||||||
require "rails/subscriber/test_helper"
|
require "rails/subscriber/test_helper"
|
||||||
require "action_view/railties/subscriber"
|
require "action_view/railties/subscriber"
|
||||||
|
@ -90,4 +93,4 @@ class AVSubscriberTest < ActiveSupport::TestCase
|
||||||
assert_equal 1, @logger.logged(:info).size
|
assert_equal 1, @logger.logged(:info).size
|
||||||
assert_match /Rendered collection/, @logger.logged(:info).last
|
assert_match /Rendered collection/, @logger.logged(:info).last
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -13,7 +13,7 @@ require 'rake/testtask'
|
||||||
task :default => :test
|
task :default => :test
|
||||||
|
|
||||||
Rake::TestTask.new do |t|
|
Rake::TestTask.new do |t|
|
||||||
t.libs << "#{dir}/test"
|
t.libs << "test"
|
||||||
t.test_files = Dir.glob("#{dir}/test/cases/**/*_test.rb").sort
|
t.test_files = Dir.glob("#{dir}/test/cases/**/*_test.rb").sort
|
||||||
t.warning = true
|
t.warning = true
|
||||||
end
|
end
|
||||||
|
|
|
@ -1,4 +1,9 @@
|
||||||
require File.expand_path('../../../../load_paths', __FILE__)
|
require File.expand_path('../../../../bundler', __FILE__)
|
||||||
|
|
||||||
|
lib = File.expand_path("#{File.dirname(__FILE__)}/../../lib")
|
||||||
|
$:.unshift(lib) unless $:.include?('lib') || $:.include?(lib)
|
||||||
|
|
||||||
|
puts $LOAD_PATH.inspect
|
||||||
|
|
||||||
require 'config'
|
require 'config'
|
||||||
require 'active_model'
|
require 'active_model'
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
require 'logger'
|
require 'logger'
|
||||||
|
|
||||||
$:.unshift(File.dirname(__FILE__) + '/../../../activerecord/lib')
|
activerecord_path = File.expand_path('../../../../activerecord/lib', __FILE__)
|
||||||
|
$:.unshift(activerecord_path) if File.directory?(activerecord_path) && !$:.include?(activerecord_path)
|
||||||
|
|
||||||
require 'active_record'
|
require 'active_record'
|
||||||
|
|
||||||
module ActiveModel
|
module ActiveModel
|
||||||
|
|
|
@ -21,7 +21,6 @@
|
||||||
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||||
#++
|
#++
|
||||||
|
|
||||||
|
|
||||||
activesupport_path = File.expand_path('../../../activesupport/lib', __FILE__)
|
activesupport_path = File.expand_path('../../../activesupport/lib', __FILE__)
|
||||||
$:.unshift(activesupport_path) if File.directory?(activesupport_path) && !$:.include?(activesupport_path)
|
$:.unshift(activesupport_path) if File.directory?(activesupport_path) && !$:.include?(activesupport_path)
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,7 @@
|
||||||
require File.expand_path('../../../../load_paths', __FILE__)
|
require File.expand_path('../../../../bundler', __FILE__)
|
||||||
|
|
||||||
|
lib = File.expand_path("#{File.dirname(__FILE__)}/../../lib")
|
||||||
|
$:.unshift(lib) unless $:.include?('lib') || $:.include?(lib)
|
||||||
|
|
||||||
require 'config'
|
require 'config'
|
||||||
|
|
||||||
|
|
|
@ -1,3 +1,6 @@
|
||||||
|
railties_path = File.expand_path('../../../../railties/lib', __FILE__)
|
||||||
|
$:.unshift(railties_path) if File.directory?(railties_path) && !$:.include?(railties_path)
|
||||||
|
|
||||||
require "cases/helper"
|
require "cases/helper"
|
||||||
require "models/developer"
|
require "models/developer"
|
||||||
require "rails/subscriber/test_helper"
|
require "rails/subscriber/test_helper"
|
||||||
|
@ -39,4 +42,4 @@ class SubscriberTest < ActiveSupport::TestCase
|
||||||
assert_match /CACHE/, @logger.logged(:debug).last
|
assert_match /CACHE/, @logger.logged(:debug).last
|
||||||
assert_match /SELECT .*?FROM .?developers.?/, @logger.logged(:debug).last
|
assert_match /SELECT .*?FROM .?developers.?/, @logger.logged(:debug).last
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -1,4 +1,7 @@
|
||||||
require File.expand_path('../../../load_paths', __FILE__)
|
require File.expand_path('../../../bundler', __FILE__)
|
||||||
|
|
||||||
|
lib = File.expand_path("#{File.dirname(__FILE__)}/../lib")
|
||||||
|
$:.unshift(lib) unless $:.include?('lib') || $:.include?(lib)
|
||||||
|
|
||||||
require 'rubygems'
|
require 'rubygems'
|
||||||
require 'test/unit'
|
require 'test/unit'
|
||||||
|
@ -6,7 +9,6 @@ require 'active_resource'
|
||||||
require 'active_support'
|
require 'active_support'
|
||||||
require 'active_support/test_case'
|
require 'active_support/test_case'
|
||||||
|
|
||||||
$:.unshift "#{File.dirname(__FILE__)}/../test"
|
|
||||||
require 'setter_trap'
|
require 'setter_trap'
|
||||||
|
|
||||||
require 'logger'
|
require 'logger'
|
||||||
|
|
|
@ -1,9 +1,13 @@
|
||||||
|
railties_path = File.expand_path('../../../../railties/lib', __FILE__)
|
||||||
|
$:.unshift(railties_path) if File.directory?(railties_path) && !$:.include?(railties_path)
|
||||||
|
|
||||||
require "abstract_unit"
|
require "abstract_unit"
|
||||||
require "fixtures/person"
|
require "fixtures/person"
|
||||||
require "rails/subscriber/test_helper"
|
require "rails/subscriber/test_helper"
|
||||||
require "active_resource/railties/subscriber"
|
require "active_resource/railties/subscriber"
|
||||||
require "active_support/core_ext/hash/conversions"
|
require "active_support/core_ext/hash/conversions"
|
||||||
|
|
||||||
|
# TODO: This test should be part of Railties
|
||||||
class SubscriberTest < ActiveSupport::TestCase
|
class SubscriberTest < ActiveSupport::TestCase
|
||||||
include Rails::Subscriber::TestHelper
|
include Rails::Subscriber::TestHelper
|
||||||
Rails::Subscriber.add(:active_resource, ActiveResource::Railties::Subscriber.new)
|
Rails::Subscriber.add(:active_resource, ActiveResource::Railties::Subscriber.new)
|
||||||
|
@ -28,4 +32,4 @@ class SubscriberTest < ActiveSupport::TestCase
|
||||||
assert_equal "GET http://37s.sunrise.i:3000/people/1.xml", @logger.logged(:info)[0]
|
assert_equal "GET http://37s.sunrise.i:3000/people/1.xml", @logger.logged(:info)[0]
|
||||||
assert_match /\-\-\> 200 200 106/, @logger.logged(:info)[1]
|
assert_match /\-\-\> 200 200 106/, @logger.logged(:info)[1]
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -1,4 +1,7 @@
|
||||||
require File.expand_path('../../../load_paths', __FILE__)
|
require File.expand_path('../../../bundler', __FILE__)
|
||||||
|
|
||||||
|
lib = File.expand_path("#{File.dirname(__FILE__)}/../lib")
|
||||||
|
$:.unshift(lib) unless $:.include?('lib') || $:.include?(lib)
|
||||||
|
|
||||||
require 'test/unit'
|
require 'test/unit'
|
||||||
require 'mocha'
|
require 'mocha'
|
||||||
|
|
10
bundler.rb
Normal file
10
bundler.rb
Normal file
|
@ -0,0 +1,10 @@
|
||||||
|
begin
|
||||||
|
require File.expand_path('../.bundle/environment', __FILE__)
|
||||||
|
rescue LoadError
|
||||||
|
begin
|
||||||
|
require 'rubygems'
|
||||||
|
require 'bundler'
|
||||||
|
Bundler.setup
|
||||||
|
rescue LoadError
|
||||||
|
end
|
||||||
|
end
|
|
@ -1,21 +0,0 @@
|
||||||
begin
|
|
||||||
require File.expand_path('../.bundle/environment', __FILE__)
|
|
||||||
rescue LoadError
|
|
||||||
begin
|
|
||||||
require 'rubygems'
|
|
||||||
require 'bundler'
|
|
||||||
Bundler.setup
|
|
||||||
rescue LoadError
|
|
||||||
%w(
|
|
||||||
actionmailer
|
|
||||||
actionpack
|
|
||||||
activemodel
|
|
||||||
activerecord
|
|
||||||
activeresource
|
|
||||||
activesupport
|
|
||||||
railties
|
|
||||||
).each do |framework|
|
|
||||||
$:.unshift File.expand_path("../#{framework}/lib", __FILE__)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
|
@ -1,4 +1,4 @@
|
||||||
require File.expand_path('../../load_paths', __FILE__)
|
require File.expand_path('../../bundler', __FILE__)
|
||||||
|
|
||||||
require 'rake'
|
require 'rake'
|
||||||
require 'rake/testtask'
|
require 'rake/testtask'
|
||||||
|
|
|
@ -1,8 +1,13 @@
|
||||||
ORIG_ARGV = ARGV.dup
|
ORIG_ARGV = ARGV.dup
|
||||||
|
|
||||||
require File.expand_path("../../../load_paths", __FILE__)
|
require File.expand_path("../../../bundler", __FILE__)
|
||||||
$:.unshift File.expand_path("../../builtin/rails_info", __FILE__)
|
$:.unshift File.expand_path("../../builtin/rails_info", __FILE__)
|
||||||
|
|
||||||
|
lib = File.expand_path("#{File.dirname(__FILE__)}/../lib")
|
||||||
|
$:.unshift(lib) unless $:.include?('lib') || $:.include?(lib)
|
||||||
|
|
||||||
|
require 'edge_rails'
|
||||||
|
|
||||||
require 'stringio'
|
require 'stringio'
|
||||||
require 'test/unit'
|
require 'test/unit'
|
||||||
require 'fileutils'
|
require 'fileutils'
|
||||||
|
|
|
@ -140,7 +140,7 @@ module ApplicationTests
|
||||||
require "#{app_path}/config/environment"
|
require "#{app_path}/config/environment"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
test "filter_parameters should be able to set via config.filter_parameters" do
|
test "filter_parameters should be able to set via config.filter_parameters" do
|
||||||
add_to_config <<-RUBY
|
add_to_config <<-RUBY
|
||||||
config.filter_parameters += [ :foo, 'bar', lambda { |key, value|
|
config.filter_parameters += [ :foo, 'bar', lambda { |key, value|
|
||||||
|
|
14
railties/test/edge_rails.rb
Normal file
14
railties/test/edge_rails.rb
Normal file
|
@ -0,0 +1,14 @@
|
||||||
|
require File.expand_path('../../../bundler', __FILE__)
|
||||||
|
|
||||||
|
%w(
|
||||||
|
actionmailer
|
||||||
|
actionpack
|
||||||
|
activemodel
|
||||||
|
activerecord
|
||||||
|
activeresource
|
||||||
|
activesupport
|
||||||
|
railties
|
||||||
|
).each do |framework|
|
||||||
|
framework_path = File.expand_path("../../../#{framework}/lib", __FILE__)
|
||||||
|
$:.unshift(framework_path) if File.directory?(framework_path) && !$:.include?(framework_path)
|
||||||
|
end
|
|
@ -187,7 +187,7 @@ module TestHelpers
|
||||||
end
|
end
|
||||||
|
|
||||||
def boot_rails
|
def boot_rails
|
||||||
require File.expand_path('../../../../load_paths', __FILE__)
|
require File.expand_path('../../edge_rails', __FILE__)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -208,18 +208,12 @@ Module.new do
|
||||||
end
|
end
|
||||||
FileUtils.mkdir(tmp_path)
|
FileUtils.mkdir(tmp_path)
|
||||||
|
|
||||||
environment = File.expand_path('../../../../load_paths', __FILE__)
|
environment = File.expand_path('../../edge_rails', __FILE__)
|
||||||
if File.exist?("#{environment}.rb")
|
require_environment = "-r #{environment}"
|
||||||
require_environment = "-r #{environment}"
|
|
||||||
end
|
|
||||||
|
|
||||||
`#{Gem.ruby} #{require_environment} #{RAILS_FRAMEWORK_ROOT}/railties/bin/rails #{tmp_path('app_template')}`
|
`#{Gem.ruby} #{require_environment} #{RAILS_FRAMEWORK_ROOT}/railties/bin/rails #{tmp_path('app_template')}`
|
||||||
File.open("#{tmp_path}/app_template/config/boot.rb", 'w') do |f|
|
File.open("#{tmp_path}/app_template/config/boot.rb", 'w') do |f|
|
||||||
if require_environment
|
f.puts "require '#{environment}'"
|
||||||
f.puts "Dir.chdir('#{File.dirname(environment)}') do"
|
|
||||||
f.puts " require '#{environment}'"
|
|
||||||
f.puts "end"
|
|
||||||
end
|
|
||||||
f.puts "require 'rails/all'"
|
f.puts "require 'rails/all'"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue