factory_girl 4.4.0 → 4.5.0

data/lib/factory_girl/strategy/stub.rb

@@ -33,27 +33,27 @@ module FactoryGirl
           end
 
           def save(*args)
-            raise 'stubbed models are not allowed to access the database'
+            raise "stubbed models are not allowed to access the database - #{self.class.to_s}#save(#{args.join(",")})"
           end
 
           def destroy(*args)
-            raise 'stubbed models are not allowed to access the database'
+            raise "stubbed models are not allowed to access the database - #{self.class.to_s}#destroy(#{args.join(",")})"
           end
 
           def connection
-            raise 'stubbed models are not allowed to access the database'
+            raise "stubbed models are not allowed to access the database - #{self.class.to_s}#connection()"
           end
 
           def reload
-            raise 'stubbed models are not allowed to access the database'
+            raise "stubbed models are not allowed to access the database - #{self.class.to_s}#reload()"
           end
 
           def update_attribute(*args)
-            raise 'stubbed models are not allowed to access the database'
+            raise "stubbed models are not allowed to access the database - #{self.class.to_s}#update_attribute(#{args.join(",")})"
           end
 
           def update_column(*args)
-            raise 'stubbed models are not allowed to access the database'
+            raise "stubbed models are not allowed to access the database - #{self.class.to_s}#update_column(#{args.join(",")})"
           end
         end
 

data/lib/factory_girl/version.rb

@@ -1,3 +1,3 @@
 module FactoryGirl
-  VERSION = '4.4.0'
+  VERSION = '4.5.0'
 end

data/spec/acceptance/create_list_spec.rb

@@ -55,7 +55,7 @@ describe "create multiple instances" do
   end
 end
 
-describe "multiple creates and ignored attributes to dynamically build attribute lists" do
+describe "multiple creates and transient attributes to dynamically build attribute lists" do
   before do
     define_model('User', name: :string) do
       has_many :posts
@@ -75,7 +75,7 @@ describe "multiple creates and ignored attributes to dynamically build attribute
         name "John Doe"
 
         factory :user_with_posts do
-          ignore do
+          transient do
             posts_count 5
           end
 

data/spec/acceptance/initialize_with_spec.rb

@@ -22,7 +22,7 @@ describe "initialize_with with non-FG attributes" do
   its(:age)  { should eq 21 }
 end
 
-describe "initialize_with with FG attributes that are ignored" do
+describe "initialize_with with FG attributes that are transient" do
   include FactoryGirl::Syntax::Methods
 
   before do
@@ -34,7 +34,7 @@ describe "initialize_with with FG attributes that are ignored" do
 
     FactoryGirl.define do
       factory :user do
-        ignore do
+        transient do
           name { "Handsome Chap" }
         end
 
@@ -64,7 +64,7 @@ describe "initialize_with non-ORM-backed objects" do
       sequence(:random_data) { 5.times.map { Kernel.rand(200) } }
 
       factory :report_generator do
-        ignore do
+        transient do
           name "My Awesome Report"
         end
 
@@ -94,14 +94,14 @@ describe "initialize_with parent and child factories" do
 
     FactoryGirl.define do
       factory :awesome do
-        ignore do
+        transient do
           name "Great"
         end
 
         initialize_with { Awesome.new(name) }
 
         factory :sub_awesome do
-          ignore do
+          transient do
             name "Sub"
           end
         end
@@ -134,7 +134,7 @@ describe "initialize_with implicit constructor" do
 
     FactoryGirl.define do
       factory :awesome do
-        ignore do
+        transient do
           name "Great"
         end
 
@@ -195,7 +195,7 @@ describe "initialize_with has access to all attributes for construction" do
       sequence(:email) { |n| "person#{n}@example.com" }
 
       factory :user do
-        ignore do
+        transient do
           ignored "of course!"
         end
 

data/spec/acceptance/lint_spec.rb

