diff options
| author | Hongli Lai (Phusion) <hongli@phusion.nl> | 2008-12-03 19:30:35 +0100 |
|---|---|---|
| committer | Hongli Lai (Phusion) <hongli@phusion.nl> | 2008-12-03 19:30:35 +0100 |
| commit | ccb96f2297e8783165cba764e9b5d51e1a15ff87 (patch) | |
| tree | 3229e6fdddc42054615514d843c555e341003033 /activesupport/test/multibyte_unicode_database_test.rb | |
| parent | fb2325e35855d62abd2c76ce03feaa3ca7992e4f (diff) | |
| parent | 761a633a9c0a45d76ef3ed10da97e3696c3ded79 (diff) | |
| download | rails-ccb96f2297e8783165cba764e9b5d51e1a15ff87.tar.gz rails-ccb96f2297e8783165cba764e9b5d51e1a15ff87.tar.bz2 rails-ccb96f2297e8783165cba764e9b5d51e1a15ff87.zip | |
Merge commit 'origin/master' into savepoints
Conflicts:
activerecord/lib/active_record/fixtures.rb
activerecord/test/cases/defaults_test.rb
Diffstat (limited to 'activesupport/test/multibyte_unicode_database_test.rb')
| -rw-r--r-- | activesupport/test/multibyte_unicode_database_test.rb | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/activesupport/test/multibyte_unicode_database_test.rb b/activesupport/test/multibyte_unicode_database_test.rb index fb415e08d3..405c7c2108 100644 --- a/activesupport/test/multibyte_unicode_database_test.rb +++ b/activesupport/test/multibyte_unicode_database_test.rb @@ -1,11 +1,7 @@ # encoding: utf-8 - require 'abstract_unit' -uses_mocha "MultibyteUnicodeDatabaseTest" do - class MultibyteUnicodeDatabaseTest < Test::Unit::TestCase - def setup @ucd = ActiveSupport::Multibyte::UnicodeDatabase.new end @@ -24,5 +20,3 @@ class MultibyteUnicodeDatabaseTest < Test::Unit::TestCase end end end - -end
\ No newline at end of file |