@@ -7,7 +7,6 @@ desc "Default: run tests" task :default => "test:multi_verbose" Rake::TestTask.new(:test) do |t| - t.libs << 'lib' t.pattern = 'test/**/*_test.rb' t.verbose = true end @@ -49,6 +48,7 @@ namespace :test do desc "test with multiple versions of rails" task :multi do RAILS_VERSIONS.each do |rails_version| + puts "Testing with Rails #{rails_version}" sh "RAILS_VERSION='#{rails_version}' rake test > /dev/null 2>&1" end end Rakefile @@ -38,12 +38,28 @@ end module TestHelper def self.define_test_case(&block) - klass = Rails::VERSION::MAJOR >= 2 ? rails2_test_case : rails1_test_case + klass = if Rails::VERSION::MAJOR >= 2 + Rails::VERSION::MINOR.zero? ? rails2_0_test_case : rails2_test_case + else + rails1_test_case + end klass.class_eval &block klass end - def self.rails2_test_case + def self.rails2_test_case(&block) + klass = Class.new(ActionController::TestCase) + klass.class_eval do + tests SampleController + + def setup + @controller.do_not_render_view + end + end + klass + end + + def self.rails2_0_test_case klass = Class.new(ActionController::TestCase) klass.class_eval do tests SampleController @@ -69,3 +85,8 @@ module TestHelper klass end end + +# tests weren't running on rails 2.2.0 without this !?!?!? +if Rails::VERSION::STRING[0,3] == "2.2" + at_exit { subclasses_of(Test::Unit::TestCase) } +end test/test_helper.rb @@ -5,7 +5,7 @@ Gem::Specification.new do |s| s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["Dan Manges"] - s.date = %q{2008-10-14} + s.date = %q{2008-10-24} s.description = %q{UnitController assists with unit testing controllers by stubbing view rendering.} s.email = %q{daniel.manges@gmail.com} s.files = ["lib/unit_controller/capture_render.rb", "lib/unit_controller/test_case_extension.rb", "lib/unit_controller.rb", "test/sample_controller.rb", "test/test_case_test.rb", "test/test_helper.rb", "test/unit_controller_test.rb", "README.markdown", "LICENSE", "Rakefile"] unit_controller.gemspec c8ae54461e7bb5307ef0fe8bb3c28061aa9a54be Dan Manges daniel.manges@gmail.com http://github.com/dan-manges/unit-controller/commit/cb659a1f73f8ca2c2ad76096c4612d4d531c04b3 cb659a1f73f8ca2c2ad76096c4612d4d531c04b3 2008-10-24T09:37:42-07:00 2008-10-24T09:37:42-07:00 rails 2.2 compatibility - have some weirdness with test/unit picking up the test classes on exit 4e085623c25fb578b8259746e7ed8429e215d64c Dan Manges daniel.manges@gmail.com