Skip to content

Commit

Permalink
Move errors to separate file
Browse files Browse the repository at this point in the history
  • Loading branch information
joshuaclayton committed Feb 8, 2012
1 parent 6cddb37 commit 98626c9
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 18 deletions.
19 changes: 1 addition & 18 deletions lib/factory_girl.rb
@@ -1,5 +1,6 @@
require "active_support/core_ext/module/delegation"

require 'factory_girl/errors'
require 'factory_girl/proxy'
require 'factory_girl/registry'
require 'factory_girl/null_factory'
Expand Down Expand Up @@ -29,24 +30,6 @@
end

module FactoryGirl
# Raised when a factory is defined that attempts to instantiate itself.
class AssociationDefinitionError < RuntimeError; end

# Raised when a callback is defined that has an invalid name
class InvalidCallbackNameError < RuntimeError; end

# Raised when a factory is defined with the same name as a previously-defined factory.
class DuplicateDefinitionError < RuntimeError; end

# Raised when calling Factory.sequence from a dynamic attribute block
class SequenceAbuseError < RuntimeError; end

# Raised when defining an invalid attribute:
# * Defining an attribute which has a name ending in "="
# * Defining an attribute with both a static and lazy value
# * Defining an attribute twice in the same factory
class AttributeDefinitionError < RuntimeError; end

def self.factories
@factories ||= Registry.new("Factory")
end
Expand Down
19 changes: 19 additions & 0 deletions lib/factory_girl/errors.rb
@@ -0,0 +1,19 @@
module FactoryGirl
# Raised when a factory is defined that attempts to instantiate itself.
class AssociationDefinitionError < RuntimeError; end

# Raised when a callback is defined that has an invalid name
class InvalidCallbackNameError < RuntimeError; end

# Raised when a factory is defined with the same name as a previously-defined factory.
class DuplicateDefinitionError < RuntimeError; end

# Raised when calling Factory.sequence from a dynamic attribute block
class SequenceAbuseError < RuntimeError; end

# Raised when defining an invalid attribute:
# * Defining an attribute which has a name ending in "="
# * Defining an attribute with both a static and lazy value
# * Defining an attribute twice in the same factory
class AttributeDefinitionError < RuntimeError; end
end

0 comments on commit 98626c9

Please sign in to comment.