factory_girl 2.6.4 → 3.0.0.rc1

data/spec/acceptance/build_stubbed_spec.rb

@@ -6,10 +6,10 @@ describe "a generated stub instance" do
   before do
     define_model('User')
 
-    define_model('Post', :title   => :string,
-                         :body    => :string,
-                         :age     => :integer,
-                         :user_id => :integer) do
+    define_model('Post', title:   :string,
+                         body:    :string,
+                         age:     :integer,
+                         user_id: :integer) do
       belongs_to :user
     end
 
@@ -24,7 +24,7 @@ describe "a generated stub instance" do
     end
   end
 
-  subject { build_stubbed(:post, :title => 'overridden title') }
+  subject { build_stubbed(:post, title: 'overridden title') }
 
   it "assigns a default attribute" do
     subject.body.should == 'default body'
@@ -80,7 +80,7 @@ describe "calling `build_stubbed` 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
@@ -88,7 +88,7 @@ describe "calling `build_stubbed` with a block" do
   end
 
   it "passes the stub instance" do
-    build_stubbed(:company, :name => 'thoughtbot') do |company|
+    build_stubbed(:company, name: 'thoughtbot') do |company|
       company.name.should eq('thoughtbot')
       expect { company.save }.to raise_error(RuntimeError)
     end

data/spec/acceptance/callbacks_spec.rb

@@ -2,16 +2,16 @@ require 'spec_helper'
 
 describe "callbacks" 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_with_callbacks, :class => :user do
+      factory :user_with_callbacks, class: :user do
         after_stub   { |user| user.first_name = 'Stubby' }
         after_build  { |user| user.first_name = 'Buildy' }
         after_create { |user| user.last_name  = 'Createy' }
       end
 
-      factory :user_with_inherited_callbacks, :parent => :user_with_callbacks do
+      factory :user_with_inherited_callbacks, parent: :user_with_callbacks do
         after_stub  { |user| user.last_name  = 'Double-Stubby' }
         after_build { |user| user.first_name = 'Child-Buildy' }
       end

data/spec/acceptance/create_list_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe "create 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 "create multiple instances" do
   end
 
   context "with default attributes" do
-    subject { FactoryGirl.create_list(:post, 20, :title => "The Hunting of the Snark") }
+    subject { FactoryGirl.create_list(:post, 20, title: "The Hunting of the Snark") }
 
     it "overrides the default values" do
       subject.each do |record|
@@ -42,11 +42,11 @@ end
 
 describe "multiple creates and ignored attributes to dynamically build attribute lists" do
   before do
-    define_model('User', :name => :string) do
+    define_model('User', name: :string) do
       has_many :posts
     end
 
-    define_model('Post', :title => :string, :user_id => :integer) do
+    define_model('Post', title: :string, user_id: :integer) do
       belongs_to :user
     end
 
@@ -65,7 +65,7 @@ describe "multiple creates and ignored attributes to dynamically build attribute
           end
 
           after_create do |user, evaluator|
-            FactoryGirl.create_list(:post, evaluator.posts_count, :user => user)
+            FactoryGirl.create_list(:post, evaluator.posts_count, user: user)
           end
         end
       end
@@ -77,6 +77,6 @@ describe "multiple creates and ignored attributes to dynamically build attribute
   end
 
   it "allows the number of posts to be modified" do
-    FactoryGirl.create(:user_with_posts, :posts_count => 2).posts.length.should == 2
+    FactoryGirl.create(:user_with_posts, posts_count: 2).posts.length.should == 2
   end
 end

data/spec/acceptance/create_spec.rb

@@ -6,7 +6,7 @@ describe "a created 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,59 +31,30 @@ describe "a created instance" do
   end
 end
 
-describe "a created instance, specifying :strategy => build" do
+describe "a created instance, specifying strategy: :build" do
   include FactoryGirl::Syntax::Methods
 
-  def define_factories_with_method
-    FactoryGirl.define do
-      factory :user
+  before do
+    define_model('User')
 
-      factory :post do
-        association(:user, :method => :build)
-      end
+    define_model('Post', user_id: :integer) do
+      belongs_to :user
     end
-  end
 
-  def define_factories_with_strategy
     FactoryGirl.define do
       factory :user
 
       factory :post do
-        association(:user, :strategy => :build)
+        association(:user, strategy: :build)
       end
     end
   end
 
-  before do
-    define_model('User')
-
-    define_model('Post', :user_id => :integer) do
-      belongs_to :user
-    end
-  end
-
-  context "associations declared with :strategy" do
-    before  { define_factories_with_strategy }
-    subject { build_stubbed(:post) }
-
-    subject { create('post') }
-
-    it "still saves associations (:strategy => :build only affects build, not create)" do
-      subject.user.should be_kind_of(User)
-      subject.user.should_not be_new_record
-    end
-  end
-
-  context "associations declared with :method" do
-    before  { define_factories_with_method }
-    subject { build_stubbed(:post) }
-
-    subject { create('post') }
+  subject { create(:post) }
 
