factory_girl 2.6.4 → 3.0.0.rc1

data/spec/acceptance/syntax/blueprint_spec.rb

@@ -4,9 +4,12 @@ require 'factory_girl/syntax/blueprint'
 
 describe "a blueprint" do
   before do
-    define_model('User', :first_name => :string, :last_name => :string, :email => :string)
+    define_model('User', first_name: :string, last_name: :string, email: :string)
+
+    FactoryGirl.define do
+      sequence(:email) { |n| "somebody#{n}@example.com" }
+    end
 
-    Factory.sequence(:email) { |n| "somebody#{n}@example.com" }
     User.blueprint do
       first_name { 'Bill'                       }
       last_name  { 'Nye'                        }
@@ -16,7 +19,7 @@ describe "a blueprint" do
 
   describe "after making an instance" do
     before do
-      @instance = FactoryGirl.create(:user, :last_name => 'Rye')
+      @instance = FactoryGirl.create(:user, last_name: 'Rye')
     end
 
     it "uses attributes from the blueprint" do

data/spec/acceptance/syntax/generate_spec.rb

@@ -4,7 +4,7 @@ require 'factory_girl/syntax/generate'
 
 describe "a factory using generate syntax" do
   before do
-    define_model('User', :first_name => :string, :last_name => :string, :email => :string) do
+    define_model('User', first_name: :string, last_name: :string, email: :string) do
       validates_presence_of :first_name
     end
 
@@ -18,11 +18,11 @@ describe "a factory using generate syntax" do
   end
 
   it "does not raise an error when generating an invalid instance" do
-    expect { User.generate(:first_name => nil) }.to_not raise_error
+    expect { User.generate(first_name: nil) }.to_not raise_error
   end
 
   it "raises an error when forcefully generating an invalid instance" do
-    expect { User.generate!(:first_name => nil) }.to raise_error(ActiveRecord::RecordInvalid)
+    expect { User.generate!(first_name: nil) }.to raise_error(ActiveRecord::RecordInvalid)
   end
 
   %w(generate generate! spawn).each do |method|
@@ -34,7 +34,7 @@ describe "a factory using generate syntax" do
 
     describe "after generating an instance using #{method}" do
       before do
-        @instance = User.send(method, :last_name => 'Rye')
+        @instance = User.send(method, last_name: 'Rye')
       end
 
       it "uses attributes from the factory" do

data/spec/acceptance/syntax/make_spec.rb

@@ -4,7 +4,7 @@ require 'factory_girl/syntax/make'
 
 describe "a factory using make syntax" do
   before do
-    define_model('User', :first_name => :string, :last_name => :string)
+    define_model('User', first_name: :string, last_name: :string)
 
     FactoryGirl.define do
       factory :user do
@@ -16,7 +16,7 @@ describe "a factory using make syntax" do
 
   describe "after make" do
     before do
-      @instance = User.make(:last_name => 'Rye')
+      @instance = User.make(last_name: 'Rye')
     end
 
     it "uses attributes from the factory" do
@@ -34,7 +34,7 @@ describe "a factory using make syntax" do
 
   describe "after make!" do
     before do
-      @instance = User.make!(:last_name => 'Rye')
+      @instance = User.make!(last_name: 'Rye')
     end
 
     it "uses attributes from the factory" do

data/spec/acceptance/syntax/sham_spec.rb

@@ -4,10 +4,10 @@ require 'factory_girl/syntax/sham'
 
 describe "a factory using sham syntax" do
   before do
-    define_model('User', :first_name => :string,
-                         :last_name  => :string,
-                         :email      => :string,
-                         :username   => :string)
+    define_model('User', first_name: :string,
+                         last_name:  :string,
+                         email:      :string,
+                         username:   :string)
 
     Sham.name        { "Name" }
     Sham.email       { "somebody#{rand(5)}@example.com" }
@@ -25,7 +25,7 @@ describe "a factory using sham syntax" do
 
   describe "after making an instance" do
     before do
-      @instance = FactoryGirl.create(:user, :last_name => 'Rye')
+      @instance = FactoryGirl.create(:user, last_name: 'Rye')
     end
 
     it "supports a sham called 'name'" do

data/spec/acceptance/syntax/vintage_spec.rb

@@ -2,9 +2,9 @@ require 'spec_helper'
 
 describe "vintage syntax" do
   before do
-    define_model('User', :first_name => :string,
-                         :last_name  => :string,
-                         :email      => :string)
+    define_model('User', first_name: :string,
+                         last_name:  :string,
+                         email:      :string)
 
     Factory.sequence(:email) { |n| "somebody#{n}@example.com" }
     Factory.define :user do |factory|