@@ -19,8 +19,8 @@ describe 'FactoryGirl.lint' do
     error_message = <<-ERROR_MESSAGE.strip
 The following factories are invalid:
 
-* user
-* admin_user
+* user - Validation failed: Name can't be blank (ActiveRecord::RecordInvalid)
+* admin_user - Validation failed: Name can't be blank (ActiveRecord::RecordInvalid)
     ERROR_MESSAGE
 
     expect do
@@ -42,14 +42,24 @@ The following factories are invalid:
     expect { FactoryGirl.lint }.not_to raise_error
   end
 
-  it 'supports models which do not respond to #valid?' do
-    define_class 'Thing'
+  it 'allows for selective linting' do
+    define_model 'InvalidThing', name: :string do
+      validates :name, presence: true
+    end
+
+    define_model 'ValidThing', name: :string
 
     FactoryGirl.define do
-      factory :thing
+      factory :valid_thing
+      factory :invalid_thing
     end
 
-    expect(Thing.new).not_to respond_to(:valid?)
-    expect { FactoryGirl.lint }.not_to raise_error
+    expect do
+      only_valid_factories = FactoryGirl.factories.reject do |factory|
+        factory.name =~ /invalid/
+      end
+
+      FactoryGirl.lint only_valid_factories
+    end.not_to raise_error
   end
 end

data/spec/acceptance/private_attributes_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+describe 'setting private attributes' do
+  it 'raises a NoMethodError' do
+    define_class('User') do
+      private
+      attr_accessor :foo
+    end
+
+    FactoryGirl.define do
+      factory :user do
+        foo 123
+      end
+    end
+
+    expect do
+      FactoryGirl.build(:user)
+    end.to raise_error NoMethodError, /foo=/
+  end
+end

data/spec/acceptance/transient_attributes_spec.rb

@@ -8,7 +8,7 @@ describe "transient attributes" do
       sequence(:name) { |n| "John #{n}" }
 
       factory :user do
-        ignore do
+        transient do
           four     { 2 + 2 }
           rockstar true
           upcased  false
@@ -67,6 +67,33 @@ describe "transient attributes" do
       expect(rockstar.name).to eq "John 1 - Rockstar"
     end
   end
+
+  context "using aliased 'ignore' method name" do
+    around do |example|
+      cached_silenced = ActiveSupport::Deprecation.silenced
+      ActiveSupport::Deprecation.silenced = true
+      example.run
+      ActiveSupport::Deprecation.silenced = cached_silenced
+    end
+
+    before do
+      FactoryGirl.define do
+        factory :user_using_ignore, class: User do
+          ignore do
+            honorific "Esteemed"
+          end
+
+          name { "#{honorific} Jane Doe" }
+        end
+      end
+    end
+
+    let(:esteemed) { FactoryGirl.create(:user_using_ignore) }
+
+    it "uses the default value of the attribute" do
+      expect(esteemed.name).to eq "Esteemed Jane Doe"
+    end
+  end
 end
 
 describe "transient sequences" do
@@ -75,7 +102,7 @@ describe "transient sequences" do
 
     FactoryGirl.define do
       factory :user do
-        ignore do
+        transient do
           sequence(:counter)
         end
 
@@ -106,7 +133,7 @@ describe "assigning values from a transient attribute" do
 
     FactoryGirl.define do
       factory :user do
-        ignore do
+        transient do
           foo { Foo.new('id-of-foo', 'name-of-foo')}
         end
 

data/spec/factory_girl/definition_proxy_spec.rb

@@ -44,12 +44,12 @@ describe FactoryGirl::DefinitionProxy, "#add_attribute when the proxy ignores at
   end
 end
 
-describe FactoryGirl::DefinitionProxy, "#ignore" do
+describe FactoryGirl::DefinitionProxy, "#transient" do
   subject     { FactoryGirl::Definition.new }
   let(:proxy) { FactoryGirl::DefinitionProxy.new(subject) }
 
   it "makes all attributes added ignored" do
