Simplify trait assignment when constructing a factory

lib/factory_girl/factory.rb

@@ -40,10 +40,10 @@ module FactoryGirl
       @parent_factory   = nil
       @parent           = options[:parent]
       @aliases          = options[:aliases] || []
+      @traits           = options[:traits]  || []
       @class_name       = options[:class]
       @default_strategy = options[:default_strategy]
       @defined_traits   = []
-      @traits           = []
       @children         = []
       @attribute_list   = AttributeList.new
       @compiled         = false
@@ -71,10 +71,6 @@ module FactoryGirl
       @children << factory unless @children.include?(factory)
     end
 
-    def inherit_traits(traits)
-      @traits = traits
-    end
-
     def define_trait(trait)
       @defined_traits << trait
     end

lib/factory_girl/syntax/default.rb

@@ -21,10 +21,6 @@ module FactoryGirl
           proxy = FactoryGirl::DefinitionProxy.new(factory)
           proxy.instance_eval(&block) if block_given?
 
-          if traits = options.delete(:traits)
-            factory.inherit_traits(traits)
-          end
-
           if parent = options.delete(:parent)
             factory.inherit_factory(FactoryGirl.factory_by_name(parent))
           end