Fix vintage syntax and add spec for creating child factories with vintage syntax

lib/factory_girl/syntax/vintage.rb

@@ -29,7 +29,7 @@ module FactoryGirl
           proxy = FactoryGirl::DefinitionProxy.new(factory)
           yield(proxy)
           if parent = options.delete(:parent)
-            factory.inherit_from(FactoryGirl.factory_by_name(parent))
+            factory.inherit_factory(FactoryGirl.factory_by_name(parent))
           end
           FactoryGirl.register_factory(factory)
         end

spec/acceptance/syntax/vintage_spec.rb

@@ -214,3 +214,21 @@ describe "an attribute generated by an in-line sequence" do
   end
 end
 
+
+describe "a factory with a parent" do
+  before do
+    define_model("User", :username => :string)
+
+    Factory.define(:user) do |factory|
+      factory.username "awesome_username"
+    end
+
+    Factory.define(:boring_user, :parent => :user) do |factory|
+      factory.username "boring_username"
+    end
+  end
+
+  it "supports defining parents" do
+    Factory.build(:boring_user).username.should == "boring_username"
+  end
+end