diff --git a/Gemfile b/Gemfile index 263e8c4a4..3ce11dc83 100644 --- a/Gemfile +++ b/Gemfile @@ -12,7 +12,7 @@ gem "unicorn", "4.9.0", require: false # Federation -gem "diaspora_federation-rails", "0.0.8" +gem "diaspora_federation-rails", "0.0.9" # API and JSON @@ -269,6 +269,8 @@ group :test do gem "timecop", "0.8.0" gem "webmock", "1.22.1", require: false gem "shoulda-matchers", "3.0.0" + + gem "diaspora_federation-test", "0.0.9" end group :development, :test do diff --git a/Gemfile.lock b/Gemfile.lock index a65ca2f33..238368349 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -152,15 +152,18 @@ GEM eventmachine (~> 1.0.8) http_parser.rb (~> 0.6) nokogiri (~> 1.6) - diaspora_federation (0.0.8) - faraday (~> 0.9.2) + diaspora_federation (0.0.9) + faraday (~> 0.9.0) faraday_middleware (~> 0.10.0) - nokogiri (~> 1.6, >= 1.6.6) + nokogiri (~> 1.6, >= 1.6.6.4) typhoeus (~> 0.7) valid (~> 1.0) - diaspora_federation-rails (0.0.8) - diaspora_federation (= 0.0.8) + diaspora_federation-rails (0.0.9) + diaspora_federation (= 0.0.9) rails (~> 4.2) + diaspora_federation-test (0.0.9) + diaspora_federation (= 0.0.9) + factory_girl (~> 4.5.0) diff-lcs (1.2.5) docile (1.1.5) domain_name (0.5.25) @@ -776,7 +779,8 @@ DEPENDENCIES devise-token_authenticatable (~> 0.4.0) devise_lastseenable (= 0.0.6) diaspora-vines (~> 0.2.0.develop) - diaspora_federation-rails (= 0.0.8) + diaspora_federation-rails (= 0.0.9) + diaspora_federation-test (= 0.0.9) entypo-rails (= 2.2.3) eye (= 0.7) facebox-rails (= 0.2.0)