factory_girl 2.6.4 → 3.0.0.rc1

data/lib/factory_girl/sequence.rb

@@ -17,10 +17,6 @@ module FactoryGirl
       @value = @value.next
     end
 
-    def default_strategy
-      :create
-    end
-
     def names
       [@name]
     end

data/lib/factory_girl/step_definitions.rb

@@ -40,7 +40,7 @@ module FactoryGirlStepHelpers
         return unless association
 
         if attributes_hash = nested_attribute_hash
-          factory.build_class.first(:conditions => attributes_hash.attributes(FindAttributes)) or
+          factory.build_class.first(conditions: attributes_hash.attributes(FindAttributes)) or
           FactoryGirl.create(association.factory, attributes_hash.attributes)
         end
       end

data/lib/factory_girl/syntax/blueprint.rb

@@ -13,7 +13,7 @@ module FactoryGirl
     #     email { 'billy@bob.example.com' }
     #   end
     #
-    #   FactoryGirl.create(:user, :name => 'Johnny')
+    #   FactoryGirl.create(:user, name: 'Johnny')
     #
     # This syntax was derived from Pete Yandell's machinist.
     module Blueprint
@@ -26,7 +26,7 @@ module FactoryGirl
         module ClassMethods #:nodoc:
 
           def blueprint(&block)
-            instance = Factory.new(name.underscore, :class => self)
+            instance = Factory.new(name.underscore, class: self)
             proxy = FactoryGirl::DefinitionProxy.new(instance)
             proxy.instance_eval(&block)
             FactoryGirl.register_factory(instance)

data/lib/factory_girl/syntax/default.rb

@@ -25,7 +25,7 @@ module FactoryGirl
 
           proxy.child_factories.each do |(child_name, child_options, child_block)|
             parent_factory = child_options.delete(:parent) || name
-            factory(child_name, child_options.merge(:parent => parent_factory), &child_block)
+            factory(child_name, child_options.merge(parent: parent_factory), &child_block)
           end
         end
 

data/lib/factory_girl/syntax/generate.rb

@@ -16,7 +16,7 @@ module FactoryGirl
     #
     #   # Creates a saved instance without raising (same as saving the result
     #   # of FactoryGirl.build)
-    #   User.generate(:name => 'Johnny')
+    #   User.generate(name: 'Johnny')
     #
     #   # Creates a saved instance and raises when invalid (same as
     #   # FactoryGirl.create)

data/lib/factory_girl/syntax/make.rb

@@ -15,7 +15,7 @@ module FactoryGirl
     #     end
     #   end
     #
-    #   User.make(:name => 'Johnny')
+    #   User.make(name: 'Johnny')
     #
     # This syntax was derived from Pete Yandell's machinist.
     module Make

data/lib/factory_girl/syntax/vintage.rb

@@ -17,39 +17,17 @@ module FactoryGirl
         #   The parent factory. If specified, the attributes from the parent
         #   factory will be copied to the current one with an ability to override
         #   them.
-        # * default_strategy: +Symbol+
-        #   DEPRECATED.
-        #   The strategy that will be used by the Factory shortcut method.
-        #   Defaults to :create.
         #
         # Yields: +Factory+
         # The newly created factory.
         def self.define(name, options = {})
+          $stderr.puts "DEPRECATION WARNING: Factory.define is deprecated; use the FactoryGirl.define block syntax to declare your factory."
           factory = FactoryGirl::Factory.new(name, options)
           proxy = FactoryGirl::DefinitionProxy.new(factory)
           yield(proxy)
           FactoryGirl.register_factory(factory)
         end
 
-        # Executes the default strategy for the given factory. This is usually create,
-        # but it can be overridden for each factory.
-        #
-        # DEPRECATED
-        #
-        # Use create instead.
-        #
-        # Arguments:
-        # * name: +Symbol+ or +String+
-        #   The name of the factory that should be used.
-        # * overrides: +Hash+
-        #   Attributes to overwrite for this instance.
-        #
-        # Returns: +Object+
-        # The result of the default strategy.
-        def self.default_strategy(name, overrides = {})
-          FactoryGirl.send(FactoryGirl.factory_by_name(name).default_strategy, name, overrides)
-        end
-
         # Defines a new sequence that can be used to generate unique values in a specific format.
         #
         # Arguments:
