@@ -1,3 +1,4 @@ +* [#45] rake stats task now works with Test::Unit::TestCase * [#57] Moved most files under to lib/mack * [#54] Added DataMapper 0.9.3 support * [#24] Added mack-mailer support. CHANGELOG @@ -25,13 +25,13 @@ namespace :test do task :stats do |t| ENV["MACK_ENV"] = "test" Rake::Task["mack:environment"].invoke + Rake::Task["test:setup"].invoke x = `rcov test/**/*_#{app_config.mack.testing_framework == "rspec" ? "spec" : "test"}.rb -T --no-html -x Rakefile,config\/` - @print = false - x.each do |line| - puts line if @print - unless @print - if line.match(/\d+ tests, \d+ assertions, \d+ failures, \d+ errors/) - @print = true + if app_config.mack.testing_framework == "test_case" + x.each do |line| + case line + when /^\+[\+\-]*\+$/, /^\|.*\|$/, /\d+\sLines\s+\d+\sLOC/ + puts line end end end @@ -41,6 +41,7 @@ namespace :test do task :coverage do |t| ENV["MACK_ENV"] = "test" Rake::Task["mack:environment"].invoke + Rake::Task["test:setup"].invoke `rcov test/**/*_#{app_config.mack.testing_framework == "rspec" ? "spec" : "test"}.rb -x Rakefile,config\/` `open coverage/index.html` end lib/mack/tasks/test_tasks.rake @@ -1,20 +1,24 @@ require File.join(File.dirname(__FILE__), "helpers") -module Spec # :nodoc: - module Example # :nodoc: - module ExampleMethods # :nodoc: - include Mack::Routes::Urls - include Mack::Testing::Helpers +if app_config.mack.testing_framework == "rspec" + require 'spec' + module Spec # :nodoc: + module Example # :nodoc: + module ExampleMethods # :nodoc: + include Mack::Routes::Urls + include Mack::Testing::Helpers - alias_method :mack_spec_execute, :execute + alias_method :mack_spec_execute, :execute - def execute(options, instance_variables) - in_session do - @__res = mack_spec_execute(options, instance_variables) + def execute(options, instance_variables) + in_session do + @__res = mack_spec_execute(options, instance_variables) + end + @__res end - @__res - end + end end end + end \ No newline at end of file lib/mack/testing/rspec.rb @@ -34,7 +34,7 @@ unless Mack::Configuration.initialized_core Mack.logger.info "Initializing core classes..." # Require all the necessary files to make Mack actually work! lib_dirs = ["errors", "core_extensions", "utils", "runner_helpers", "routing", "view_helpers", "rendering", "controller", "tasks", "initialization/server", "generators", "distributed"] - lib_dirs << "testing" if Mack.env == "test" + lib_dirs << "testing"# if Mack.env == "test" lib_dirs.each do |dir| dir_globs = Dir.glob(File.join(fl, dir, "**/*.rb")) dir_globs.each do |d| lib/mack_core.rb e81da1d91b7450d718f3cf3b7e4b48454990c2f4 Mark Bates mark@markbates.com http://github.com/markbates/mack/commit/0b93f4274052c0ea2c42f3b2b0a9798d9d02e01b 0b93f4274052c0ea2c42f3b2b0a9798d9d02e01b 2008-07-28T11:34:02-07:00 2008-07-28T11:34:02-07:00 Fixed: rake stats doesn't work with Test::Unit::TestCase [#45 state:resolved] de2504af4cfea6aa4be198fd03617c06a68dc794 Mark Bates mark@markbates.com