diff --git a/CHANGELOG b/CHANGELOG index 1404c96..da5bf27 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,9 @@ +* master + +* Add rails 2.2.2 to test task and remove quite backtrace usage so 1.2.6 testing can run. [Ken Collins] + + *0.4* (October 3rd 2008) * Use the #737f2bdabb of NamedScope plugin from http://github.com/metaskills/named_scope/tree/master diff --git a/Rakefile b/Rakefile index 2fbc276..316c5ad 100644 --- a/Rakefile +++ b/Rakefile @@ -23,7 +23,7 @@ end desc 'Test the GroupedScope plugin with Rails 2.1.1, 2.0.4 & 1.2.6 gems' task :test_rails do test = Rake::Task['test'] - versions = ['2.1.1','2.0.4','1.2.6'] + versions = ['2.2.2','2.1.1','2.0.4','1.2.6'] versions.each do |version| ENV['RAILS_VERSION'] = "#{version}" test.invoke diff --git a/test/helper.rb b/test/helper.rb index c21638f..91863fa 100644 --- a/test/helper.rb +++ b/test/helper.rb @@ -1,7 +1,6 @@ require File.join(File.dirname(__FILE__),'lib/boot') unless defined?(ActiveRecord) require 'test/unit' require 'shoulda' -require 'quietbacktrace' require 'mocha' require 'factory_girl' require 'lib/test_case' diff --git a/test/lib/test_case.rb b/test/lib/test_case.rb index 6c31620..16e4b08 100644 --- a/test/lib/test_case.rb +++ b/test/lib/test_case.rb @@ -14,10 +14,6 @@ def execute_with_query_record(sql, name = nil, &block) module GroupedScope class TestCase < Test::Unit::TestCase - self.new_backtrace_silencer(:shoulda) { |line| line.include? 'lib/shoulda' } - self.new_backtrace_silencer(:mocha) { |line| line.include? 'lib/mocha' } - self.backtrace_silencers << :shoulda << :mocha - def test_truth ; end protected