Skip to content

Commit

Permalink
Update factory_girl test dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
cgriego committed Apr 27, 2012
1 parent 78d16f3 commit 63a2aad
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 4 deletions.
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
source "https://rubygems.org"

gemspec :development_group => :test
gem "factory_girl", "< 3.0", :group => :test if RUBY_VERSION < "1.9.2"

group :development do
gem "growl"
Expand Down
2 changes: 1 addition & 1 deletion active_attr.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Gem::Specification.new do |gem|
gem.add_runtime_dependency "activesupport", ">= 3.0.2", "< 4.1"

gem.add_development_dependency "bundler", "~> 1.0"
gem.add_development_dependency "factory_girl", "~> 2.2"
gem.add_development_dependency "factory_girl", ">= 2.2", "< 4.0"
gem.add_development_dependency "rake", "~> 0.9.0"
gem.add_development_dependency "rspec", "~> 2.6"
gem.add_development_dependency "tzinfo", "~> 0.3.29"
Expand Down
1 change: 1 addition & 0 deletions gemfiles/rails_3_0.gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
source "http://rubygems.org"

gemspec :development_group => :test, :path => ".."
gem "factory_girl", "< 3.0", :group => :test if RUBY_VERSION < "1.9.2"

gem "activemodel", "~> 3.0.2"
gem "activesupport", "~> 3.0.2"
1 change: 1 addition & 0 deletions gemfiles/rails_3_1.gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
source "http://rubygems.org"

gemspec :development_group => :test, :path => ".."
gem "factory_girl", "< 3.0", :group => :test if RUBY_VERSION < "1.9.2"

gem "activemodel", "~> 3.1.0"
gem "activesupport", "~> 3.1.0"
8 changes: 5 additions & 3 deletions spec/functional/active_attr/attributes_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -160,9 +160,11 @@ def self.name
before do
Object.const_set("Person", model_class)

Factory.define :person, :class => :person do |model|
model.first_name "Chris"
model.last_name "Griego"
FactoryGirl.define do
factory :person, :class => :person do
first_name "Chris"
last_name "Griego"
end
end
end

Expand Down

0 comments on commit 63a2aad

Please sign in to comment.