Skip to content

Commit 1fe2ff1

Browse files
committed
adjust tests
1 parent 36dfc82 commit 1fe2ff1

File tree

2 files changed

+13
-9
lines changed

2 files changed

+13
-9
lines changed

tests/test_notifier.py

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424

2525
HOST = "fishjam" if os.getenv("DOCKER_TEST") == "TRUE" else "localhost"
2626
FISHJAM_URL = f"http://{HOST}:5002"
27+
FISHJAM_ID = ""
2728
SERVER_API_TOKEN = "development"
2829
WEBHOOK_ADDRESS = "test" if os.getenv("DOCKER_TEST") == "TRUE" else "localhost"
2930
WEBHOOK_URL = f"http://{WEBHOOK_ADDRESS}:5000/webhook"
@@ -56,7 +57,9 @@ class TestConnectingToServer:
5657
@pytest.mark.asyncio
5758
async def test_valid_credentials(self):
5859
notifier = FishjamNotifier(
59-
fishjam_url=FISHJAM_URL, management_token=SERVER_API_TOKEN
60+
fishjam_id=FISHJAM_ID,
61+
management_token=SERVER_API_TOKEN,
62+
fishjam_url=FISHJAM_URL,
6063
)
6164

6265
@notifier.on_server_notification
@@ -73,7 +76,7 @@ def handle_notitifcation(_notification):
7376
@pytest.mark.asyncio
7477
async def test_invalid_credentials(self):
7578
notifier = FishjamNotifier(
76-
fishjam_url=FISHJAM_URL, management_token="wrong_token"
79+
fishjam_id="", management_token="wrong_token", fishjam_url=FISHJAM_URL
7780
)
7881

7982
task = asyncio.create_task(notifier.connect())
@@ -84,13 +87,15 @@ async def test_invalid_credentials(self):
8487

8588
@pytest.fixture
8689
def room_api():
87-
return FishjamClient(fishjam_url=FISHJAM_URL, management_token=SERVER_API_TOKEN)
90+
return FishjamClient(FISHJAM_ID, SERVER_API_TOKEN, fishjam_url=FISHJAM_URL)
8891

8992

9093
@pytest.fixture
9194
def notifier():
9295
notifier = FishjamNotifier(
93-
fishjam_url=FISHJAM_URL, management_token=SERVER_API_TOKEN
96+
fishjam_id=FISHJAM_ID,
97+
management_token=SERVER_API_TOKEN,
98+
fishjam_url=FISHJAM_URL,
9499
)
95100

96101
return notifier

tests/test_room_api.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626

2727
HOST = "fishjam" if os.getenv("DOCKER_TEST") == "TRUE" else "localhost"
2828
FISHJAM_URL = f"http://{HOST}:5002"
29+
FISHJAM_ID = ""
2930
MANAGEMENT_TOKEN = "development"
3031

3132
MAX_PEERS = 10
@@ -37,15 +38,13 @@
3738

3839
class TestAuthentication:
3940
def test_invalid_token(self):
40-
room_api = FishjamClient(fishjam_url=FISHJAM_URL, management_token="invalid")
41+
room_api = FishjamClient(FISHJAM_ID, "invalid", fishjam_url=FISHJAM_URL)
4142

4243
with pytest.raises(UnauthorizedError):
4344
room_api.create_room()
4445

4546
def test_valid_token(self):
46-
room_api = FishjamClient(
47-
fishjam_url=FISHJAM_URL, management_token=MANAGEMENT_TOKEN
48-
)
47+
room_api = FishjamClient(FISHJAM_ID, MANAGEMENT_TOKEN, fishjam_url=FISHJAM_URL)
4948

5049
room = room_api.create_room()
5150
all_rooms = room_api.get_all_rooms()
@@ -55,7 +54,7 @@ def test_valid_token(self):
5554

5655
@pytest.fixture
5756
def room_api():
58-
return FishjamClient(fishjam_url=FISHJAM_URL, management_token=MANAGEMENT_TOKEN)
57+
return FishjamClient(FISHJAM_ID, MANAGEMENT_TOKEN, fishjam_url=FISHJAM_URL)
5958

6059

6160
class TestCreateRoom:

0 commit comments

Comments
 (0)