mirror of
https://mau.dev/maunium/synapse.git
synced 2024-12-15 02:03:51 +01:00
pass a Site into RestHelper
This commit is contained in:
parent
023f791143
commit
d3523e3e97
2 changed files with 7 additions and 6 deletions
|
@ -23,6 +23,7 @@ from typing import Any, Dict, Optional
|
||||||
import attr
|
import attr
|
||||||
|
|
||||||
from twisted.web.resource import Resource
|
from twisted.web.resource import Resource
|
||||||
|
from twisted.web.server import Site
|
||||||
|
|
||||||
from synapse.api.constants import Membership
|
from synapse.api.constants import Membership
|
||||||
|
|
||||||
|
@ -36,7 +37,7 @@ class RestHelper:
|
||||||
"""
|
"""
|
||||||
|
|
||||||
hs = attr.ib()
|
hs = attr.ib()
|
||||||
resource = attr.ib()
|
site = attr.ib(type=Site)
|
||||||
auth_user_id = attr.ib()
|
auth_user_id = attr.ib()
|
||||||
|
|
||||||
def create_room_as(
|
def create_room_as(
|
||||||
|
@ -54,7 +55,7 @@ class RestHelper:
|
||||||
request, channel = make_request(
|
request, channel = make_request(
|
||||||
self.hs.get_reactor(), "POST", path, json.dumps(content).encode("utf8")
|
self.hs.get_reactor(), "POST", path, json.dumps(content).encode("utf8")
|
||||||
)
|
)
|
||||||
render(request, self.resource, self.hs.get_reactor())
|
render(request, self.site.resource, self.hs.get_reactor())
|
||||||
|
|
||||||
assert channel.result["code"] == b"%d" % expect_code, channel.result
|
assert channel.result["code"] == b"%d" % expect_code, channel.result
|
||||||
self.auth_user_id = temp_id
|
self.auth_user_id = temp_id
|
||||||
|
@ -128,7 +129,7 @@ class RestHelper:
|
||||||
self.hs.get_reactor(), "PUT", path, json.dumps(data).encode("utf8")
|
self.hs.get_reactor(), "PUT", path, json.dumps(data).encode("utf8")
|
||||||
)
|
)
|
||||||
|
|
||||||
render(request, self.resource, self.hs.get_reactor())
|
render(request, self.site.resource, self.hs.get_reactor())
|
||||||
|
|
||||||
assert int(channel.result["code"]) == expect_code, (
|
assert int(channel.result["code"]) == expect_code, (
|
||||||
"Expected: %d, got: %d, resp: %r"
|
"Expected: %d, got: %d, resp: %r"
|
||||||
|
@ -160,7 +161,7 @@ class RestHelper:
|
||||||
request, channel = make_request(
|
request, channel = make_request(
|
||||||
self.hs.get_reactor(), "PUT", path, json.dumps(content).encode("utf8")
|
self.hs.get_reactor(), "PUT", path, json.dumps(content).encode("utf8")
|
||||||
)
|
)
|
||||||
render(request, self.resource, self.hs.get_reactor())
|
render(request, self.site.resource, self.hs.get_reactor())
|
||||||
|
|
||||||
assert int(channel.result["code"]) == expect_code, (
|
assert int(channel.result["code"]) == expect_code, (
|
||||||
"Expected: %d, got: %d, resp: %r"
|
"Expected: %d, got: %d, resp: %r"
|
||||||
|
@ -212,7 +213,7 @@ class RestHelper:
|
||||||
|
|
||||||
request, channel = make_request(self.hs.get_reactor(), method, path, content)
|
request, channel = make_request(self.hs.get_reactor(), method, path, content)
|
||||||
|
|
||||||
render(request, self.resource, self.hs.get_reactor())
|
render(request, self.site.resource, self.hs.get_reactor())
|
||||||
|
|
||||||
assert int(channel.result["code"]) == expect_code, (
|
assert int(channel.result["code"]) == expect_code, (
|
||||||
"Expected: %d, got: %d, resp: %r"
|
"Expected: %d, got: %d, resp: %r"
|
||||||
|
|
|
@ -253,7 +253,7 @@ class HomeserverTestCase(TestCase):
|
||||||
|
|
||||||
from tests.rest.client.v1.utils import RestHelper
|
from tests.rest.client.v1.utils import RestHelper
|
||||||
|
|
||||||
self.helper = RestHelper(self.hs, self.resource, getattr(self, "user_id", None))
|
self.helper = RestHelper(self.hs, self.site, getattr(self, "user_id", None))
|
||||||
|
|
||||||
if hasattr(self, "user_id"):
|
if hasattr(self, "user_id"):
|
||||||
if self.hijack_auth:
|
if self.hijack_auth:
|
||||||
|
|
Loading…
Reference in a new issue