factory_girl 4.5.0 → 4.7.0

data/gemfiles/5.0.gemfile

@@ -0,0 +1,10 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
+gem "jdbc-sqlite3", :platforms => :jruby
+gem "sqlite3", "~> 1.3.10", :platforms => :ruby
+gem "activerecord", "~> 5.0.0.beta2"
+
+gemspec :path => "../"

data/gemfiles/5.0.gemfile.lock

@@ -0,0 +1,126 @@
+PATH
+  remote: ../
+  specs:
+    factory_girl (4.7.0)
+      activesupport (>= 3.0.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (5.0.0.beta2)
+      activesupport (= 5.0.0.beta2)
+    activerecord (5.0.0.beta2)
+      activemodel (= 5.0.0.beta2)
+      activesupport (= 5.0.0.beta2)
+      arel (~> 7.0)
+    activerecord-jdbc-adapter (1.3.19)
+      activerecord (>= 2.2)
+    activerecord-jdbcsqlite3-adapter (1.3.19)
+      activerecord-jdbc-adapter (~> 1.3.19)
+      jdbc-sqlite3 (>= 3.7.2, < 3.9)
+    activesupport (5.0.0.beta2)
+      concurrent-ruby (~> 1.0)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      method_source
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    appraisal (2.1.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    arel (7.0.0)
+    aruba (0.13.0)
+      childprocess (~> 0.5.6)
+      contracts (~> 0.9)
+      cucumber (>= 1.3.19)
+      ffi (~> 1.9.10)
+      rspec-expectations (>= 2.99)
+      thor (~> 0.19)
+    bourne (1.6.0)
+      mocha (~> 1.1)
+    builder (3.2.2)
+    childprocess (0.5.9)
+      ffi (~> 1.0, >= 1.0.11)
+    concurrent-ruby (1.0.0)
+    concurrent-ruby (1.0.0-java)
+    contracts (0.13.0)
+    cucumber (1.3.20)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.3)
+      gherkin (~> 2.12)
+      multi_json (>= 1.7.5, < 2.0)
+      multi_test (>= 0.1.2)
+    diff-lcs (1.2.5)
+    docile (1.1.5)
+    ffi (1.9.10)
+    ffi (1.9.10-java)
+    gherkin (2.12.2)
+      multi_json (~> 1.3)
+    gherkin (2.12.2-java)
+      multi_json (~> 1.3)
+    i18n (0.7.0)
+    jdbc-sqlite3 (3.8.11.2)
+    json (1.8.3)
+    json (1.8.3-java)
+    metaclass (0.0.4)
+    method_source (0.8.2)
+    minitest (5.8.4)
+    mocha (1.1.0)
+      metaclass (~> 0.0.1)
+    multi_json (1.11.2)
+    multi_test (0.1.2)
+    rake (10.5.0)
+    rspec (3.4.0)
+      rspec-core (~> 3.4.0)
+      rspec-expectations (~> 3.4.0)
+      rspec-mocks (~> 3.4.0)
+    rspec-core (3.4.2)
+      rspec-support (~> 3.4.0)
+    rspec-expectations (3.4.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-its (1.2.0)
+      rspec-core (>= 3.0.0)
+      rspec-expectations (>= 3.0.0)
+    rspec-mocks (3.4.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-support (3.4.1)
+    simplecov (0.11.2)
+      docile (~> 1.1.0)
+      json (~> 1.8)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.0)
+    sqlite3 (1.3.11)
+    thor (0.19.1)
+    thread_safe (0.3.5)
+    thread_safe (0.3.5-java)
+    timecop (0.8.0)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+    yard (0.8.7.6)
+
+PLATFORMS
+  java
+  ruby
+
+DEPENDENCIES
+  activerecord (~> 5.0.0.beta2)
+  activerecord-jdbcsqlite3-adapter
+  appraisal (~> 2.1.0)
+  aruba
+  bourne
+  cucumber (~> 1.3.15)
+  factory_girl!
+  jdbc-sqlite3
+  mocha (>= 0.12.8)
+  rspec (~> 3.0)
+  rspec-its (~> 1.0)
+  simplecov
+  sqlite3 (~> 1.3.10)
+  timecop
+  yard
+
+BUNDLED WITH
+   1.11.2

data/lib/factory_girl.rb

@@ -55,14 +55,23 @@ module FactoryGirl
     @configuration = nil
   end
 
-  def self.lint(factories_to_lint = FactoryGirl.factories)
-    Linter.lint!(factories_to_lint)
+  # Look for errors in factories and (optionally) their traits.
+  # Parameters:
+  # factories - which factories to lint; omit for all factories
+  # options:
+  #   traits : true - to lint traits as well as factories
+  def self.lint(*args)
+    options = args.extract_options!
+    factories_to_lint = args[0] || FactoryGirl.factories
+    strategy = options[:traits] ? :factory_and_traits : :factory
+    Linter.new(factories_to_lint, strategy).lint!
   end
 
   class << self
     delegate :factories, :sequences, :traits, :callbacks, :strategies, :callback_names,
-      :to_create, :skip_create, :initialize_with, :constructor, :duplicate_attribute_assignment_from_initialize_with,
-      :duplicate_attribute_assignment_from_initialize_with=, to: :configuration
+      :to_create, :skip_create, :initialize_with, :constructor,
+      :duplicate_attribute_assignment_from_initialize_with, :duplicate_attribute_assignment_from_initialize_with=,
+      :allow_class_lookup, :allow_class_lookup=, to: :configuration
   end
 
   def self.register_factory(factory)

data/lib/factory_girl/attribute/dynamic.rb

@@ -11,7 +11,10 @@ module FactoryGirl
         block = @block
 
         -> {
-          value = block.arity == 1 ? instance_exec(self, &block) : instance_exec(&block)
+          value = case block.arity
+                  when 1, -1 then instance_exec(self, &block)
+                  else instance_exec(&block)
+                  end
           raise SequenceAbuseError if FactoryGirl::Sequence === value
           value
         }

data/lib/factory_girl/attribute_assigner.rb

@@ -89,9 +89,9 @@ module FactoryGirl
     end
 
     def alias_names_to_ignore
-      @attribute_list.non_ignored.map do |attribute|
+      @attribute_list.non_ignored.flat_map do |attribute|
         override_names.map { |override| attribute.name if attribute.alias_for?(override) && attribute.name != override && !ignored_attribute_names.include?(override) }
-      end.flatten.compact
+      end.compact
     end
   end
 end

data/lib/factory_girl/configuration.rb

@@ -3,6 +3,8 @@ module FactoryGirl
   class Configuration
     attr_reader :factories, :sequences, :traits, :strategies, :callback_names
 
+    attr_accessor :allow_class_lookup
+
     def initialize
       @factories      = Decorator::DisallowsDuplicatesRegistry.new(Registry.new('Factory'))
       @sequences      = Decorator::DisallowsDuplicatesRegistry.new(Registry.new('Sequence'))
@@ -11,6 +13,8 @@ module FactoryGirl
       @callback_names = Set.new
       @definition     = Definition.new
 
+      @allow_class_lookup = true
+
       to_create { |instance| instance.save! }
       initialize_with { new }
     end

data/lib/factory_girl/decorator.rb

@@ -10,8 +10,8 @@ module FactoryGirl
       @component.send(name, *args, &block)
     end
 
-    def send(symbol, *args)
-      __send__(symbol, *args)
+    def send(symbol, *args, &block)
+      __send__(symbol, *args, &block)
     end
 
     def self.const_missing(name)

data/lib/factory_girl/decorator/class_key_hash.rb

@@ -18,7 +18,8 @@ module FactoryGirl
       def symbolized_key(key)
         if key.respond_to?(:to_sym)
           key.to_sym
-        else
+        elsif FactoryGirl.allow_class_lookup
+          ActiveSupport::Deprecation.warn "Looking up factories by class is deprecated and will be removed in 5.0. Use symbols instead and set FactoryGirl.allow_class_lookup = false", caller
           key.to_s.underscore.to_sym
         end
       end

data/lib/factory_girl/definition_proxy.rb

@@ -54,7 +54,7 @@ module FactoryGirl
     def ignore(&block)
       ActiveSupport::Deprecation.warn "`#ignore` is deprecated and will be "\
         "removed in 5.0. Please use `#transient` instead."
-      transient &block
+      transient(&block)
     end
 
     def transient(&block)
@@ -115,7 +115,7 @@ module FactoryGirl
     #   sequence(:email) { |n| "person#{n}@example.com" }
     #
     #   factory :user do
-    #     email { FactoryGirl.create(:email) }
+    #     email { FactoryGirl.generate(:email) }
     #   end
     #
     # Except that no globally available sequence will be defined.

data/lib/factory_girl/evaluator.rb

@@ -64,6 +64,10 @@ module FactoryGirl
     end
 
     def self.define_attribute(name, &block)
+      if method_defined?(name) || private_method_defined?(name)
+        undef_method(name)
+      end
+
       define_method(name) do
         if @cached_attributes.key?(name)
           @cached_attributes[name]

data/lib/factory_girl/factory_runner.rb

@@ -17,7 +17,13 @@ module FactoryGirl
         factory = factory.with_traits(@traits)
       end
 
-      instrumentation_payload = { name: @name, strategy: runner_strategy }
+      instrumentation_payload = {
+        name: @name,
+        strategy: runner_strategy,
+        traits: @traits,
+        overrides: @overrides,
+        factory: factory
+      }
 
       ActiveSupport::Notifications.instrument('factory_girl.run_factory', instrumentation_payload) do
         factory.run(runner_strategy, @overrides, &block)

data/lib/factory_girl/find_definitions.rb

@@ -2,7 +2,7 @@ module FactoryGirl
   class << self
     # An Array of strings specifying locations that should be searched for
     # factory definitions. By default, factory_girl will attempt to require
-    # "factories," "test/factories," and "spec/factories." Only the first
+    # "factories", "test/factories" and "spec/factories". Only the first
     # existing file will be loaded.
     attr_accessor :definition_file_paths
   end

data/lib/factory_girl/linter.rb

@@ -1,11 +1,9 @@
 module FactoryGirl
   class Linter
-    def self.lint!(factories_to_lint)
-      new(factories_to_lint).lint!
-    end
 
-    def initialize(factories_to_lint)
+    def initialize(factories_to_lint, linting_strategy)
       @factories_to_lint = factories_to_lint
+      @linting_method = "lint_#{linting_strategy}"
       @invalid_factories = calculate_invalid_factories
     end
 
@@ -15,26 +13,79 @@ module FactoryGirl
       end
     end
 
-    private
-
     attr_reader :factories_to_lint, :invalid_factories
+    private :factories_to_lint, :invalid_factories
+
+    private
 
     def calculate_invalid_factories
-      factories_to_lint.inject({}) do |result, factory|
+      factories_to_lint.reduce(Hash.new([])) do |result, factory|
+        errors = send(@linting_method, factory)
+        result[factory] |= errors unless errors.empty?
+        result
+      end
+    end
+
+    class FactoryError
+      def initialize(wrapped_error, factory)
+        @wrapped_error = wrapped_error
+        @factory       = factory
+      end
+
+      def message
+        message = @wrapped_error.message
+        "* #{location} - #{message} (#{@wrapped_error.class.name})"
+      end
+
+      def location
+        @factory.name
+      end
+    end
+
+    class FactoryTraitError < FactoryError
+      def initialize(wrapped_error, factory, trait_name)
+        super(wrapped_error, factory)
+        @trait_name = trait_name
+      end
+
+      def location
+        "#{@factory.name}+#{@trait_name}"
+      end
+    end
+
+    def lint_factory(factory)
+      result = []
+      begin
+        FactoryGirl.create(factory.name)
+      rescue => error
+        result |= [FactoryError.new(error, factory)]
+      end
+      result
+    end
+
+    def lint_traits(factory)
+      result = []
+      factory.definition.defined_traits.map(&:name).each do |trait_name|
         begin
-          FactoryGirl.create(factory.name)
+          FactoryGirl.create(factory.name, trait_name)
         rescue => error
-          result[factory] = error
+          result |=
+              [FactoryTraitError.new(error, factory, trait_name)]
         end
-
-        result
       end
+      result
+    end
+
+    def lint_factory_and_traits(factory)
+      errors = lint_factory(factory)
+      errors |= lint_traits(factory)
+      errors
     end
 
     def error_message
-      lines = invalid_factories.map do |factory, exception|
-        "* #{factory.name} - #{exception.message} (#{exception.class.name})"
-      end
+      lines = invalid_factories.map do |_factory, exceptions|
+        exceptions.map &:message
+      end.flatten
 
       <<-ERROR_MESSAGE.strip
 The following factories are invalid:

data/lib/factory_girl/strategy/stub.rb

@@ -10,6 +10,7 @@ module FactoryGirl
       def result(evaluation)
         evaluation.object.tap do |instance|
           stub_database_interaction_on_result(instance)
+          clear_changed_attributes_on_result(instance)
           evaluation.notify(:after_stub, instance)
         end
       end
@@ -44,7 +45,7 @@ module FactoryGirl
             raise "stubbed models are not allowed to access the database - #{self.class.to_s}#connection()"
           end
 
-          def reload
+          def reload(*args)
             raise "stubbed models are not allowed to access the database - #{self.class.to_s}#reload()"
           end
 
@@ -55,6 +56,14 @@ module FactoryGirl
           def update_column(*args)
             raise "stubbed models are not allowed to access the database - #{self.class.to_s}#update_column(#{args.join(",")})"
           end
+
+          def increment!(*args)
+            raise "stubbed models are not allowed to access the database - #{self.class}#increment!(#{args.join(',')})"
+          end
+
+          def decrement!(*args)
+            raise "stubbed models are not allowed to access the database - #{self.class}#decrement!(#{args.join(',')})"
+          end
         end
 
         created_at_missing_default = result_instance.respond_to?(:created_at) && !result_instance.created_at
@@ -68,6 +77,21 @@ module FactoryGirl
           end
         end
       end
+
+      def clear_changed_attributes_on_result(result_instance)
+        unless result_instance.respond_to?(:clear_changes_information)
+          result_instance.extend ActiveModelDirtyBackport
+        end
+
+        result_instance.clear_changes_information
+      end
+    end
+
+    module ActiveModelDirtyBackport
+      def clear_changes_information
+        @previously_changed = ActiveSupport::HashWithIndifferentAccess.new
+        @changed_attributes = ActiveSupport::HashWithIndifferentAccess.new
+      end
     end
   end
 end

data/lib/factory_girl/strategy_syntax_method_registrar.rb

@@ -39,6 +39,10 @@ module FactoryGirl
 
     def define_syntax_method(name, &block)
       FactoryGirl::Syntax::Methods.module_exec do
+        if method_defined?(name) || private_method_defined?(name)
+          undef_method(name)
+        end
+
         define_method(name, &block)
       end
     end