mirror of
https://git.anonymousland.org/anonymousland/synapse.git
synced 2025-06-20 14:34:08 -04:00
use global make_request() directly where we have a custom Resource
Where we want to render a request against a specific Resource, call the global make_request() function rather than the one in HomeserverTestCase, allowing us to pass in an appropriate `Site`.
This commit is contained in:
parent
70c0d47989
commit
cfd895a22e
11 changed files with 154 additions and 60 deletions
|
@ -17,6 +17,7 @@
|
|||
from synapse.http.additional_resource import AdditionalResource
|
||||
from synapse.http.server import respond_with_json
|
||||
|
||||
from tests.server import FakeSite, make_request, render
|
||||
from tests.unittest import HomeserverTestCase
|
||||
|
||||
|
||||
|
@ -43,20 +44,20 @@ class AdditionalResourceTests(HomeserverTestCase):
|
|||
|
||||
def test_async(self):
|
||||
handler = _AsyncTestCustomEndpoint({}, None).handle_request
|
||||
self.resource = AdditionalResource(self.hs, handler)
|
||||
resource = AdditionalResource(self.hs, handler)
|
||||
|
||||
request, channel = self.make_request("GET", "/")
|
||||
self.render(request)
|
||||
request, channel = make_request(self.reactor, FakeSite(resource), "GET", "/")
|
||||
render(request, resource, self.reactor)
|
||||
|
||||
self.assertEqual(request.code, 200)
|
||||
self.assertEqual(channel.json_body, {"some_key": "some_value_async"})
|
||||
|
||||
def test_sync(self):
|
||||
handler = _SyncTestCustomEndpoint({}, None).handle_request
|
||||
self.resource = AdditionalResource(self.hs, handler)
|
||||
resource = AdditionalResource(self.hs, handler)
|
||||
|
||||
request, channel = self.make_request("GET", "/")
|
||||
self.render(request)
|
||||
request, channel = make_request(self.reactor, FakeSite(resource), "GET", "/")
|
||||
render(request, resource, self.reactor)
|
||||
|
||||
self.assertEqual(request.code, 200)
|
||||
self.assertEqual(channel.json_body, {"some_key": "some_value_sync"})
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue