bump factory_girl and factory_girl_rails
This commit is contained in:
parent
6929ed4158
commit
dbac8f4042
3 changed files with 7 additions and 7 deletions
2
Gemfile
2
Gemfile
|
|
@ -42,7 +42,7 @@ group :test do
|
|||
|
||||
# test helpers
|
||||
gem "fixture_builder", "~> 0.4.1"
|
||||
gem "factory_girl_rails", "~> 4.6.0"
|
||||
gem "factory_girl_rails", "~> 4.7"
|
||||
gem "rspec-collection_matchers", "~> 1.1.2"
|
||||
gem "webmock", "~> 1.24.0"
|
||||
end
|
||||
|
|
|
|||
10
Gemfile.lock
10
Gemfile.lock
|
|
@ -12,7 +12,7 @@ PATH
|
|||
rails (~> 4.2)
|
||||
diaspora_federation-test (0.0.13)
|
||||
diaspora_federation (= 0.0.13)
|
||||
factory_girl (~> 4.5, >= 4.5.0)
|
||||
factory_girl (~> 4.7)
|
||||
|
||||
GEM
|
||||
remote: https://rubygems.org/
|
||||
|
|
@ -68,10 +68,10 @@ GEM
|
|||
erubis (2.7.0)
|
||||
ethon (0.8.1)
|
||||
ffi (>= 1.3.0)
|
||||
factory_girl (4.5.0)
|
||||
factory_girl (4.7.0)
|
||||
activesupport (>= 3.0.0)
|
||||
factory_girl_rails (4.6.0)
|
||||
factory_girl (~> 4.5.0)
|
||||
factory_girl_rails (4.7.0)
|
||||
factory_girl (~> 4.7.0)
|
||||
railties (>= 3.0.0)
|
||||
faraday (0.9.2)
|
||||
multipart-post (>= 1.2, < 3)
|
||||
|
|
@ -284,7 +284,7 @@ DEPENDENCIES
|
|||
diaspora_federation!
|
||||
diaspora_federation-rails!
|
||||
diaspora_federation-test!
|
||||
factory_girl_rails (~> 4.6.0)
|
||||
factory_girl_rails (~> 4.7)
|
||||
fixture_builder (~> 0.4.1)
|
||||
fuubar (= 2.0.0)
|
||||
guard-rspec
|
||||
|
|
|
|||
|
|
@ -20,5 +20,5 @@ Gem::Specification.new do |s|
|
|||
s.required_ruby_version = "~> 2.0"
|
||||
|
||||
s.add_dependency "diaspora_federation", DiasporaFederation::VERSION
|
||||
s.add_dependency "factory_girl", "~> 4.5", ">= 4.5.0"
|
||||
s.add_dependency "factory_girl", "~> 4.7"
|
||||
end
|
||||
|
|
|
|||
Loading…
Reference in a new issue