Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Already on GitHub? Sign in to your account

Use new factory_girl methods #187

Merged
merged 2 commits into from Mar 30, 2012
Jump to file or symbol
Failed to load files and symbols.
+10 −10
Split
View
@@ -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')
View
@@ -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