@@ -16,7 +16,7 @@ describe "vintage syntax" do
 
   describe "after making an instance" do
     before do
-      @instance = Factory(:user, :last_name => 'Rye')
+      @instance = Factory(:user, last_name: 'Rye')
     end
 
     it "should use attributes from the definition" do
@@ -29,14 +29,8 @@ describe "vintage syntax" do
     end
   end
 
-  it "raises an ArgumentError when trying to use a non-existent strategy" do
-    expect {
-      Factory.define(:object, :default_strategy => :nonexistent) {}
-    }.to raise_error(ArgumentError)
-  end
-
   it "raises Factory::SequenceAbuseError" do
-    Factory.define :sequence_abuser, :class => User do |factory|
+    Factory.define :sequence_abuser, class: User do |factory|
       factory.first_name { Factory.sequence(:name) }
     end
 
@@ -49,7 +43,7 @@ end
 describe Factory, "referencing a nonexistent factory as a parent" do
   it "raises an ArgumentError when trying to use a non-existent factory as parent" do
     expect {
-      Factory.define(:child, :parent => :nonexsitent) {}
+      Factory.define(:child, parent: :nonexsitent) {}
       Factory.build(:child)
     }.to raise_error(ArgumentError)
   end
@@ -58,15 +52,15 @@ end
 describe "defining a factory" do
   before do
     @name    = :user
-    @factory = stub("factory", :names => [@name])
+    @factory = stub("factory", names: [@name])
     @proxy   = "proxy"
-    @options = { :class => 'magic' }
-    FactoryGirl::Factory.stubs(:new => @factory)
-    FactoryGirl::DefinitionProxy.stubs(:new => @proxy)
+    @options = { class: 'magic' }
+    FactoryGirl::Factory.stubs(new: @factory)
+    FactoryGirl::DefinitionProxy.stubs(new: @proxy)
   end
 
   it "creates a new factory using the specified name and options" do
-    FactoryGirl::Factory.stubs(:new => @factory)
+    FactoryGirl::Factory.stubs(new: @factory)
     Factory.define(@name, @options) {|f| }
     FactoryGirl::Factory.should have_received(:new).with(@name, @options)
   end
@@ -94,39 +88,27 @@ describe "after defining a factory" do
   end
 
   it "uses Strategy::AttributesFor for Factory.attributes_for" do
-    @factory.stubs(:run => "result")
-    Factory.attributes_for(@name, :attr => 'value').should == 'result'
-    @factory.should have_received(:run).with(FactoryGirl::Strategy::AttributesFor, :attr => 'value')
+    @factory.stubs(run: "result")
+    Factory.attributes_for(@name, attr: 'value').should == 'result'
+    @factory.should have_received(:run).with(FactoryGirl::Strategy::AttributesFor, attr: 'value')
   end
 
   it "uses Strategy::Build for Factory.build" do
-    @factory.stubs(:run => "result")
-    Factory.build(@name, :attr => 'value').should == 'result'
-    @factory.should have_received(:run).with(FactoryGirl::Strategy::Build, :attr => 'value')
+    @factory.stubs(run: "result")
+    Factory.build(@name, attr: 'value').should == 'result'
+    @factory.should have_received(:run).with(FactoryGirl::Strategy::Build, attr: 'value')
   end
 
   it "uses Strategy::Create for Factory.create" do
-    @factory.stubs(:run => "result")
-    Factory.create(@name, :attr => 'value').should == 'result'
-    @factory.should have_received(:run).with(FactoryGirl::Strategy::Create, :attr => 'value')
+    @factory.stubs(run: "result")
+    Factory.create(@name, attr: 'value').should == 'result'
+    @factory.should have_received(:run).with(FactoryGirl::Strategy::Create, attr: 'value')
   end
 
   it "uses Strategy::Stub for Factory.stub" do
-    @factory.stubs(:run => "result")
-    Factory.stub(@name, :attr => 'value').should == 'result'
-    @factory.should have_received(:run).with(FactoryGirl::Strategy::Stub, :attr => 'value')
-  end
-
-  it "uses default strategy option as Factory.default_strategy" do
-    @factory.stubs(:default_strategy => :create, :run => "result")
-    Factory.default_strategy(@name, :attr => 'value').should == 'result'
-    @factory.should have_received(:run).with(FactoryGirl::Strategy::Create, :attr => 'value')
-  end
-
-  it "uses the default strategy for the global Factory method" do
-    @factory.stubs(:default_strategy => :create, :run => "result")
-    Factory(@name, :attr => 'value').should == 'result'
-    @factory.should have_received(:run).with(FactoryGirl::Strategy::Create, :attr => 'value')
+    @factory.stubs(run: "result")
+    Factory.stub(@name, attr: 'value').should == 'result'
+    @factory.should have_received(:run).with(FactoryGirl::Strategy::Stub, attr: 'value')
   end
 
   [:build, :create, :attributes_for, :stub].each do |method|
