test/lib/render_information.rb @@ -172,18 +172,29 @@ namespace :test do desc 'Update the plugin and tests files in the test application from the plugin' task :mirror_engine_files => [:test_app, :copy_engines_plugin] do - puts "> Modifying default config files to load engines plugin" + puts "> Tweaking generated application to be suitable for testing" + + # Replace the Rails plugin loader with the engines one. insert_line("require File.join(File.dirname(__FILE__), '../vendor/plugins/engines/boot')", :into => 'config/environment.rb', :after => "require File.join(File.dirname(__FILE__), 'boot')") - - insert_line('map.from_plugin :test_routing', :into => 'config/routes.rb', - :after => /\AActionController::Routing::Routes/) - + + # Add the engines test helper to handle fixtures & stuff. insert_line("require 'engines_test_helper'", :into => 'test/test_helper.rb') + # Run engine plugin tests when running the application insert_line("task :test => ['test:engines:all']", :into => 'Rakefile') + # We want exceptions to be raised + insert_line("def rescue_action(e) raise e end;", + :into => "app/controllers/application_controller.rb", + :after => "class ApplicationController < ActionController::Base") + + # We need this method to test where actions are being rendered from. + insert_line("include RenderInformation", + :into => "app/controllers/application_controller.rb", + :after => "class ApplicationController < ActionController::Base") + puts "> Mirroring test application files into #{test_app_dir}" mirror_test_files('app') mirror_test_files('lib') Rakefile @@ -1,5 +1,5 @@ # Only call Engines.init once, in the after_initialize block so that Rails # plugin reloading works when turned on config.after_initialize do - Engines.init if defined? :Engines -end + Engines.init(initializer) if defined? :Engines +end \ No newline at end of file init.rb @@ -43,7 +43,7 @@ module Engines # List of extensions to load, can be changed in init.rb before calling Engines.init mattr_accessor :rails_extensions - self.rails_extensions = %w(action_mailer asset_helpers form_tag_helpers routing migrations dependencies) + self.rails_extensions = %w(asset_helpers form_tag_helpers migrations dependencies) # The name of the public directory to mirror public engine assets into. # Defaults to <tt>RAILS_ROOT/public/plugin_assets</tt>. @@ -81,7 +81,7 @@ module Engines self.code_mixing_file_types = %w(controller helper) class << self - def init + def init(initializer) load_extensions Engines::Assets.initialize_base_public_directory end lib/engines.rb @@ -75,7 +75,6 @@ module Engines def load(initializer) return if loaded? super initializer - add_plugin_view_paths add_plugin_locale_paths Assets.mirror_files_for(self) end @@ -86,13 +85,6 @@ module Engines Engines.select_existing_paths(self.send(name).map { |p| File.join(directory, p) }) end - def add_plugin_view_paths - view_path = File.join(directory, 'app', 'views') - if File.exist?(view_path) - ActionController::Base.view_paths.insert(1, view_path) # push it just underneath the app - end - end - def add_plugin_locale_paths locale_path = File.join(directory, 'locales') return unless File.exists?(locale_path) @@ -112,11 +104,6 @@ module Engines "#{File.basename(Engines.public_directory)}/#{name}" end - # The path to this plugin's routes file - def routes_path - File.join(directory, "routes.rb") - end - # The directory containing this plugin's migrations (<tt>plugin/db/migrate</tt>) def migration_directory File.join(self.directory, 'db', 'migrate') lib/engines/plugin.rb @@ -5,14 +5,7 @@ module Engines def register_plugin_as_loaded(plugin) super plugin Engines.plugins << plugin - register_to_routing(plugin) end - - # Registers the plugin's controller_paths for the routing system. - def register_to_routing(plugin) - initializer.configuration.controller_paths += plugin.select_existing_paths(:controller_paths) - initializer.configuration.controller_paths.uniq! - end end end end \ No newline at end of file lib/engines/plugin/loader.rb @@ -7,7 +7,7 @@ require File.dirname(__FILE__) + '/../test_helper' -class ControllerLoadingTest < Test::Unit::TestCase +class ControllerLoadingTest < ActionController::TestCase def setup @request = ActionController::TestRequest.new @response = ActionController::TestResponse.new test/functional/controller_loading_test.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../test_helper' -class ExceptionNotificationCompatibilityTest < Test::Unit::TestCase +class ExceptionNotificationCompatibilityTest < ActionController::TestCase ExceptionNotifier.exception_recipients = %w(joe@schmoe.com bill@schmoe.com) class SimpleController < ApplicationController include ExceptionNotifiable test/functional/exception_notification_compatibility_test.rb @@ -5,7 +5,7 @@ require File.dirname(__FILE__) + '/../test_helper' -class LocaleLoadingTest < Test::Unit::TestCase +class LocaleLoadingTest < ActionController::TestCase def setup @request = ActionController::TestRequest.new @response = ActionController::TestResponse.new test/functional/locale_loading_test.rb @@ -7,7 +7,7 @@ require File.dirname(__FILE__) + '/../test_helper' -class ViewLoadingTest < Test::Unit::TestCase +class ViewLoadingTest < ActionController::TestCase def setup @request = ActionController::TestRequest.new @response = ActionController::TestResponse.new test/functional/view_loading_test.rb lib/engines/rails_extensions/action_mailer.rb lib/engines/rails_extensions/routing.rb test/app/controllers/application.rb 15ebe4bfae9127c8502c03db879c3436ee4193fb James Adam james@lazyatom.com http://github.com/lazyatom/engines/commit/a57772ac0c6fab7a64501f8cfe811a10a371afe0 a57772ac0c6fab7a64501f8cfe811a10a371afe0 2009-04-20T02:25:54-07:00 2009-04-20T02:25:54-07:00 Initial steps towards compatability with Rails 2.3. Removed routing and ActionMailer extensions, and we no longer need to add view paths from plugins. 10a205167620d184f704c948439299cf2ffe7b58 James Adam james@lazyatom.com