fix: test bug

Author: IdanPelled

app/config.py.example

@@ -1,4 +1,3 @@
-# flake8: noqa
 # general
 DOMAIN = 'Our-Domain'
 
@@ -14,4 +13,3 @@ AVATAR_SIZE = (120, 120)
 # export
 ICAL_VERSION = '2.0'
 PRODUCT_ID = '-//Our product id//'
-OPTIONAL = []

app/internal/agenda_events.py

@@ -2,7 +2,6 @@
 from typing import List, Optional
 
 import arrow
-from sqlalchemy.exc import SQLAlchemyError
 from sqlalchemy.orm import Session
 
 from app.database.models import Event
@@ -21,20 +20,16 @@ def get_events_per_dates(
 
     if start > end:
         return []
-    try:
-        events = (
-            filter_dates(
-                sort_by_date(
-                    get_all_user_events(session, user_id)
-                ),
-                start,
-                end,
-            )
+
+    return (
+        filter_dates(
+            sort_by_date(
+                get_all_user_events(session, user_id)
+            ),
+            start,
+            end,
         )
-    except SQLAlchemyError:
-        return []
-    else:
-        return events
+    )
 
 
 def build_arrow_delta_granularity(diff: timedelta) -> List[str]:

app/routers/event.py

@@ -23,7 +23,7 @@ async def eventview(request: Request, id: int):
                                       {"request": request, "event_id": id})
 
 
-def create_event(db, title, start, end, content, owner_id):
+def create_event(db, title, start, end, owner_id, content=None, location=None):
     """Creates an event and an association."""
 
     event = create_model(
@@ -33,6 +33,7 @@ def create_event(db, title, start, end, content, owner_id):
         end=end,
         content=content,
         owner_id=owner_id,
+        location=location,
     )
     create_model(
         db, UserEvent,

app/routers/invitation.py

@@ -1,6 +1,6 @@
 from typing import List, Union
 
-from fastapi import APIRouter, Depends, Form, Request
+from fastapi import APIRouter, Depends, Request
 from fastapi.responses import RedirectResponse
 from sqlalchemy.exc import SQLAlchemyError
 from sqlalchemy.orm import Session
@@ -35,11 +35,15 @@ def view_invitations(request: Request, db: Session = Depends(get_db)):
 
 @router.post("/")
 async def accept_invitations(
-        invite_id: int = Form(...),
-        db: Session = Depends(get_db)
+    request: Request,
+    db: Session = Depends(get_db)
 ):
-    i = get_invitation_by_id(invite_id, session=db)
-    accept(i, db)
+    data = await request.form()
+    invite_id = list(data.values())[0]
+
+    invitation = get_invitation_by_id(invite_id, session=db)
+    accept(invitation, db)
+
     url = router.url_path_for("view_invitations")
     return RedirectResponse(url=url, status_code=HTTP_302_FOUND)
 

tests/event_fixture.py

@@ -14,11 +14,12 @@
 def event(sender: User, session: Session) -> Event:
     return create_event(
         db=session,
-        title='today_event',
+        title='event',
         start=today_date,
         end=today_date,
         content='test event',
         owner_id=sender.id,
+        location="Some random location",
     )
 
 
@@ -92,17 +93,3 @@ def old_event(sender: User, session: Session) -> Event:
         content='test event',
         owner_id=sender.id,
     )
-
-
-@pytest.fixture
-def user_event(user: User, session: Session) -> Event:
-    """Only this event is created by "user" and not "sender"."""
-
-    return create_event(
-        db=session,
-        title='event 7',
-        start=today_date - timedelta(days=5),
-        end=today_date,
-        content='test event',
-        owner_id=user.id,
-    )

tests/test_agenda_internal.py

@@ -1,20 +1,46 @@
-from datetime import datetime
+from datetime import datetime, date
 
 from app.internal import agenda_events
 import pytest
 
-START = datetime(2021, 11, 1, 8, 00, 00)
+from app.internal.agenda_events import get_events_per_dates
 
-dates = [
-    (START, datetime(2021, 11, 3, 8, 00, 0), '2 days'),
-    (START, datetime(2021, 11, 3, 10, 30, 0), '2 days 2 hours and 30 minutes'),
-    (START, datetime(2021, 11, 1, 8, 30, 0), '30 minutes'),
-    (START, datetime(2021, 11, 1, 10, 00, 0), '2 hours'),
-    (START, datetime(2021, 11, 1, 10, 30, 0), '2 hours and 30 minutes'),
-    (START, datetime(2021, 11, 2, 10, 00, 0), 'a day and 2 hours'),
-]
 
+class TestAgenda:
+    START = datetime(2021, 11, 1, 8, 00, 00)
+    dates = [
+        (START, datetime(2021, 11, 3, 8, 00, 0),
+         '2 days'),
+        (START, datetime(2021, 11, 3, 10, 30, 0),
+         '2 days 2 hours and 30 minutes'),
+        (START, datetime(2021, 11, 1, 8, 30, 0),
+         '30 minutes'),
+        (START, datetime(2021, 11, 1, 10, 00, 0),
+         '2 hours'),
+        (START, datetime(2021, 11, 1, 10, 30, 0),
+         '2 hours and 30 minutes'),
+        (START, datetime(2021, 11, 2, 10, 00, 0),
+         'a day and 2 hours'),
+    ]
 
-@pytest.mark.parametrize('start, end, diff', dates)
-def test_get_time_delta_string(start, end, diff):
-    assert agenda_events.get_time_delta_string(start, end) == diff
+    @pytest.mark.parametrize('start, end, diff', dates)
+    def test_get_time_delta_string(self, start, end, diff):
+        assert agenda_events.get_time_delta_string(start, end) == diff
+
+    def test_get_events_per_dates_success(self, today_event, session):
+        events = get_events_per_dates(
+            session=session,
+            user_id=today_event.owner_id,
+            start=today_event.start.date(),
+            end=today_event.end.date(),
+        )
+        assert list(events) == [today_event]
+
+    def test_get_events_per_dates_failure(self, yesterday_event, session):
+        events = get_events_per_dates(
+            session=session,
+            user_id=yesterday_event.owner_id,
+            start=date.today(),
+            end=date.today(),
+        )
+        assert list(events) == []

tests/test_home.py

@@ -1,6 +1,6 @@
-# class TestHome:
-#     URL = "/"
-#
-#     def test_get_page(self, client):
-#         resp = client.get(self.URL)
-#         assert resp.status_code == 200
+class TestHome:
+    URL = "/"
+
+    def test_get_page(self, client):
+        resp = client.get(self.URL)
+        assert resp.status_code == 200

tests/test_invitation.py

@@ -3,17 +3,20 @@
 
 class TestInvitations:
     NO_INVITATIONS = b"You don't have any invitations."
-    URL = "/invitations"
+    URL = "/invitations/"
 
     def test_view_no_invitations(self, invitation_test_client):
         resp = invitation_test_client.get(self.URL)
         assert resp.status_code == 200
         assert self.NO_INVITATIONS in resp.content
 
-    def test_accept_invitations(self, invitation, invitation_test_client):
+    def test_accept_invitations(
+            self, user, invitation,
+            invitation_test_client):
+        invitation = {"invite_id ": invitation.id}
         resp = invitation_test_client.post(
-            self.URL, data={"invite_id ": invitation.id})
-        assert resp.status_code == 307
+            self.URL, data=invitation)
+        assert resp.status_code == 302
 
     def test_get_all_invitations_success(
             self, invitation, event, user, session

tests/test_share_event.py

@@ -36,10 +36,10 @@ def test_send_in_app_invitation_success(
         assert invitation.recipient == user
         session.delete(invitation)
 
-    def test_send_in_app_invitation_failure(self, event, session):
-        invitation = get_all_invitations(
-            recipient=event.owner, session=session)
-        assert invitation == []
+    def test_send_in_app_invitation_failure(
+            self, user, sender, event, session):
+        assert (send_in_app_invitation(
+            [sender.email], event, session=session) is None)
 
     def test_send_email_invitation(self, user, event):
         send_email_invitation([user.email], event)

tests/test_user.py

@@ -32,6 +32,7 @@ def test_does_user_exist_success(self, user, session):
 
     def test_does_user_exist_failure(self, session):
         assert not does_user_exist(username='wrong username', session=session)
+        assert not does_user_exist(session=session)
 
     def test_repr(self, user):
         assert user.__repr__() == f'<User {user.id}>'