diff options
| author | beatrix <beatrix.bitrot@gmail.com> | 2017-09-09 20:11:48 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-09 20:11:48 -0400 |
| commit | 3dff74eecf5387b92b862893248710d2efb90eec (patch) | |
| tree | 0d29d8c952a0c62e7de4348a1d63963fd5eca237 /spec/controllers/concerns/account_controller_concern_spec.rb | |
| parent | e18ed4bbc7ab4e258d05a3e2a5db0790f67a8f37 (diff) | |
| parent | 14e1fb8d36763e5255e7b8e440ecaf02208db004 (diff) | |
Merge pull request #141 from yipdw/sync/upstream
Sync with upstream @ v1.6.0rc3 ohhhhhhhhhhh heck here we go
Diffstat (limited to 'spec/controllers/concerns/account_controller_concern_spec.rb')
| -rw-r--r-- | spec/controllers/concerns/account_controller_concern_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/controllers/concerns/account_controller_concern_spec.rb b/spec/controllers/concerns/account_controller_concern_spec.rb index bdc181edc..ae46f9ba6 100644 --- a/spec/controllers/concerns/account_controller_concern_spec.rb +++ b/spec/controllers/concerns/account_controller_concern_spec.rb @@ -33,7 +33,7 @@ describe ApplicationController, type: :controller do it 'sets link headers' do account = Fabricate(:account, username: 'username') get 'success', params: { account_username: 'username' } - expect(response.headers['Link'].to_s).to eq '<http://test.host/.well-known/webfinger?resource=acct%3Ausername%40cb6e6126.ngrok.io>; rel="lrdd"; type="application/xrd+xml", <http://test.host/users/username.atom>; rel="alternate"; type="application/atom+xml"' + expect(response.headers['Link'].to_s).to eq '<http://test.host/.well-known/webfinger?resource=acct%3Ausername%40cb6e6126.ngrok.io>; rel="lrdd"; type="application/xrd+xml", <http://test.host/users/username.atom>; rel="alternate"; type="application/atom+xml", <https://cb6e6126.ngrok.io/users/username>; rel="alternate"; type="application/activity+json"' end it 'returns http success' do |