@@ -66,6 +44,7 @@ module FactoryGirl
         #
         #   Factory.sequence(:email) {|n| "somebody_#{n}@example.com" }
         def self.sequence(name, start_value = 1, &block)
+          $stderr.puts "DEPRECATION WARNING: Factory.sequence is deprecated; use the FactoryGirl.define block syntax to declare your sequence."
           FactoryGirl.register_sequence(Sequence.new(name, start_value, &block))
         end
 
@@ -78,6 +57,7 @@ module FactoryGirl
         # Returns:
         #   The next value in the sequence. (Object)
         def self.next(name)
+          $stderr.puts "DEPRECATION WARNING: Factory.next is deprecated; use FactoryGirl.generate instead."
           FactoryGirl.generate(name)
         end
 
@@ -104,43 +84,44 @@ module FactoryGirl
         #
         #   # The user association will not be built in this example. The user_id
         #   # will be used instead.
-        #   Factory(:post, :user_id => 1)
+        #   Factory(:post, user_id: 1)
         def self.alias(pattern, replace)
+          $stderr.puts "DEPRECATION WARNING: Factory.alias is deprecated; use FactoryGirl.aliases << [pattern, replace] instead."
           FactoryGirl.aliases << [pattern, replace]
         end
 
         # Alias for FactoryGirl.attributes_for
         def self.attributes_for(name, overrides = {})
+          $stderr.puts "DEPRECATION WARNING: Factory.attributes_for is deprecated; use FactoryGirl.attributes_for instead."
           FactoryGirl.attributes_for(name, overrides)
         end
 
         # Alias for FactoryGirl.build
         def self.build(name, overrides = {})
+          $stderr.puts "DEPRECATION WARNING: Factory.build is deprecated; use FactoryGirl.build instead."
           FactoryGirl.build(name, overrides)
         end
 
         # Alias for FactoryGirl.create
         def self.create(name, overrides = {})
+          $stderr.puts "DEPRECATION WARNING: Factory.create is deprecated; use FactoryGirl.create instead."
           FactoryGirl.create(name, overrides)
         end
 
         # Alias for FactoryGirl.build_stubbed.
         def self.stub(name, overrides = {})
+          $stderr.puts "DEPRECATION WARNING: Factory.stub is deprecated; use FactoryGirl.build_stubbed instead."
           FactoryGirl.build_stubbed(name, overrides)
         end
       end
 
-      # Shortcut for Factory.default_strategy.
-      #
-      # DEPRECATION WARNING:
-      #
-      # In a future release, default_strategy will be removed and this will
-      # simply call create instead.
+      # Shortcut for Factory.create.
       #
       # Example:
-      #   Factory(:user, :name => 'Joe')
+      #   Factory(:user, name: 'Joe')
       def Factory(name, attrs = {})
-        ::Factory.default_strategy(name, attrs)
+        $stderr.puts "DEPRECATION WARNING: Factory(:name) is deprecated; use FactoryGirl.create(:name) instead."
+        FactoryGirl.create(name, attrs)
       end
     end
   end

data/lib/factory_girl/trait.rb

@@ -12,7 +12,7 @@ module FactoryGirl
     end
 
     delegate :add_callback, :declare_attribute, :to_create, :define_trait,
-             :callbacks, :attributes, :to => :@definition
+             :callbacks, :attributes, to: :@definition
 
     def names
       [@name]

data/lib/factory_girl/version.rb

@@ -1,4 +1,4 @@
 module FactoryGirl
-  VERSION = "2.6.4"
+  VERSION = "3.0.0.rc1"
 end
 

data/spec/acceptance/aliases_spec.rb

@@ -2,9 +2,9 @@ require "spec_helper"
 
 describe "aliases and overrides" do
   before do
-    Factory.alias /one/, "two"
+    FactoryGirl.aliases << [/one/, "two"]
 
-    define_model("User", :two => :string, :one => :string)
+    define_model("User", two: :string, one: :string)
 
     FactoryGirl.define do
       factory :user do
@@ -13,7 +13,7 @@ describe "aliases and overrides" do
     end
   end
 
-  subject { FactoryGirl.create(:user, :one => "override") }
+  subject { FactoryGirl.create(:user, one: "override") }
   its(:one) { should == "override" }
   its(:two) { should be_nil }
 end

data/spec/acceptance/attribute_aliases_spec.rb

@@ -2,9 +2,9 @@ require 'spec_helper'
 
 describe "attribute aliases" do
   before do
