Bump rails

This commit is contained in:
Benjamin Neff 2018-06-17 02:59:58 +02:00
parent 5800eda906
commit b4add0dad5
No known key found for this signature in database
GPG key ID: 971464C3F1A90194
3 changed files with 21 additions and 21 deletions

View file

@ -19,22 +19,22 @@ PATH
GEM
remote: https://rubygems.org/
specs:
actionpack (5.1.5)
actionview (= 5.1.5)
activesupport (= 5.1.5)
actionpack (5.2.0)
actionview (= 5.2.0)
activesupport (= 5.2.0)
rack (~> 2.0)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.1.5)
activesupport (= 5.1.5)
actionview (5.2.0)
activesupport (= 5.2.0)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activesupport (5.1.5)
activesupport (5.2.0)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (~> 0.7)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
addressable (2.5.2)
@ -46,7 +46,7 @@ GEM
concurrent-ruby (1.0.5)
crack (0.4.3)
safe_yaml (~> 1.0.0)
crass (1.0.3)
crass (1.0.4)
diff-lcs (1.3)
docile (1.3.0)
erubi (1.7.1)
@ -85,7 +85,7 @@ GEM
hashdiff (0.3.7)
httparty (0.16.1)
multi_xml (>= 0.5.2)
i18n (0.9.5)
i18n (1.0.1)
concurrent-ruby (~> 1.0)
json (2.1.0)
json-schema (2.8.0)
@ -139,17 +139,17 @@ GEM
byebug (~> 10.0)
pry (~> 0.10)
public_suffix (3.0.2)
rack (2.0.4)
rack-test (0.8.3)
rack (2.0.5)
rack-test (1.0.0)
rack (>= 1.0, < 3)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.0.4)
loofah (~> 2.2, >= 2.2.2)
railties (5.1.5)
actionpack (= 5.1.5)
activesupport (= 5.1.5)
railties (5.2.0)
actionpack (= 5.2.0)
activesupport (= 5.2.0)
method_source
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)

View file

@ -5,7 +5,7 @@ module DiasporaFederation
describe "GET #hcard" do
it "succeeds when the person exists" do
get :hcard, params: {guid: alice.guid}
expect(response).to be_success
expect(response).to be_successful
end
it "contains the guid" do

View file

@ -10,7 +10,7 @@ module DiasporaFederation
it "succeeds" do
get :host_meta
expect(response).to be_success
expect(response).to be_successful
end
it "contains the webfinger-template" do
@ -38,19 +38,19 @@ module DiasporaFederation
describe "GET #webfinger", rails: 5 do
it "uses the JRD format as default" do
get :webfinger, params: {resource: alice.diaspora_id}
expect(response).to be_success
expect(response).to be_successful
expect(response.header["Content-Type"]).to include "application/jrd+json"
end
context "json", exceptions: :catch do
it "succeeds when the person exists" do
get :webfinger, format: :json, params: {resource: alice.diaspora_id}
expect(response).to be_success
expect(response).to be_successful
end
it "succeeds with 'acct:' in the query when the person exists" do
get :webfinger, format: :json, params: {resource: "acct:#{alice.diaspora_id}"}
expect(response).to be_success
expect(response).to be_successful
end
it "contains the diaspora* ID" do
@ -89,12 +89,12 @@ module DiasporaFederation
context "xml" do
it "succeeds when the person exists" do
get :webfinger, format: :json, params: {resource: alice.diaspora_id}
expect(response).to be_success
expect(response).to be_successful
end
it "succeeds with 'acct:' in the query when the person exists" do
get :webfinger, format: :xml, params: {resource: "acct:#{alice.diaspora_id}"}
expect(response).to be_success
expect(response).to be_successful
end
it "contains the diaspora* ID" do