Deprecate alternate syntaxes

kamechb · Apr 23, 2012 · c006dd1 · c006dd1
1 parent d67b798
commit c006dd1
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 2 deletions.
diff --git a/lib/factory_girl/syntax.rb b/lib/factory_girl/syntax.rb
@@ -1,3 +1,4 @@
+require "active_support/deprecation"
 require "factory_girl/syntax/methods"
 require "factory_girl/syntax/default"
 require "factory_girl/syntax/vintage"

diff --git a/lib/factory_girl/syntax/blueprint.rb b/lib/factory_girl/syntax/blueprint.rb
@@ -26,6 +26,7 @@ def self.included(base) # :nodoc:
         module ClassMethods #:nodoc:
 
           def blueprint(&block)
+            ActiveSupport::Deprecation.warn "Model.blueprint is deprecated; use the FactoryGirl.define syntax instead", caller
             instance = Factory.new(name.underscore, class: self)
             proxy = FactoryGirl::DefinitionProxy.new(instance)
             proxy.instance_eval(&block)

diff --git a/lib/factory_girl/syntax/generate.rb b/lib/factory_girl/syntax/generate.rb
@@ -42,19 +42,22 @@ def self.included(base) # :nodoc:
         module ClassMethods #:nodoc:
 
           def generate(overrides = {}, &block)
+            ActiveSupport::Deprecation.warn "Model.generate is deprecated; use the FactoryGirl.define syntax instead", caller
             instance = FactoryRunner.new(name.underscore, Strategy::Build, [overrides]).run
             instance.save
             yield(instance) if block_given?
             instance
           end
 
           def generate!(overrides = {}, &block)
+            ActiveSupport::Deprecation.warn "Model.generate! is deprecated; use the FactoryGirl.define syntax instead", caller
             instance = FactoryRunner.new(name.underscore, Strategy::Create, [overrides]).run
             yield(instance) if block_given?
             instance
           end
 
           def spawn(overrides = {}, &block)
+            ActiveSupport::Deprecation.warn "Model.spawn is deprecated; use the FactoryGirl.define syntax instead", caller
             instance = FactoryRunner.new(name.underscore, Strategy::Build, [overrides]).run
             yield(instance) if block_given?
             instance

diff --git a/lib/factory_girl/syntax/make.rb b/lib/factory_girl/syntax/make.rb
@@ -28,10 +28,12 @@ def self.included(base) # :nodoc:
         module ClassMethods #:nodoc:
 
           def make(overrides = {})
+            ActiveSupport::Deprecation.warn "Model.make is deprecated; use the FactoryGirl.define syntax instead", caller
             FactoryRunner.new(name.underscore, Strategy::Build, [overrides]).run
           end
 
           def make!(overrides = {})
+            ActiveSupport::Deprecation.warn "Model.make! is deprecated; use the FactoryGirl.define syntax instead", caller
             FactoryRunner.new(name.underscore, Strategy::Create, [overrides]).run
           end
 

diff --git a/lib/factory_girl/syntax/sham.rb b/lib/factory_girl/syntax/sham.rb
@@ -26,6 +26,7 @@ module Sham
       module Sham #:nodoc:
         def self.method_missing(name, *args, &block)
           if block_given?
+            ActiveSupport::Deprecation.warn "Sham.sequence is deprecated; use the FactoryGirl.define syntax instead", caller
             start_value = args.first
             FactoryGirl.register_sequence(Sequence.new(name, start_value || 1, &block))
           else

diff --git a/lib/factory_girl/syntax/vintage.rb b/lib/factory_girl/syntax/vintage.rb
@@ -1,5 +1,3 @@
-require "active_support/deprecation"
-
 module FactoryGirl
   module Syntax
     module Vintage

diff --git a/spec/acceptance/syntax/blueprint_spec.rb b/spec/acceptance/syntax/blueprint_spec.rb
@@ -4,6 +4,8 @@
 
 describe "a blueprint" do
   before do
+    ActiveSupport::Deprecation.silenced = true
+
     define_model('User', first_name: :string, last_name: :string, email: :string)
 
     FactoryGirl.define do

diff --git a/spec/acceptance/syntax/generate_spec.rb b/spec/acceptance/syntax/generate_spec.rb
@@ -4,6 +4,8 @@
 
 describe "a factory using generate syntax" do
   before do
+    ActiveSupport::Deprecation.silenced = true
+
     define_model('User', first_name: :string, last_name: :string, email: :string) do
       validates_presence_of :first_name
     end

diff --git a/spec/acceptance/syntax/make_spec.rb b/spec/acceptance/syntax/make_spec.rb
@@ -4,6 +4,8 @@
 
 describe "a factory using make syntax" do
   before do
+    ActiveSupport::Deprecation.silenced = true
+
     define_model('User', first_name: :string, last_name: :string)
 
     FactoryGirl.define do