From 4367f39dea7eedb1bf6e7f52b4522c695befe1da Mon Sep 17 00:00:00 2001 From: Pratik Naik Date: Fri, 20 Mar 2009 16:02:12 +0000 Subject: TestDatabase -> TestsDatabase --- activemodel/test/cases/test_database.rb | 31 ---------------------- activemodel/test/cases/tests_database.rb | 31 ++++++++++++++++++++++ .../validations/acceptance_validation_test.rb | 4 +-- .../validations/conditional_validation_test.rb | 4 +-- .../validations/confirmation_validation_test.rb | 4 +-- .../cases/validations/exclusion_validation_test.rb | 4 +-- .../cases/validations/format_validation_test.rb | 4 +-- .../test/cases/validations/i18n_validation_test.rb | 2 +- .../cases/validations/inclusion_validation_test.rb | 4 +-- .../cases/validations/length_validation_test.rb | 4 +-- .../validations/numericality_validation_test.rb | 4 +-- .../cases/validations/presence_validation_test.rb | 4 +-- activemodel/test/cases/validations_test.rb | 4 +-- 13 files changed, 52 insertions(+), 52 deletions(-) delete mode 100644 activemodel/test/cases/test_database.rb create mode 100644 activemodel/test/cases/tests_database.rb (limited to 'activemodel/test/cases') diff --git a/activemodel/test/cases/test_database.rb b/activemodel/test/cases/test_database.rb deleted file mode 100644 index 509383ec59..0000000000 --- a/activemodel/test/cases/test_database.rb +++ /dev/null @@ -1,31 +0,0 @@ -require 'logger' - -$:.unshift(File.dirname(__FILE__) + '/../../../activerecord/lib') -require 'active_record' -require 'active_record/fixtures' - -module ActiveModel - module TestDatabase - def self.included(base) - ActiveRecord::Base.logger = Logger.new("debug.log") - ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ':memory:') - - base.send :include, ActiveRecord::TestFixtures - base.setup :setup_database - end - - def setup_database - unless $schema_file_loaded - begin - # TODO : May the better way be with you - original, $stdout = $stdout, StringIO.new - load(SCHEMA_FILE) - ensure - $stdout = original - end - - $schema_file_loaded = true - end - end - end -end diff --git a/activemodel/test/cases/tests_database.rb b/activemodel/test/cases/tests_database.rb new file mode 100644 index 0000000000..cb5cda98f5 --- /dev/null +++ b/activemodel/test/cases/tests_database.rb @@ -0,0 +1,31 @@ +require 'logger' + +$:.unshift(File.dirname(__FILE__) + '/../../../activerecord/lib') +require 'active_record' +require 'active_record/fixtures' + +module ActiveModel + module TestsDatabase + def self.included(base) + ActiveRecord::Base.logger = Logger.new("debug.log") + ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ':memory:') + + base.send :include, ActiveRecord::TestFixtures + base.setup :setup_database + end + + def setup_database + unless $schema_file_loaded + begin + # TODO : May the better way be with you + original, $stdout = $stdout, StringIO.new + load(SCHEMA_FILE) + ensure + $stdout = original + end + + $schema_file_loaded = true + end + end + end +end diff --git a/activemodel/test/cases/validations/acceptance_validation_test.rb b/activemodel/test/cases/validations/acceptance_validation_test.rb index f5f0279554..b24da3b334 100644 --- a/activemodel/test/cases/validations/acceptance_validation_test.rb +++ b/activemodel/test/cases/validations/acceptance_validation_test.rb @@ -1,13 +1,13 @@ # encoding: utf-8 require 'cases/helper' -require 'cases/test_database' +require 'cases/tests_database' require 'models/topic' require 'models/reply' require 'models/developer' class AcceptanceValidationTest < ActiveModel::TestCase - include ActiveModel::TestDatabase + include ActiveModel::TestsDatabase include ActiveModel::ValidationsRepairHelper repair_validations(Topic) diff --git a/activemodel/test/cases/validations/conditional_validation_test.rb b/activemodel/test/cases/validations/conditional_validation_test.rb index d4cb3555f3..72b4800dce 100644 --- a/activemodel/test/cases/validations/conditional_validation_test.rb +++ b/activemodel/test/cases/validations/conditional_validation_test.rb @@ -1,11 +1,11 @@ # encoding: utf-8 require 'cases/helper' -require 'cases/test_database' +require 'cases/tests_database' require 'models/topic' class ConditionalValidationTest < ActiveModel::TestCase - include ActiveModel::TestDatabase + include ActiveModel::TestsDatabase include ActiveModel::ValidationsRepairHelper repair_validations(Topic) diff --git a/activemodel/test/cases/validations/confirmation_validation_test.rb b/activemodel/test/cases/validations/confirmation_validation_test.rb index c3caa63d0b..3b4b27df39 100644 --- a/activemodel/test/cases/validations/confirmation_validation_test.rb +++ b/activemodel/test/cases/validations/confirmation_validation_test.rb @@ -1,12 +1,12 @@ # encoding: utf-8 require 'cases/helper' -require 'cases/test_database' +require 'cases/tests_database' require 'models/topic' require 'models/developer' class ConfirmationValidationTest < ActiveModel::TestCase - include ActiveModel::TestDatabase + include ActiveModel::TestsDatabase include ActiveModel::ValidationsRepairHelper repair_validations(Topic) diff --git a/activemodel/test/cases/validations/exclusion_validation_test.rb b/activemodel/test/cases/validations/exclusion_validation_test.rb index 2e3da3c079..b9b53ffb23 100644 --- a/activemodel/test/cases/validations/exclusion_validation_test.rb +++ b/activemodel/test/cases/validations/exclusion_validation_test.rb @@ -1,11 +1,11 @@ # encoding: utf-8 require 'cases/helper' -require 'cases/test_database' +require 'cases/tests_database' require 'models/topic' class ExclusionValidationTest < ActiveModel::TestCase - include ActiveModel::TestDatabase + include ActiveModel::TestsDatabase include ActiveModel::ValidationsRepairHelper repair_validations(Topic) diff --git a/activemodel/test/cases/validations/format_validation_test.rb b/activemodel/test/cases/validations/format_validation_test.rb index 9a7a93a6c6..adf90adf6f 100644 --- a/activemodel/test/cases/validations/format_validation_test.rb +++ b/activemodel/test/cases/validations/format_validation_test.rb @@ -1,11 +1,11 @@ # encoding: utf-8 require 'cases/helper' -require 'cases/test_database' +require 'cases/tests_database' require 'models/topic' class PresenceValidationTest < ActiveModel::TestCase - include ActiveModel::TestDatabase + include ActiveModel::TestsDatabase include ActiveModel::ValidationsRepairHelper repair_validations(Topic) diff --git a/activemodel/test/cases/validations/i18n_validation_test.rb b/activemodel/test/cases/validations/i18n_validation_test.rb index 2b2e52ca82..52a6c87668 100644 --- a/activemodel/test/cases/validations/i18n_validation_test.rb +++ b/activemodel/test/cases/validations/i18n_validation_test.rb @@ -3,7 +3,7 @@ require 'models/topic' require 'models/reply' class I18nValidationTest < ActiveModel::TestCase - include ActiveModel::TestDatabase + include ActiveModel::TestsDatabase def setup reset_callbacks Topic diff --git a/activemodel/test/cases/validations/inclusion_validation_test.rb b/activemodel/test/cases/validations/inclusion_validation_test.rb index 7b2020c719..8d81cca96b 100644 --- a/activemodel/test/cases/validations/inclusion_validation_test.rb +++ b/activemodel/test/cases/validations/inclusion_validation_test.rb @@ -1,11 +1,11 @@ # encoding: utf-8 require 'cases/helper' -require 'cases/test_database' +require 'cases/tests_database' require 'models/topic' class InclusionValidationTest < ActiveModel::TestCase - include ActiveModel::TestDatabase + include ActiveModel::TestsDatabase include ActiveModel::ValidationsRepairHelper repair_validations(Topic) diff --git a/activemodel/test/cases/validations/length_validation_test.rb b/activemodel/test/cases/validations/length_validation_test.rb index daca363b57..9c4639a141 100644 --- a/activemodel/test/cases/validations/length_validation_test.rb +++ b/activemodel/test/cases/validations/length_validation_test.rb @@ -1,11 +1,11 @@ # encoding: utf-8 require 'cases/helper' -require 'cases/test_database' +require 'cases/tests_database' require 'models/topic' class LengthValidationTest < ActiveModel::TestCase - include ActiveModel::TestDatabase + include ActiveModel::TestsDatabase include ActiveModel::ValidationsRepairHelper repair_validations(Topic) diff --git a/activemodel/test/cases/validations/numericality_validation_test.rb b/activemodel/test/cases/validations/numericality_validation_test.rb index 3a30c0cec1..0fd87313e0 100644 --- a/activemodel/test/cases/validations/numericality_validation_test.rb +++ b/activemodel/test/cases/validations/numericality_validation_test.rb @@ -1,12 +1,12 @@ # encoding: utf-8 require 'cases/helper' -require 'cases/test_database' +require 'cases/tests_database' require 'models/topic' require 'models/developer' class NumericalityValidationTest < ActiveModel::TestCase - include ActiveModel::TestDatabase + include ActiveModel::TestsDatabase include ActiveModel::ValidationsRepairHelper repair_validations(Topic) diff --git a/activemodel/test/cases/validations/presence_validation_test.rb b/activemodel/test/cases/validations/presence_validation_test.rb index 5bf29be491..994066095b 100644 --- a/activemodel/test/cases/validations/presence_validation_test.rb +++ b/activemodel/test/cases/validations/presence_validation_test.rb @@ -1,11 +1,11 @@ # encoding: utf-8 require 'cases/helper' -require 'cases/test_database' +require 'cases/tests_database' require 'models/topic' class PresenceValidationTest < ActiveModel::TestCase - include ActiveModel::TestDatabase + include ActiveModel::TestsDatabase include ActiveModel::ValidationsRepairHelper repair_validations(Topic) diff --git a/activemodel/test/cases/validations_test.rb b/activemodel/test/cases/validations_test.rb index a7269522eb..5b4f955eae 100644 --- a/activemodel/test/cases/validations_test.rb +++ b/activemodel/test/cases/validations_test.rb @@ -1,13 +1,13 @@ # encoding: utf-8 require 'cases/helper' -require 'cases/test_database' +require 'cases/tests_database' require 'models/topic' require 'models/reply' require 'models/developer' class ValidationsTest < ActiveModel::TestCase - include ActiveModel::TestDatabase + include ActiveModel::TestsDatabase include ActiveModel::ValidationsRepairHelper fixtures :topics, :developers -- cgit v1.2.3