generators/plugin_test_structure/templates/app_root/app/controllers/application_controller.rb test/app_roots/with_custom_application_controller/app/controllers/application_controller.rb @@ -1,5 +1,10 @@ == master +* Fix environment being loaded twice when generators are loaded +* Clean up / simplify generators +* Rename application.rb to application_controller.rb +* Add dependency on Rails 2.3 + == 0.2.1 / 2009-01-11 * Remove init.rb since the library should never be loaded automatically CHANGELOG.rdoc @@ -104,7 +104,7 @@ Example: create vendor/plugins/acts_as_most_popular/test/app_root/config/environments/in_memory.rb create vendor/plugins/acts_as_most_popular/test/app_root/config/environments/postgresql.rb create vendor/plugins/acts_as_most_popular/test/app_root/app/controllers - create vendor/plugins/acts_as_most_popular/test/app_root/app/controllers/application.rb + create vendor/plugins/acts_as_most_popular/test/app_root/app/controllers/application_controller.rb Loaded suite script/generate Started @@ -187,7 +187,7 @@ Example: == Dependencies -Rails 2.1 or later +Rails 2.3 or later == References README.rdoc @@ -1,9 +1,11 @@ +require 'plugin_test_helper/generator' + # Generates a test console for the plugin's test application. -class PluginTestConsoleGenerator < Rails::Generator::NamedBase +class PluginTestConsoleGenerator < Rails::Generator::Base + include PluginTestHelper::Generator + def manifest #:nodoc: record do |m| - plugin_root = "vendor/plugins/#{name}" - # Script directory m.directory File.join(plugin_root, 'script') generators/plugin_test_console/plugin_test_console_generator.rb @@ -1,5 +1,9 @@ +require 'plugin_test_helper/generator' + # Generates the class and view for a controller in a plugin's test application -class PluginTestControllerGenerator < PluginTestHelper::Generator +class PluginTestControllerGenerator < Rails::Generator::NamedBase + include PluginTestHelper::Generator + def manifest #:nodoc: record do |m| # Check for class naming collisions generators/plugin_test_controller/plugin_test_controller_generator.rb @@ -1,9 +1,11 @@ +require 'plugin_test_helper/generator' + # Generates the test helper for a plugin -class PluginTestHelperGenerator < Rails::Generator::NamedBase +class PluginTestHelperGenerator < Rails::Generator::Base + include PluginTestHelper::Generator + def manifest #:nodoc: record do |m| - plugin_root = "vendor/plugins/#{name}" - # Test directory m.directory File.join(plugin_root, 'test') generators/plugin_test_helper/plugin_test_helper_generator.rb @@ -1,5 +1,9 @@ +require 'plugin_test_helper/generator' + # Generates migrations for a plugin's test application -class PluginTestMigrationGenerator < PluginTestHelper::Generator +class PluginTestMigrationGenerator < Rails::Generator::NamedBase + include PluginTestHelper::Generator + def manifest #:nodoc: record do |m| m.migration_template 'migration.rb', "#{plugin_app_root}/db/migrate" generators/plugin_test_migration/plugin_test_migration_generator.rb @@ -1,25 +1,26 @@ +require 'plugin_test_helper/generator' + # Generates the class, fixtures, and migration for a model in a plugin's test application -class PluginTestModelGenerator < PluginTestHelper::Generator - default_options :skip_migration => false +class PluginTestModelGenerator < Rails::Generator::NamedBase + include PluginTestHelper::Generator def manifest #:nodoc: record do |m| - # Check for class naming collisions. + # Check for class naming collisions m.class_collisions class_path, class_name - # Model and fixture directories. + # Model and fixture directories m.directory File.join(plugin_app_root, 'app/models', class_path) m.directory File.join(plugin_test_root, 'fixtures', class_path) - # Model class and fixtures. + # Model class and fixtures m.template 'model.rb', File.join(plugin_app_root, 'app/models', class_path, "#{file_name}.rb") m.template 'fixtures.yml', File.join(plugin_test_root, 'fixtures', class_path, "#{table_name}.yml") - unless options[:skip_migration] - m.migration_template 'migration.rb', "#{plugin_app_root}/db/migrate", :assigns => { - :migration_name => "Create#{class_name.pluralize.gsub(/::/, '')}" - }, :migration_file_name => "create_#{file_path.gsub(/\//, '_').pluralize}" - end + # Migration + m.migration_template 'migration.rb', "#{plugin_app_root}/db/migrate", :assigns => { + :migration_name => "Create#{class_name.pluralize.gsub(/::/, '')}" + }, :migration_file_name => "create_#{file_path.gsub(/\//, '_').pluralize}" end end @@ -27,10 +28,4 @@ class PluginTestModelGenerator < PluginTestHelper::Generator def banner "Usage: #{$0} generate your_plugin ModelName [field:type, field:type]" end - - def add_options!(opt) - opt.separator '' - opt.separator 'Options:' - opt.on('--skip-migration', "Don't generate a migration file for this model") {|v| options[:skip_migration] = v} - end end generators/plugin_test_model/plugin_test_model_generator.rb @@ -4,9 +4,6 @@ class <%= migration_name %> < ActiveRecord::Migration <% for attribute in attributes -%> t.<%= attribute.type %> :<%= attribute.name %> <% end -%> -<% unless options[:skip_timestamps] %> - t.timestamps -<% end -%> end end generators/plugin_test_model/templates/migration.rb @@ -8,7 +8,7 @@ Examples: creates test, controller and application configurations: Test Helper: test/test_helper.rb - Controller: test/app_root/app/controllers/application.rb + Controller: test/app_root/app/controllers/application_controller.rb Configurations: test/app_root/config/boot.rb test/app_root/config/database.yml test/app_root/config/environment.rb generators/plugin_test_structure/USAGE @@ -1,10 +1,13 @@ +require 'plugin_test_helper/generator' + # Generates the test structure for a plugin with no dependencies on the # plugin_test_helper library -class PluginTestStructureGenerator < Rails::Generator::NamedBase +class PluginTestStructureGenerator < Rails::Generator::Base + include PluginTestHelper::Generator + def manifest #:nodoc: record do |m| # Paths are relative to our template dir - plugin_test_root = "vendor/plugins/#{name}/test" templates_root = "#{File.dirname(__FILE__)}/templates" # Root test directory generators/plugin_test_structure/plugin_test_structure_generator.rb @@ -47,6 +47,7 @@ module Rails def load_initializer require "#{RAILS_FRAMEWORK_ROOT}/railties/lib/initializer" Rails::Initializer.run(:install_gem_spec_stubs) + Rails::GemDependency.add_frozen_gem_path end end @@ -85,7 +86,7 @@ module Rails def load_rubygems require 'rubygems' - min_version = '1.1.1' + min_version = '1.3.1' unless rubygems_version >= min_version $stderr.puts %Q(Rails requires RubyGems >= #{min_version} (you have #{rubygems_version}). Please `gem update --system` and try again.) exit 1 generators/plugin_test_structure/templates/app_root/config/boot.rb @@ -2,20 +2,30 @@ in_memory: adapter: sqlite3 database: ":memory:" verbosity: quiet + pool: 5 + timeout: 5000 sqlite: adapter: sqlite dbfile: plugin_test.sqlite.db + pool: 5 + timeout: 5000 sqlite3: adapter: sqlite3 dbfile: plugin_test.sqlite3.db + pool: 5 + timeout: 5000 postgresql: adapter: postgresql username: postgres password: postgres database: plugin_test + pool: 5 + timeout: 5000 mysql: adapter: mysql host: localhost username: root password: database: plugin_test + pool: 5 + timeout: 5000 generators/plugin_test_structure/templates/app_root/config/database.yml @@ -3,6 +3,7 @@ require File.join(File.dirname(__FILE__), 'boot') Rails::Initializer.run do |config| config.cache_classes = false config.whiny_nils = true + config.action_controller.session = {:key => 'rails_session', :secret => 'd229e4d22437432705ab3985d4d246'} config.plugin_locators.unshift( Class.new(Rails::Plugin::Locator) do def plugins generators/plugin_test_structure/templates/app_root/config/environment.rb @@ -4,7 +4,6 @@ ENV['RAILS_ENV'] ||= 'in_memory' # Load the Rails environment and testing framework require "#{File.dirname(__FILE__)}/app_root/config/environment" require 'test_help' -require 'action_view/test_case' # Load additional test classes not done automatically by < Rails 2.2.2 # Undo changes to RAILS_ENV silence_warnings {RAILS_ENV = ENV['RAILS_ENV']} @@ -13,8 +12,10 @@ silence_warnings {RAILS_ENV = ENV['RAILS_ENV']} ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate") # Set default fixture loading properties -Test::Unit::TestCase.class_eval do +ActiveSupport::TestCase.class_eval do self.use_transactional_fixtures = true self.use_instantiated_fixtures = false self.fixture_path = "#{File.dirname(__FILE__)}/fixtures" + + fixtures :all end generators/plugin_test_structure/templates/test_helper.rb @@ -19,16 +19,14 @@ require 'plugin_test_helper/extensions/initializer' require 'config/environment' require 'test_help' -# Load additional test classes not done automatically by < Rails 2.2.2 -# TODO: Remove in Rails 2.2.3 / 2.3 (whichever includes the fix) -require 'action_view/test_case' - # Undo changes to RAILS_ENV silence_warnings {RAILS_ENV = ENV['RAILS_ENV']} # Set default fixture loading properties -Test::Unit::TestCase.class_eval do +ActiveSupport::TestCase.class_eval do self.use_transactional_fixtures = true self.use_instantiated_fixtures = false - self.fixture_path = "#{Rails.root}/../fixtures" + self.fixture_path = "#{File.dirname(__FILE__)}/fixtures" + + fixtures :all end lib/plugin_test_helper.rb @@ -31,7 +31,6 @@ module PluginTestHelper alias_method_chain base, :default_routes_configuration_file, :test_helper alias_method_chain base, :default_controller_paths, :test_helper alias_method_chain base, :default_plugin_locators, :test_helper - alias_method_chain base, :default_plugin_paths, :test_helper end # Defines a "lite" version of ActiveSupport's alias chaining extensions. @@ -60,7 +59,6 @@ module PluginTestHelper app/controllers config lib - vendor ).map {|dir| "#{HELPER_RAILS_ROOT}/#{dir}"} end @@ -87,12 +85,6 @@ module PluginTestHelper locators = default_plugin_locators_without_test_helper locators.unshift(PluginTestHelper::PluginLocator) end - - # Add the helper's vendor/plugins path - def default_plugin_paths_with_test_helper - paths = default_plugin_paths_without_test_helper - paths << File.join(HELPER_RAILS_ROOT, 'vendor/plugins') - end end end end lib/plugin_test_helper/extensions/initializer.rb @@ -3,7 +3,7 @@ require 'rails_generator' module PluginTestHelper # The base generator for creating parts of the test application. The first # argument of the generator is always the name of the plugin. - class Generator < Rails::Generator::NamedBase + module Generator attr_accessor :plugin_name def initialize(*runtime_args) #:nodoc: @@ -12,9 +12,14 @@ module PluginTestHelper end private + # The root path of the plugin's directory + def plugin_root + "vendor/plugins/#{plugin_name}" + end + # The root path of the plugin's test directory def plugin_test_root - "vendor/plugins/#{plugin_name}/test" + "#{plugin_root}/test" end # The root path of the plugin's test app lib/plugin_test_helper/generator.rb @@ -8,6 +8,7 @@ class PluginTestHelperTest < Test::Unit::TestCase def test_should_load_with_no_app_root load 'plugin_test_helper.rb' + assert_valid_environment end test/functional/plugin_test_helper_test.rb @@ -15,7 +15,7 @@ class PluginTestStructureGeneratorTest < Test::Unit::TestCase end def test_should_create_application_controller - assert File.exists?("#{Rails.root}/vendor/plugins/acts_as_foo/test/app_root/app/controllers/application.rb") + assert File.exists?("#{Rails.root}/vendor/plugins/acts_as_foo/test/app_root/app/controllers/application_controller.rb") end def test_should_create_in_memory_environment test/functional/plugin_test_structure_generator_test.rb @@ -14,6 +14,25 @@ require 'stringio' Object.const_set('RAILS_DEFAULT_LOGGER', Logger.new(StringIO.new)) Test::Unit::TestCase.class_eval do + def self.reset_environment + # Clear dependencies + ActiveRecord::Base.reset_subclasses + ActiveSupport::Dependencies.clear + + # Clear configurations + ActionController::Routing.controller_paths.clear + ActionController::Routing::Routes.configuration_files.clear + Rails::Rack::Metal.requested_metals.clear if Rails::Rack::Metal.requested_metals + Rails::Rack::Metal.metal_paths.clear if Rails::Rack::Metal.metal_paths + + # Reset open streams + ActiveRecord::Base.clear_reloadable_connections! + + # Forget that the environment files were loaded so that a new app environment + # can be set up again + $".delete_if {|path| path =~ /(config\/environment\.rb|test_help\.rb)$/} + end + private def assert_valid_environment assert_not_nil ApplicationController @@ -29,19 +48,14 @@ Test::Unit::TestCase.class_eval do end def teardown_app - # Clear dependencies - self.class.use_transactional_fixtures = false - ActiveRecord::Base.reset_subclasses - ActiveSupport::Dependencies.clear - - # Reset open streams - ActiveRecord::Base.clear_reloadable_connections! - - # Forget that the environment files were loaded so that a new app environment - # can be set up again - $".delete_if {|path| path =~ /(config\/environment\.rb|test_help\.rb)$/} + self.class.reset_environment # Remove the app folder FileUtils.rm_r(Dir['test/app_root/*']) end end + +# Load the helper once before tests start so that the Rails library paths +# don't get lost betweeen environment loads +require 'plugin_test_helper' +Test::Unit::TestCase.reset_environment test/test_helper.rb generators/plugin_test_structure/templates/app_root/app/controllers/application.rb test/app_roots/with_custom_application_controller/app/controllers/application.rb 13aa3f25c0a473ea3323f72c60ddfa0ea87be763 Aaron Pfeifer aaron.pfeifer@gmail.com http://github.com/pluginaweek/plugin_test_helper/commit/4008a7848522c9d7b02059373a96d7c83a91374d 4008a7848522c9d7b02059373a96d7c83a91374d 2009-04-12T12:45:38-07:00 2009-04-12T12:45:38-07:00 Add dependency on Rails 2.3 Rename application.rb to application_controller.rb Clean up / simplify generators Fix environment being loaded twice when generators are loaded 948f48428d98cbd145335eb02c96d7443fa9626b Aaron Pfeifer aaron.pfeifer@gmail.com