mirror of
https://github.com/github/rails.git
synced 2026-04-26 03:00:59 -04:00
Don't require initializer.rb in core.rb
This commit is contained in:
@@ -15,7 +15,6 @@ require 'rails/paths'
|
||||
require 'rails/core'
|
||||
require 'rails/configuration'
|
||||
require 'rails/deprecation'
|
||||
require 'rails/initializer'
|
||||
require 'rails/ruby_version_check'
|
||||
|
||||
# For Ruby 1.8, this initialization sets $KCODE to 'u' to enable the
|
||||
|
||||
@@ -22,6 +22,8 @@ require 'active_support/test_case'
|
||||
require 'action_controller'
|
||||
require 'rails'
|
||||
|
||||
Rails::Initializer.run do |config|
|
||||
# TODO: Remove these hacks
|
||||
class TestApp < Rails::Application
|
||||
config.root = File.dirname(__FILE__)
|
||||
end
|
||||
Rails.application = TestApp
|
||||
|
||||
@@ -1,27 +1,35 @@
|
||||
require "isolation/abstract_unit"
|
||||
|
||||
module ApplicationTests
|
||||
class MyQueue
|
||||
def publish(name, *args)
|
||||
raise name
|
||||
end
|
||||
|
||||
# Not a full queue implementation
|
||||
def method_missing(name, *args, &blk)
|
||||
self
|
||||
end
|
||||
end
|
||||
|
||||
class NotificationsTest < Test::Unit::TestCase
|
||||
include ActiveSupport::Testing::Isolation
|
||||
|
||||
class MyQueue
|
||||
def publish(name, *args)
|
||||
raise name
|
||||
end
|
||||
end
|
||||
|
||||
def setup
|
||||
build_app
|
||||
boot_rails
|
||||
require "rails"
|
||||
require "active_support/notifications"
|
||||
@events = []
|
||||
Rails::Initializer.run do |c|
|
||||
c.notifications.notifier = ActiveSupport::Notifications::Notifier.new(MyQueue.new)
|
||||
end
|
||||
|
||||
add_to_config <<-RUBY
|
||||
config.notifications.notifier = ActiveSupport::Notifications::Notifier.new(ApplicationTests::MyQueue.new)
|
||||
RUBY
|
||||
end
|
||||
|
||||
test "new queue is set" do
|
||||
use_frameworks []
|
||||
require "#{app_path}/config/environment"
|
||||
|
||||
assert_raise RuntimeError do
|
||||
ActiveSupport::Notifications.publish('foo')
|
||||
end
|
||||
|
||||
@@ -2,6 +2,8 @@ require "isolation/abstract_unit"
|
||||
|
||||
module PluginsTest
|
||||
class FrameworkExtensionTest < Test::Unit::TestCase
|
||||
include ActiveSupport::Testing::Isolation
|
||||
|
||||
def setup
|
||||
build_app
|
||||
boot_rails
|
||||
@@ -23,12 +25,15 @@ module PluginsTest
|
||||
require 'rake'
|
||||
require 'rake/testtask'
|
||||
require 'rake/rdoctask'
|
||||
|
||||
AppTemplate::Application.load_tasks
|
||||
assert $ran_block
|
||||
end
|
||||
end
|
||||
|
||||
class ActiveRecordExtensionTest < Test::Unit::TestCase
|
||||
include ActiveSupport::Testing::Isolation
|
||||
|
||||
def setup
|
||||
build_app
|
||||
boot_rails
|
||||
|
||||
Reference in New Issue
Block a user