@@ -169,8 +151,8 @@ describe "after defining a sequence" do
     @sequence = FactoryGirl::Sequence.new(@name) {}
     @value    = '1 2 5'
 
-    @sequence.stubs(:next => @value)
-    FactoryGirl::Sequence.stubs(:new => @sequence)
+    @sequence.stubs(next: @value)
+    FactoryGirl::Sequence.stubs(new: @sequence)
 
     Factory.sequence(@name) {}
   end
@@ -187,7 +169,7 @@ end
 
 describe "an attribute generated by an in-line sequence" do
   before do
-    define_model('User', :username => :string)
+    define_model('User', username: :string)
 
     Factory.define :user do |factory|
       factory.sequence(:username) { |n| "username#{n}" }
@@ -218,13 +200,13 @@ end
 
 describe "a factory with a parent" do
   before do
-    define_model("User", :username => :string)
+    define_model("User", username: :string)
 
     Factory.define(:user) do |factory|
       factory.username "awesome_username"
     end
 
-    Factory.define(:boring_user, :parent => :user) do |factory|
+    Factory.define(:boring_user, parent: :user) do |factory|
       factory.username "boring_username"
     end
   end

data/spec/acceptance/traits_spec.rb

@@ -3,15 +3,15 @@ require "spec_helper"
 describe "an instance generated by a factory with multiple traits" do
   before do
     define_model("User",
-                 :name          => :string,
-                 :admin         => :boolean,
-                 :gender        => :string,
-                 :email         => :string,
-                 :date_of_birth => :date,
-                 :great         => :string)
+                 name:          :string,
+                 admin:         :boolean,
+                 gender:        :string,
+                 email:         :string,
+                 date_of_birth: :date,
+                 great:         :string)
 
     FactoryGirl.define do
-      factory :user_without_admin_scoping, :class => User do
+      factory :user_without_admin_scoping, class: User do
         admin_trait
       end
 
@@ -44,7 +44,7 @@ describe "an instance generated by a factory with multiple traits" do
           great
         end
 
-        factory :admin, :traits => [:admin]
+        factory :admin, traits: [:admin]
 
         factory :male_user do
           male
@@ -54,7 +54,7 @@ describe "an instance generated by a factory with multiple traits" do
           end
         end
 
-        factory :female, :traits => [:female] do
+        factory :female, traits: [:female] do
           trait :admin do
             admin true
             name "Judy"
@@ -64,19 +64,19 @@ describe "an instance generated by a factory with multiple traits" do
             great
           end
 
-          factory :female_admin_judy, :traits => [:admin]
+          factory :female_admin_judy, traits: [:admin]
         end
 
-        factory :female_admin,            :traits => [:female, :admin]
-        factory :female_after_male_admin, :traits => [:male, :female, :admin]
-        factory :male_after_female_admin, :traits => [:female, :male, :admin]
+        factory :female_admin,            traits: [:female, :admin]
+        factory :female_after_male_admin, traits: [:male, :female, :admin]
+        factory :male_after_female_admin, traits: [:female, :male, :admin]
       end
 
       trait :email do
         email { "#{name}@example.com" }
       end
 
-      factory :user_with_email, :class => User, :traits => [:email] do
+      factory :user_with_email, class: User, traits: [:email] do
         name "Bill"
       end
     end
@@ -111,7 +111,7 @@ describe "an instance generated by a factory with multiple traits" do
   end
 
   context "the child with multiple traits and overridden attributes" do
-    subject      { FactoryGirl.create(:female_admin, :name => "Jill", :gender => nil) }
+    subject      { FactoryGirl.create(:female_admin, name: "Jill", gender: nil) }
     its(:name)   { should == "Jill" }
     its(:gender) { should be_nil }
     it           { should be_admin }
@@ -157,7 +157,7 @@ describe "an instance generated by a factory with multiple traits" do
   end
 
   context "factory created with alternate syntax where trait name and attribute are the same and attribute is overridden" do
-    subject     { FactoryGirl.create(:great_user, :great => "SORT OF!!!") }
+    subject     { FactoryGirl.create(:great_user, great: "SORT OF!!!") }
     its(:great) { should == "SORT OF!!!" }
   end
 
@@ -180,7 +180,7 @@ end
 
 describe "traits with callbacks" do
   before do
-    define_model("User", :name => :string)
+    define_model("User", name: :string)
 
     FactoryGirl.define do
       factory :user do
@@ -194,8 +194,8 @@ describe "traits with callbacks" do
           after_create {|user| user.name = "awesome" }
         end
 
