lib/mack/generators/mack_application_generator/templates/test/controllers/.gitinclude lib/mack/generators/mack_application_generator/templates/test/controllers/default_controller_spec.rb.template lib/mack/generators/mack_application_generator/templates/test/controllers/default_controller_test.rb.template lib/mack/generators/mack_application_generator/templates/test/helpers/controllers/default_controller_helper_spec.rb.template lib/mack/generators/mack_application_generator/templates/test/helpers/controllers/default_controller_helper_test.rb.template lib/mack/generators/mack_application_generator/templates/test/helpers/views/application_helper_spec.rb.template lib/mack/generators/mack_application_generator/templates/test/helpers/views/application_helper_test.rb.template @@ -15,7 +15,7 @@ options = OpenStruct.new options.orm = "data_mapper" options.testing_framework = "rspec" options.js_framework = "jquery" -options.version = "0.6.1" +options.version = "0.6.1.100" opts = OptionParser.new do |opts| opts.banner = "Usage: mack <application_name> [options]" bin/mack @@ -1,4 +1,4 @@ -require File.join(File.dirname(__FILE__), '..', '..', 'spec_helper') +require File.join(File.dirname(__FILE__), '..', '..', 'test_helper') class <%= @name_plural_camel %>ControllerHelperTest < Test::Unit::TestCase include Mack::ControllerHelpers::<%= @name_plural_camel %>Controller lib/mack/generators/controller_helper_generator/templates/test/helpers/controllers/test_case.rb.template @@ -74,16 +74,24 @@ test_helper: type: file template_path: <%= File.join(templates_directory_path, "test", "test_helper.rb.template") %> output_path: <%= File.join(app_name, "test", "test_helper.rb") %> -test_functional: +test_controllers: type: directory - output_path: <%= File.join(app_name, "test", "functional") %> + output_path: <%= File.join(app_name, "test", "controllers") %> test_example: type: file - template_path: <%= File.join(templates_directory_path, "test", "functional", "default_controller_test.rb.template") %> - output_path: <%= File.join(app_name, "test", "functional", "default_controller_test.rb") %> -test_unit: + template_path: <%= File.join(templates_directory_path, "test", "controllers", "default_controller_test.rb.template") %> + output_path: <%= File.join(app_name, "test", "controllers", "default_controller_test.rb") %> +test_models: type: directory - output_path: <%= File.join(app_name, "test", "unit") %> + output_path: <%= File.join(app_name, "test", "models") %> +helper_test_example: + type: file + template_path: <%= File.join(templates_directory_path, "test", "helpers", "controllers", "default_controller_helper_test.rb.template") %> + output_path: <%= File.join(app_name, "test", "helpers", "controllers", "default_controller_helper_test.rb") %> +app_helper_test_example: + type: file + template_path: <%= File.join(templates_directory_path, "test", "helpers", "views", "application_helper_test.rb.template") %> + output_path: <%= File.join(app_name, "test", "helpers", "view", "application_helper_test.rb") %> <% elsif testing_framework == "rspec" %> test_spec_helper: type: file @@ -95,11 +103,19 @@ test_spec_opts: output_path: <%= File.join(app_name, "test", "spec.opts") %> test_spec_example: type: file - template_path: <%= File.join(templates_directory_path, "test", "functional", "default_controller_spec.rb.template") %> - output_path: <%= File.join(app_name, "test", "functional", "default_controller_spec.rb") %> -test_spec_unit: + template_path: <%= File.join(templates_directory_path, "test", "controllers", "default_controller_spec.rb.template") %> + output_path: <%= File.join(app_name, "test", "controllers", "default_controller_spec.rb") %> +helper_test_spec_example: + type: file + template_path: <%= File.join(templates_directory_path, "test", "helpers", "controllers", "default_controller_helper_spec.rb.template") %> + output_path: <%= File.join(app_name, "test", "helpers", "controllers", "default_controller_helper_spec.rb") %> +app_helper_test_spec_example: + type: file + template_path: <%= File.join(templates_directory_path, "test", "helpers", "views", "application_helper_spec.rb.template") %> + output_path: <%= File.join(app_name, "test", "helpers", "view", "application_helper_spec.rb") %> +test_spec_models: type: directory - output_path: <%= File.join(app_name, "test", "unit") %> + output_path: <%= File.join(app_name, "test", "models") %> <% end %> # Plugins lib/mack/generators/mack_application_generator/manifest.yml @@ -1,4 +1,4 @@ -require File.join(File.dirname(__FILE__), '..', '..', 'spec_helper') +require File.join(File.dirname(__FILE__), '..', '..', 'test_helper') class <%= @name_singular_camel %>HelperTest < Test::Unit::TestCase include Mack::ViewHelpers lib/mack/generators/view_helper_generator/templates/test/helpers/views/test_case.rb.template @@ -1,4 +1,4 @@ -require File.join(File.dirname(__FILE__), '..', '..', 'spec_helper') +require File.join(File.dirname(__FILE__), '..', '..', 'test_helper') class ZooHelperTest < Test::Unit::TestCase include Mack::ViewHelpers test/fixtures/zoo_helper_test.rb.fixture @@ -1,4 +1,4 @@ -require File.join(File.dirname(__FILE__), '..', '..', 'spec_helper') +require File.join(File.dirname(__FILE__), '..', '..', 'test_helper') class ZoosControllerHelperTest < Test::Unit::TestCase include Mack::ControllerHelpers::ZoosController test/fixtures/zoos_controller_helper_test.rb.fixture lib/mack/generators/mack_application_generator/templates/test/functional/.gitinclude lib/mack/generators/mack_application_generator/templates/test/functional/default_controller_spec.rb.template lib/mack/generators/mack_application_generator/templates/test/functional/default_controller_test.rb.template 8eaee77c5d6265d6849378131e3674f7dc105064 Mark Bates mark@markbates.com http://github.com/markbates/mack/commit/b9bbe9d1805bea948b5cd308af427fb32488df7c b9bbe9d1805bea948b5cd308af427fb32488df7c 2008-08-04T13:26:40-07:00 2008-08-04T13:26:07-07:00 Updated mack_application_generator to generate view and controller helper tests. [#69 state:resolved] d9fcae85879993fe89eadbab3e5ca1f831351961 Mark Bates mark@markbates.com