-    it "still saves associations (:method => :build only affects build, not create)" do
-      subject.user.should be_kind_of(User)
-      subject.user.should_not be_new_record
-    end
+  it "saves associations (strategy: :build only affects build, not create)" do
+    subject.user.should be_kind_of(User)
+    subject.user.should_not be_new_record
   end
 end
 
@@ -123,7 +94,7 @@ describe "calling `create` 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
@@ -131,7 +102,7 @@ describe "calling `create` with a block" do
   end
 
   it "passes the created instance" do
-    create(:company, :name => 'thoughtbot') do |company|
+    create(:company, name: 'thoughtbot') do |company|
       company.name.should eq('thoughtbot')
     end
   end

data/spec/acceptance/define_child_before_parent_spec.rb

@@ -2,10 +2,10 @@ require "spec_helper"
 
 describe "defining a child factory before a parent" do
   before do
-    define_model("User", :name => :string, :admin => :boolean, :email => :string, :upper_email => :string, :login => :string)
+    define_model("User", name: :string, admin: :boolean, email: :string, upper_email: :string, login: :string)
 
     FactoryGirl.define do
-      factory :admin, :parent => :user do
+      factory :admin, parent: :user do
         admin true
       end
 

data/spec/acceptance/definition_spec.rb

@@ -2,12 +2,12 @@ require 'spec_helper'
 
 describe "an instance generated by a factory with a custom class name" do
   before do
-    define_model("User", :admin => :boolean)
+    define_model("User", admin: :boolean)
 
     FactoryGirl.define do
       factory :user
 
-      factory :admin, :class => User do
+      factory :admin, class: User do
         admin { true }
       end
     end

data/spec/acceptance/initialize_with_spec.rb

@@ -4,9 +4,9 @@ describe "initialize_with with non-FG attributes" do
   include FactoryGirl::Syntax::Methods
 
   before do
-    define_model("User", :name => :string, :age => :integer) do
+    define_model("User", name: :string, age: :integer) do
       def self.construct(name, age)
-        new(:name => name, :age => age)
+        new(name: name, age: age)
       end
     end
 
@@ -26,9 +26,9 @@ describe "initialize_with with FG attributes that are ignored" do
   include FactoryGirl::Syntax::Methods
 
   before do
-    define_model("User", :name => :string) do
+    define_model("User", name: :string) do
       def self.construct(name)
-        new(:name => "#{name} from .construct")
+        new(name: "#{name} from .construct")
       end
     end
 
@@ -51,9 +51,9 @@ describe "initialize_with with FG attributes that are not ignored" do
   include FactoryGirl::Syntax::Methods
 
   before do
-    define_model("User", :name => :string) do
+    define_model("User", name: :string) do
       def self.construct(name)
-        new(:name => "#{name} from .construct")
+        new(name: "#{name} from .construct")
       end
     end
 
@@ -98,7 +98,7 @@ describe "initialize_with non-ORM-backed objects" do
   end
 
   it "allows for overrides" do
-    build(:report_generator, :name => "Overridden").name.should == "Overridden"
+    build(:report_generator, name: "Overridden").name.should == "Overridden"
   end
 
   it "generates random data" do

data/spec/acceptance/modify_factories_spec.rb

@@ -4,7 +4,7 @@ describe "modifying factories" do
   include FactoryGirl::Syntax::Methods
 
   before do
-    define_model('User', :name => :string, :admin => :boolean, :email => :string, :login => :string)
+    define_model('User', name: :string, admin: :boolean, email: :string, login: :string)
 
     FactoryGirl.define do
       sequence(:email) {|n| "user#{n}@example.com" }
@@ -114,14 +114,14 @@ describe "modifying factories" do
       end
 
       context "overriding dynamic attributes" do
-        subject     { create(:user, :email => "perfect@example.com") }
+        subject     { create(:user, email: "perfect@example.com") }
 
         its(:name)  { should == "Great User" }
         its(:email) { should == "perfect@example.com" }
       end
 
       context "overriding static attributes" do
-        subject     { create(:user, :name => "wonderful") }
+        subject     { create(:user, name: "wonderful") }
 
         its(:name)  { should == "wonderful" }
         its(:email) { should == "wonderful-modified@example.com" }
@@ -138,7 +138,7 @@ describe "modifying factories" do
       end
 
       context "overriding dynamic attributes" do
-        subject     { create(:admin, :email => "perfect@example.com") }
+        subject     { create(:admin, email: "perfect@example.com") }
 
         its(:name)  { should == "Great User" }
         its(:email) { should == "perfect@example.com" }
@@ -146,7 +146,7 @@ describe "modifying factories" do
       end
 
       context "overriding static attributes" do
-        subject     { create(:admin, :name => "wonderful") }
+        subject     { create(:admin, name: "wonderful") }
 
         its(:name)  { should == "wonderful" }
         its(:email) { should == "wonderful-modified@example.com" }

