diff options
author | Claire <claire.github-309c@sitedethib.com> | 2021-07-08 16:17:19 +0200 |
---|---|---|
committer | Claire <claire.github-309c@sitedethib.com> | 2021-07-08 16:17:19 +0200 |
commit | 3160e050a95afe47317e82956f055a5ab6030698 (patch) | |
tree | 957699d2b99e6d0024560d790a011a30e60ddd3b /spec/controllers/well_known | |
parent | 0c2eb949fc21ceecbd99a81e5ffe75517a1e64df (diff) | |
parent | c4568e3b606cc4007739f881c334bdfe8dc77745 (diff) |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/helpers/accounts_helper.rb`: Conflict due to upstream changing how followers count is displayed while we have an option to hide followers count. Ported upstream change. - `app/views/accounts/_header.html.haml`: Conflict due to upstream changing how followers count is displayed while we have an option to hide followers count. Ported upstream change. - `app/views/directories/index.html.haml`: Conflict due to upstream changing how followers count is displayed while we have an option to hide followers count. Ported upstream change.
Diffstat (limited to 'spec/controllers/well_known')
-rw-r--r-- | spec/controllers/well_known/webfinger_controller_spec.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/spec/controllers/well_known/webfinger_controller_spec.rb b/spec/controllers/well_known/webfinger_controller_spec.rb index 1075456f3..8574d369d 100644 --- a/spec/controllers/well_known/webfinger_controller_spec.rb +++ b/spec/controllers/well_known/webfinger_controller_spec.rb @@ -24,6 +24,10 @@ describe WellKnown::WebfingerController, type: :controller do expect(response).to have_http_status(200) end + it 'does not set a Vary header' do + expect(response.headers['Vary']).to be_nil + end + it 'returns application/jrd+json' do expect(response.media_type).to eq 'application/jrd+json' end |