-    proxy.ignore do
+    proxy.transient do
       add_attribute(:attribute_name, "attribute value")
     end
 

data/spec/factory_girl/strategy/stub_spec.rb

@@ -27,11 +27,11 @@ describe FactoryGirl::Strategy::Stub do
       expect(subject.result(evaluation).created_at).to eq created_at
     end
 
-    [:save, :destroy, :connection, :reload, :update_attribute].each do |database_method|
+    [:save, :destroy, :connection, :reload, :update_attribute, :update_column].each do |database_method|
       it "raises when attempting to connect to the database by calling #{database_method}" do
         expect do
           subject.result(evaluation).send(database_method)
-        end.to raise_error(RuntimeError, "stubbed models are not allowed to access the database")
+        end.to raise_error(RuntimeError, "stubbed models are not allowed to access the database - #{subject.result(evaluation).class}##{database_method}()")
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: factory_girl
 version: !ruby/object:Gem::Version
-  version: 4.4.0
+  version: 4.5.0
 platform: ruby
 authors:
 - Josh Clayton
@@ -9,160 +9,174 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-11 00:00:00.000000000 Z
+date: 2014-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.12.0
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.3.15
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.3.15
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.12.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.12.8
 - !ruby/object:Gem::Dependency
   name: bourne
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: |-
@@ -176,14 +190,14 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .autotest
-- .gitignore
-- .rspec
-- .simplecov
-- .travis.yml
-- .yardopts
+- ".autotest"
+- ".gitignore"
+- ".rspec"
+- ".simplecov"
+- ".travis.yml"
+- ".yardopts"
 - Appraisals
-- CONTRIBUTION_GUIDELINES.md
+- CONTRIBUTING.md
 - GETTING_STARTED.md
 - Gemfile
 - Gemfile.lock
@@ -204,6 +218,8 @@ files:
 - gemfiles/3.2.gemfile.lock
 - gemfiles/4.0.gemfile
 - gemfiles/4.0.gemfile.lock
+- gemfiles/4.1.gemfile
+- gemfiles/4.1.gemfile.lock
 - lib/factory_girl.rb
 - lib/factory_girl/aliases.rb
 - lib/factory_girl/attribute.rb
@@ -238,6 +254,7 @@ files:
 - lib/factory_girl/factory.rb
 - lib/factory_girl/factory_runner.rb
 - lib/factory_girl/find_definitions.rb
+- lib/factory_girl/linter.rb
 - lib/factory_girl/null_factory.rb
 - lib/factory_girl/null_object.rb
 - lib/factory_girl/registry.rb
@@ -285,6 +302,7 @@ files:
 - spec/acceptance/nested_attributes_spec.rb
 - spec/acceptance/overrides_spec.rb
 - spec/acceptance/parent_spec.rb
+- spec/acceptance/private_attributes_spec.rb
 - spec/acceptance/register_strategies_spec.rb
 - spec/acceptance/sequence_context_spec.rb
 - spec/acceptance/sequence_spec.rb
@@ -336,17 +354,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: factory_girl provides a framework and DSL for defining and using model instance
@@ -364,6 +382,8 @@ test_files:
 - gemfiles/3.2.gemfile.lock
 - gemfiles/4.0.gemfile
 - gemfiles/4.0.gemfile.lock
+- gemfiles/4.1.gemfile
+- gemfiles/4.1.gemfile.lock
 - spec/acceptance/activesupport_instrumentation_spec.rb
 - spec/acceptance/aliases_spec.rb
 - spec/acceptance/attribute_aliases_spec.rb
@@ -393,6 +413,7 @@ test_files:
 - spec/acceptance/nested_attributes_spec.rb
 - spec/acceptance/overrides_spec.rb
 - spec/acceptance/parent_spec.rb
+- spec/acceptance/private_attributes_spec.rb
 - spec/acceptance/register_strategies_spec.rb
 - spec/acceptance/sequence_context_spec.rb
 - spec/acceptance/sequence_spec.rb