Skip to content

Commit

Permalink
Fix comments
Browse files Browse the repository at this point in the history
  • Loading branch information
seallard committed Dec 14, 2023
1 parent d59f963 commit 4a5c26d
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 10 deletions.
8 changes: 6 additions & 2 deletions tests/integration/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ def flask_app(store: Store):
def client(flask_app: Flask) -> Generator[FlaskClient, None, None]:
# Bypass authentication
with patch.object(flask_app, "before_request_funcs", new={}):
client = flask_app.test_client()
yield client
yield flask_app.test_client()


@pytest.fixture
Expand All @@ -45,3 +44,8 @@ def analysis() -> Analysis:
session.add(analysis)
session.commit()
return analysis


@pytest.fixture
def non_existing_analysis_id() -> str:
return "00"
7 changes: 3 additions & 4 deletions tests/integration/test_get_analysis.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,11 @@ def test_get_existing_analysis(client: FlaskClient, analysis: Analysis):
assert response.json["id"] == analysis.id


def test_get_non_existing_analysis(client: FlaskClient):
# GIVEN a non existing analysis
analysis_id = "00"
def test_get_non_existing_analysis(client: FlaskClient, non_existing_analysis_id: str):
# GIVEN a non existing analysis id

# WHEN requesting the analysis
response = client.get(f"/api/v1/analyses/{analysis_id}")
response = client.get(f"/api/v1/analyses/{non_existing_analysis_id}")

# THEN no analysis is found
assert response.status_code == HTTPStatus.NOT_FOUND
8 changes: 4 additions & 4 deletions tests/integration/test_update_analysis.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ def test_update_analysis_status(client: FlaskClient, analysis: Analysis):

# GIVEN a valid request to set the status to completed
request = AnalysisUpdateRequest(status=TrailblazerStatus.COMPLETED)
data = request.model_dump_json()
data: str = request.model_dump_json()

# WHEN updating the analysis to be completed
response = client.put(f"/api/v1/analyses/{analysis.id}", data=data, content_type=TYPE_JSON)
Expand All @@ -35,7 +35,7 @@ def test_update_analysis_comment(client: FlaskClient, analysis: Analysis):
# GIVEN a valid request to set the comment
new_comment = "new comment"
request = AnalysisUpdateRequest(comment=new_comment)
data = request.model_dump_json()
data: str = request.model_dump_json()

# WHEN updating the analysis with a comment
response = client.put(f"/api/v1/analyses/{analysis.id}", data=data, content_type=TYPE_JSON)
Expand All @@ -55,7 +55,7 @@ def test_update_analysis_visibility(client: FlaskClient, analysis: Analysis):

# GIVEN a valid request to set the visibility
request = AnalysisUpdateRequest(is_visible=False)
data = request.model_dump_json()
data: str = request.model_dump_json()

# WHEN updating the analysis with a comment
response = client.put(f"/api/v1/analyses/{analysis.id}", data=data, content_type=TYPE_JSON)
Expand All @@ -72,7 +72,7 @@ def test_update_analysis_visibility(client: FlaskClient, analysis: Analysis):

def test_update_analysis_invalid_request(client: FlaskClient, analysis: Analysis):
# GIVEN an invalid request
data = json.dumps({"status": "invalid_status"})
data: str = json.dumps({"status": "invalid_status"})

# WHEN updating the analysis with an invalid request
response = client.put(f"/api/v1/analyses/{analysis.id}", data=data, content_type=TYPE_JSON)
Expand Down

0 comments on commit 4a5c26d

Please sign in to comment.