Skip to content

Commit

Permalink
Trying to fix travis by updating factory_girl
Browse files Browse the repository at this point in the history
  • Loading branch information
Roendal committed Mar 4, 2012
1 parent 36351de commit 5120b74
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 11 deletions.
2 changes: 1 addition & 1 deletion mailboxer.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Gem::Specification.new do |s|
# Specs
s.add_development_dependency('rspec-rails', '>= 2.6.1')
# Fixtures
s.add_development_dependency('factory_girl', '>= 1.3.2')
s.add_development_dependency('factory_girl', '>= 2.6.0')
# Population
s.add_development_dependency('forgery', '>= 0.3.6')
# Integration testing
Expand Down
12 changes: 9 additions & 3 deletions spec/factories/cylon.rb
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
Factory.define :cylon do |c|
c.sequence(:name) { |n| "Cylon #{ n }" }
c.sequence(:email) { |n| "cylon#{ n }@cylon.com" }
FactoryGirl.define do
factory :cylon do
sequence :name do |n|
"Cylon #{ n }"
end
sequence :email do |n|
"cylon#{ n }@cylon.com"
end
end
end
14 changes: 10 additions & 4 deletions spec/factories/duck.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
Factory.define :duck do |d|
d.sequence(:name) { |n| "Duck #{ n }" }
d.sequence(:email) { |n| "duck#{ n }@duck.com" }
end
FactoryGirl.define do
factory :duck do
sequence :name do |n|
"Duck #{ n }"
end
sequence :email do |n|
"duck#{ n }@duck.com"
end
end
end
12 changes: 9 additions & 3 deletions spec/factories/user.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
Factory.define :user do |u|
u.sequence(:name) { |n| "User #{ n }" }
u.sequence(:email) { |n| "user#{ n }@user.com" }
FactoryGirl.define do
factory :user do
sequence :name do |n|
"User #{ n }"
end
sequence :email do |n|
"user#{ n }@user.com"
end
end
end

0 comments on commit 5120b74

Please sign in to comment.