data/spec/acceptance/modify_inherited_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe "modifying inherited factories with traits" do
   before do
-    define_model('User', :gender => :string, :admin => :boolean, :age => :integer)
+    define_model('User', gender: :string, admin: :boolean, age: :integer)
     FactoryGirl.define do
       factory :user do
         trait(:female) { gender "Female" }
@@ -29,13 +29,13 @@ describe "modifying inherited factories with traits" do
   end
 
   it "returns the correct value for overridden attributes from traits" do
-    Factory.build(:male_user).gender.should == "Male"
+    FactoryGirl.build(:male_user).gender.should == "Male"
   end
 
   it "returns the correct value for overridden attributes from traits defining multiple attributes" do
-    Factory.build(:female_user).gender.should == "Female"
-    Factory.build(:female_user).age.should == 25
-    Factory.build(:female_user).admin.should == true
+    FactoryGirl.build(:female_user).gender.should == "Female"
+    FactoryGirl.build(:female_user).age.should == 25
+    FactoryGirl.build(:female_user).admin.should == true
   end
 
   it "allows modification of attributes created via traits" do
@@ -45,8 +45,8 @@ describe "modifying inherited factories with traits" do
       end
     end
 
-    Factory.build(:male_user).gender.should == "Male"
-    Factory.build(:male_user).age.should == 20
-    Factory.build(:male_user).admin.should == true
+    FactoryGirl.build(:male_user).gender.should == "Male"
+    FactoryGirl.build(:male_user).age.should == 20
+    FactoryGirl.build(:male_user).admin.should == true
   end
 end

data/spec/acceptance/overrides_spec.rb

@@ -3,10 +3,10 @@ require 'active_support/ordered_hash'
 
 describe "attribute overrides" do
   before do
-    define_model('User', :admin    => :boolean)
-    define_model('Post', :title    => :string,
-                         :secure   => :boolean,
-                         :user_id  => :integer) do
+    define_model('User', admin:   :boolean)
+    define_model('Post', title:   :string,
+                         secure:  :boolean,
+                         user_id: :integer) do
       belongs_to :user
 
       def secure=(value)

data/spec/acceptance/parent_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe "an instance generated by a factory that inherits from another factory" do
   before do
-    define_model("User", :name => :string, :admin => :boolean, :email => :string, :upper_email => :string, :login => :string)
+    define_model("User", name: :string, admin: :boolean, email: :string, upper_email: :string, login: :string)
 
     FactoryGirl.define do
       factory :user do
@@ -67,7 +67,7 @@ end
 
 describe "nested factories with different parents" do
   before do
-    define_model("User", :name => :string)
+    define_model("User", name: :string)
 
     FactoryGirl.define do
       factory :user do
@@ -77,7 +77,7 @@ describe "nested factories with different parents" do
           name "John Doe"
         end
 
-        factory :uppercase_male_user, :parent => :male_user do
+        factory :uppercase_male_user, parent: :male_user do
           after_build {|user| user.name = user.name.upcase }
         end
       end

data/spec/acceptance/stub_spec.rb

@@ -6,7 +6,7 @@ describe "a stubbed 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
 
@@ -34,58 +34,29 @@ end
 describe "a stubbed instance overriding strategy" do
   include FactoryGirl::Syntax::Methods
 
-  def define_factories_with_method
-    FactoryGirl.define do
-      factory :user
-
-      factory :post do
-        association(:user, :method => :build)
-      end
+  before do
+    define_model('User')
+    define_model('Post', user_id: :integer) do
+      belongs_to :user
     end
-  end
 
-  def define_factories_with_strategy
     FactoryGirl.define do
       factory :user
 
       factory :post do
-        association(:user, :strategy => :build)
+        association(:user, strategy: :build)
       end
     end
   end
 
-  before do
-    define_model('User')
-    define_model('Post', :user_id => :integer) do
-      belongs_to :user
-    end
-  end
-
-  context "associations declared with :strategy" do
-    before  { define_factories_with_strategy }
-    subject { build_stubbed(:post) }
-
-    it "acts as if it is saved in the database" do
-      should_not be_new_record
-    end
+  subject { build_stubbed(:post) }
 
-    it "assigns associations and acts as if it is saved" do
-      subject.user.should be_kind_of(User)
-      subject.user.should_not be_new_record
-    end
+  it "acts as if it is saved in the database" do
+    should_not be_new_record
   end
 
-  context "associations declared with :method" do
-    before  { define_factories_with_method }
-    subject { build_stubbed(:post) }
-
-    it "acts as if it is saved in the database" do
-      should_not be_new_record
-    end
-
-    it "assigns associations and acts as if it is saved" do
-      subject.user.should be_kind_of(User)
-      subject.user.should_not be_new_record
-    end
+  it "assigns associations and acts as if it is saved" do
+    subject.user.should be_kind_of(User)
+    subject.user.should_not be_new_record
   end
 end