-        factory :caps_user, :traits => [:great]
-        factory :awesome_user, :traits => [:great, :awesome]
+        factory :caps_user, traits: [:great]
+        factory :awesome_user, traits: [:great, :awesome]
 
         factory :caps_user_implicit_trait do
           great
@@ -221,7 +221,7 @@ end
 
 describe "traits added via strategy" do
   before do
-    define_model("User", :name => :string, :admin => :boolean)
+    define_model("User", name: :string, admin: :boolean)
 
     FactoryGirl.define do
       factory :user do
@@ -239,7 +239,7 @@ describe "traits added via strategy" do
   end
 
   context "adding traits in create" do
-    subject { FactoryGirl.create(:user, :admin, :great, :name => "Joe") }
+    subject { FactoryGirl.create(:user, :admin, :great, name: "Joe") }
 
     its(:admin) { should be_true }
     its(:name)  { should == "JOE" }
@@ -252,7 +252,7 @@ describe "traits added via strategy" do
   end
 
   context "adding traits in build" do
-    subject { FactoryGirl.build(:user, :admin, :great, :name => "Joe") }
+    subject { FactoryGirl.build(:user, :admin, :great, name: "Joe") }
 
     its(:admin) { should be_true }
     its(:name)  { should == "Joe" }
@@ -266,14 +266,14 @@ describe "traits added via strategy" do
   end
 
   context "adding traits in build_stubbed" do
-    subject { FactoryGirl.build_stubbed(:user, :admin, :great, :name => "Jack") }
+    subject { FactoryGirl.build_stubbed(:user, :admin, :great, name: "Jack") }
 
     its(:admin) { should be_true }
     its(:name)  { should == "Jack" }
   end
 
   context "adding traits in create_list" do
-    subject { FactoryGirl.create_list(:user, 2, :admin, :great, :name => "Joe") }
+    subject { FactoryGirl.create_list(:user, 2, :admin, :great, name: "Joe") }
 
     its(:length) { should == 2 }
 
@@ -286,7 +286,7 @@ describe "traits added via strategy" do
   end
 
   context "adding traits in build_list" do
-    subject { FactoryGirl.build_list(:user, 2, :admin, :great, :name => "Joe") }
+    subject { FactoryGirl.build_list(:user, 2, :admin, :great, name: "Joe") }
 
     its(:length) { should == 2 }
 
@@ -301,7 +301,7 @@ end
 
 describe "traits and dynamic attributes that are applied simultaneously" do
   before do
-    define_model("User", :name => :string, :email => :string, :combined => :string)
+    define_model("User", name: :string, email: :string, combined: :string)
 
     FactoryGirl.define do
       trait :email do
@@ -328,7 +328,7 @@ describe "applying inline traits" do
       has_many :posts
     end
 
-    define_model("Post", :user_id => :integer) do
+    define_model("Post", user_id: :integer) do
       belongs_to :user
     end
 
@@ -350,7 +350,7 @@ end
 
 describe "inline traits overriding existing attributes" do
   before do
-    define_model("User", :status => :string)
+    define_model("User", status: :string)
 
     FactoryGirl.define do
       factory :user do
@@ -359,8 +359,8 @@ describe "inline traits overriding existing attributes" do
         trait(:accepted) { status "accepted" }
         trait(:declined) { status "declined" }
 
-        factory :declined_user, :traits => [:declined]
-        factory :extended_declined_user, :traits => [:declined] do
+        factory :declined_user, traits: [:declined]
+        factory :extended_declined_user, traits: [:declined] do
           status "extended_declined"
         end
       end
@@ -392,13 +392,13 @@ describe "inline traits overriding existing attributes" do
   end
 
   it "prefers overridden attributes over attributes from traits, inline traits, or attributes on factories" do
-    FactoryGirl.build(:extended_declined_user, :accepted, :status => "completely overridden").status.should == "completely overridden"
+    FactoryGirl.build(:extended_declined_user, :accepted, status: "completely overridden").status.should == "completely overridden"
   end
 end
 
 describe "making sure the factory is properly compiled the first time we want to instantiate it" do
   before do
-    define_model("User", :role => :string, :gender => :string, :age => :integer)
+    define_model("User", role: :string, gender: :string, age: :integer)
 
     FactoryGirl.define do
       factory :user do
@@ -413,7 +413,7 @@ describe "making sure the factory is properly compiled the first time we want to
   end
 
   it "can honor traits on the very first call" do
-    user = FactoryGirl.build(:female_user, :admin, :age => 30)
+    user = FactoryGirl.build(:female_user, :admin, age: 30)
     user.gender.should == 'female'
     user.age.should == 30
     user.role.should == 'admin'