Permalink
Browse files

Move around requires

  • Loading branch information...
1 parent 3ed2f62 commit 9472a144673c88b82ae933269d191d20a1908c30 @joshuaclayton joshuaclayton committed Nov 19, 2011
View
@@ -1,34 +1,20 @@
require "active_support/core_ext/module/delegation"
require 'factory_girl/proxy'
-require 'factory_girl/proxy/build'
-require 'factory_girl/proxy/create'
-require 'factory_girl/proxy/attributes_for'
-require 'factory_girl/proxy/stub'
require 'factory_girl/registry'
require 'factory_girl/null_factory'
require 'factory_girl/factory'
require 'factory_girl/attribute'
-require 'factory_girl/attribute/static'
-require 'factory_girl/attribute/dynamic'
-require 'factory_girl/attribute/association'
-require 'factory_girl/attribute/sequence'
require 'factory_girl/callback'
require 'factory_girl/declaration_list'
require 'factory_girl/declaration'
-require 'factory_girl/declaration/static'
-require 'factory_girl/declaration/dynamic'
-require 'factory_girl/declaration/association'
-require 'factory_girl/declaration/implicit'
require 'factory_girl/sequence'
require 'factory_girl/attribute_list'
require 'factory_girl/trait'
require 'factory_girl/aliases'
require 'factory_girl/definition'
require 'factory_girl/definition_proxy'
-require 'factory_girl/syntax/methods'
-require 'factory_girl/syntax/default'
-require 'factory_girl/syntax/vintage'
+require 'factory_girl/syntax'
require 'factory_girl/find_definitions'
require 'factory_girl/reload'
require 'factory_girl/deprecated'
@@ -1,5 +1,9 @@
-module FactoryGirl
+require "factory_girl/attribute/static"
+require "factory_girl/attribute/dynamic"
+require "factory_girl/attribute/association"
+require "factory_girl/attribute/sequence"
+module FactoryGirl
# 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
@@ -1,3 +1,8 @@
+require "factory_girl/declaration/static"
+require "factory_girl/declaration/dynamic"
+require "factory_girl/declaration/association"
+require "factory_girl/declaration/implicit"
+
module FactoryGirl
class Declaration
attr_reader :name
@@ -1,4 +1,8 @@
require "active_support/core_ext/hash/except"
+require "factory_girl/proxy/build"
+require "factory_girl/proxy/create"
+require "factory_girl/proxy/attributes_for"
+require "factory_girl/proxy/stub"
module FactoryGirl
class Proxy #:nodoc:
@@ -1,3 +1,7 @@
+require "factory_girl/syntax/methods"
+require "factory_girl/syntax/default"
+require "factory_girl/syntax/vintage"
+
module FactoryGirl
# Provides alternate syntaxes for factory_girl. If you don't like the default
# syntax for defining or using factories, look at one of the

0 comments on commit 9472a14

Please sign in to comment.