-    define_model('User', :name => :string, :age => :integer)
+    define_model('User', name: :string, age: :integer)
 
-    define_model('Post', :user_id => :integer) do
+    define_model('Post', user_id: :integer) do
       belongs_to :user
     end
 
@@ -19,14 +19,14 @@ describe "attribute aliases" do
         user
       end
 
-      factory :post_with_named_user, :class => Post do
-        user :factory => :user_with_name, :age => 20
+      factory :post_with_named_user, class: Post do
+        user factory: :user_with_name, age: 20
       end
     end
   end
 
   context "assigning an association by foreign key" do
-    subject { FactoryGirl.build(:post, :user_id => 1) }
+    subject { FactoryGirl.build(:post, user_id: 1) }
 
     it "doesn't assign both an association and its foreign key" do
       subject.user_id.should == 1

data/spec/acceptance/attribute_existing_on_object_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe "declaring attributes on a Factory that are private methods on Object" do
   before do
-    define_model("Website", :system => :boolean, :link => :string, :sleep => :integer)
+    define_model("Website", system: :boolean, link: :string, sleep: :integer)
 
     FactoryGirl.define do
       factory :website do
@@ -13,7 +13,7 @@ describe "declaring attributes on a Factory that are private methods on Object"
     end
   end
 
-  subject { FactoryGirl.build(:website, :sleep => -5) }
+  subject { FactoryGirl.build(:website, sleep: -5) }
 
   its(:system) { should == false }
   its(:link)   { should == "http://example.com" }
@@ -22,7 +22,7 @@ end
 
 describe "assigning overrides that are also private methods on object" do
   before do
-    define_model("Website",  :format => :string, :y => :integer, :more_format => :string, :some_funky_method => :string)
+    define_model("Website",  format: :string, y: :integer, more_format: :string, some_funky_method: :string)
 
     Object.class_eval do
       private
@@ -41,7 +41,7 @@ describe "assigning overrides that are also private methods on object" do
     Object.send(:undef_method, :some_funky_method)
   end
 
-  subject { FactoryGirl.build(:website, :format => "Great", :y => 12345, :some_funky_method => "foobar!") }
+  subject { FactoryGirl.build(:website, format: "Great", y: 12345, some_funky_method: "foobar!") }
   its(:format)            { should == "Great" }
   its(:y)                 { should == 12345 }
   its(:more_format)       { should == "format: Great" }
@@ -50,7 +50,7 @@ end
 
 describe "accessing methods from the instance within a dynamic attribute that is also a private method on object" do
   before do
-    define_model("Website", :more_format => :string) do
+    define_model("Website", more_format: :string) do
       def format
         "This is an awesome format"
       end

data/spec/acceptance/attributes_for_spec.rb

@@ -6,10 +6,10 @@ describe "a generated attributes hash" do
   before do
     define_model('User')
 
-    define_model('Post', :title   => :string,
-                         :body    => :string,
-                         :summary => :string,
-                         :user_id => :integer) do
+    define_model('Post', title:   :string,
+                         body:    :string,
+                         summary: :string,
+                         user_id: :integer) do
       belongs_to :user
     end
 
@@ -25,7 +25,7 @@ describe "a generated attributes hash" do
     end
   end
 
-  subject { attributes_for(:post, :title => 'overridden title') }
+  subject { attributes_for(:post, title: 'overridden title') }
 
   it "assigns an overridden value" do
     subject[:title].should == "overridden title"
@@ -49,7 +49,7 @@ describe "calling `attributes_for` with a block" do
   include FactoryGirl::Syntax::Methods
 
   before do
-    define_model('Company', :name => :string)
+    define_model('Company', name: :string)
 
     FactoryGirl.define do
       factory :company
@@ -57,7 +57,7 @@ describe "calling `attributes_for` with a block" do
   end
 
   it "passes the hash of attributes" do
-    attributes_for(:company, :name => 'thoughtbot') do |attributes|
+    attributes_for(:company, name: 'thoughtbot') do |attributes|
       attributes[:name].should eq('thoughtbot')
     end
   end
@@ -73,7 +73,7 @@ end
 
 describe "`attributes_for` for a class whose constructor has required params" do
   before do
-    define_model("User", :name => :string) do
+    define_model("User", name: :string) do
       def initialize(arg1, arg2); end
     end
 

