aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/fixtures.rb
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2012-03-22 16:25:48 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2012-03-22 16:25:48 -0700
commitb4115fdbc0599d80103d66e56595f9f876087ae5 (patch)
treecdfe881b6134ae38eb2cba018289112d144cb9aa /activerecord/lib/active_record/fixtures.rb
parentfad83d8cbbbd0862a758a1c09c7dcc6f74a25d60 (diff)
downloadrails-b4115fdbc0599d80103d66e56595f9f876087ae5.tar.gz
rails-b4115fdbc0599d80103d66e56595f9f876087ae5.tar.bz2
rails-b4115fdbc0599d80103d66e56595f9f876087ae5.zip
properly namespace the fixture exception
Diffstat (limited to 'activerecord/lib/active_record/fixtures.rb')
-rw-r--r--activerecord/lib/active_record/fixtures.rb8
1 files changed, 2 insertions, 6 deletions
diff --git a/activerecord/lib/active_record/fixtures.rb b/activerecord/lib/active_record/fixtures.rb
index 5c42e8f719..9796b0a321 100644
--- a/activerecord/lib/active_record/fixtures.rb
+++ b/activerecord/lib/active_record/fixtures.rb
@@ -4,16 +4,12 @@ require 'zlib'
require 'active_support/dependencies'
require 'active_support/core_ext/object/blank'
require 'active_record/fixtures/file'
+require 'active_record/errors'
-if defined? ActiveRecord
+module ActiveRecord
class FixtureClassNotFound < ActiveRecord::ActiveRecordError #:nodoc:
end
-else
- class FixtureClassNotFound < StandardError #:nodoc:
- end
-end
-module ActiveRecord
# \Fixtures are a way of organizing data that you want to test against; in short, sample data.
#
# They are stored in YAML files, one file per model, which are placed in the directory