Merge pull request thoughtbot#187 from drapergeek/master

Use new factory_girl methods

clearance.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
   s.add_dependency('rails',  '>= 3.0')
   s.add_dependency('diesel', '~> 0.1.5')
 
-  s.add_development_dependency('bundler',        '~> 1.0.0')
+  s.add_development_dependency('bundler',        '~> 1.1.0')
   s.add_development_dependency('appraisal',      '~> 0.3.8')
   s.add_development_dependency('cucumber-rails', '~> 1.1.1')
   s.add_development_dependency('rspec-rails',    '~> 2.6.0')

spec/factories.rb

@@ -1,12 +1,12 @@
-Factory.sequence :email do |n|
-  "user#{n}@example.com"
-end
+FactoryGirl.define do
 
-Factory.define :user do |factory|
-  factory.email    { Factory.next :email }
-  factory.password { "password" }
-end
+  sequence :email do |n|
+    "user#{n}@example.com"
+  end
+
+  factory :user do
+    email
+    password "password"
+  end
 
-Factory.define :email_confirmed_user, :parent => :user do |factory|
-  factory.after_build { warn "[DEPRECATION] The :email_confirmed_user factory is deprecated, please use the :user factory instead." }
 end