data/spec/acceptance/attributes_from_instance_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe "calling methods on the model instance" do
   before do
-    define_model('User', :age => :integer, :age_copy => :integer) do
+    define_model('User', age: :integer, age_copy: :integer) do
       def age
         read_attribute(:age) || 18
       end
@@ -33,21 +33,21 @@ describe "calling methods on the model instance" do
 
   context "with the attribute being overridden" do
     it "uses the overridden value" do
-      FactoryGirl.build(:user, :age_copy => nil).age_copy.should be_nil
+      FactoryGirl.build(:user, age_copy: nil).age_copy.should be_nil
     end
 
     it "uses the overridden value during attributes_for" do
-      FactoryGirl.attributes_for(:user, :age_copy => 25)[:age_copy].should == 25
+      FactoryGirl.attributes_for(:user, age_copy: 25)[:age_copy].should == 25
     end
   end
 
   context "with the referenced attribute being overridden" do
     it "uses the overridden value" do
-      FactoryGirl.build(:user, :age => nil).age_copy.should be_nil
+      FactoryGirl.build(:user, age: nil).age_copy.should be_nil
     end
 
     it "uses the overridden value during attributes_for" do
-      FactoryGirl.attributes_for(:user, :age => 25)[:age_copy].should == 25
+      FactoryGirl.attributes_for(:user, age: 25)[:age_copy].should == 25
     end
   end
 end

data/spec/acceptance/attributes_ordered_spec.rb

@@ -4,10 +4,10 @@ describe "a generated attributes hash where order matters" do
   include FactoryGirl::Syntax::Methods
 
   before do
-    define_model('ParentModel', :static           => :integer,
-                                :evaluates_first  => :integer,
-                                :evaluates_second => :integer,
-                                :evaluates_third  => :integer)
+    define_model('ParentModel', static:           :integer,
+                                evaluates_first:  :integer,
+                                evaluates_second: :integer,
+                                evaluates_third:  :integer)
 
     FactoryGirl.define do
       factory :parent_model do
@@ -20,7 +20,7 @@ describe "a generated attributes hash where order matters" do
         end
       end
 
-      factory :without_parent, :class => ParentModel do
+      factory :without_parent, class: ParentModel do
         evaluates_first   { static }
         evaluates_second  { evaluates_first }
         evaluates_third   { evaluates_second }

data/spec/acceptance/build_list_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe "build multiple instances" do
   before do
-    define_model('Post', :title => :string)
+    define_model('Post', title: :string)
 
     FactoryGirl.define do
       factory(:post) do |post|
@@ -30,7 +30,7 @@ describe "build multiple instances" do
   end
 
   context "with default attributes" do
-    subject { FactoryGirl.build_list(:post, 20, :title => "The Hunting of the Snark") }
+    subject { FactoryGirl.build_list(:post, 20, title: "The Hunting of the Snark") }
 
     it "overrides the default values" do
       subject.each do |record|

data/spec/acceptance/build_spec.rb

@@ -6,7 +6,7 @@ describe "a built instance" do
   before do
     define_model('User')
 
-    define_model('Post', :user_id => :integer) do
+    define_model('Post', user_id: :integer) do
       belongs_to :user
     end
 
@@ -31,13 +31,13 @@ describe "a built instance" do
   end
 end
 
-describe "a built instance with :strategy => :build" do
+describe "a built instance with strategy: :build" do
   include FactoryGirl::Syntax::Methods
 
   before do
     define_model('User')
 
-    define_model('Post', :user_id => :integer) do
+    define_model('Post', user_id: :integer) do
       belongs_to :user
     end
 
@@ -45,7 +45,7 @@ describe "a built instance with :strategy => :build" do
       factory :user
 
       factory :post do
-        association(:user, :strategy => :build)
+        association(:user, strategy: :build)
       end
     end
   end
@@ -66,7 +66,7 @@ describe "calling `build` with a block" do
   include FactoryGirl::Syntax::Methods
 
   before do
-    define_model('Company', :name => :string)
+    define_model('Company', name: :string)
 
     FactoryGirl.define do
       factory :company
@@ -74,7 +74,7 @@ describe "calling `build` with a block" do
   end
 
   it "passes the built instance" do
-    build(:company, :name => 'thoughtbot') do |company|
+    build(:company, name: 'thoughtbot') do |company|
       company.name.should eq('thoughtbot')
     end
   end