From 619bf2e80dd6c225a4121507f0b9374598b94ea6 Mon Sep 17 00:00:00 2001
From: Frederick Muriuki Muriithi
Date: Mon, 8 Apr 2024 10:32:10 +0300
Subject: Fix issues caught by integration tests.
---
qc_app/parse.py | 14 +++++++-------
qc_app/templates/index.html | 2 +-
tests/conftest.py | 8 ++++----
tests/qc_app/test_parse.py | 19 +++++++------------
4 files changed, 19 insertions(+), 24 deletions(-)
diff --git a/qc_app/parse.py b/qc_app/parse.py
index ba2e63e..d20f6f0 100644
--- a/qc_app/parse.py
+++ b/qc_app/parse.py
@@ -30,7 +30,7 @@ def parse():
filename = request.args.get("filename")
filetype = request.args.get("filetype")
if speciesid is None:
- flash("No species selected", "alert-error alert-expr-data-error")
+ flash("No species selected", "alert-error error-expr-data")
errors = True
else:
try:
@@ -38,30 +38,30 @@ def parse():
species = with_db_connection(
lambda con: species_by_id(con, speciesid))
if not bool(species):
- flash("No such species.", "alert-error alert-expr-data-error")
+ flash("No such species.", "alert-error error-expr-data")
errors = True
except ValueError:
flash("Invalid speciesid provided. Expected an integer.",
- "alert-error alert-expr-data-error")
+ "alert-error error-expr-data")
errors = True
if filename is None:
- flash("No file provided", "alert-error alert-expr-data-error")
+ flash("No file provided", "alert-error error-expr-data")
errors = True
if filetype is None:
- flash("No filetype provided", "alert-error alert-expr-data-error")
+ flash("No filetype provided", "alert-error error-expr-data")
errors = True
if filetype not in ("average", "standard-error"):
- flash("Invalid filetype provided", "alert-error alert-expr-data-error")
+ flash("Invalid filetype provided", "alert-error error-expr-data")
errors = True
if filename:
filepath = os.path.join(app.config["UPLOAD_FOLDER"], filename)
if not os.path.exists(filepath):
flash("Selected file does not exist (any longer)",
- "alert-error alert-expr-data-error")
+ "alert-error error-expr-data")
errors = True
if errors:
diff --git a/qc_app/templates/index.html b/qc_app/templates/index.html
index b87a67f..588133a 100644
--- a/qc_app/templates/index.html
+++ b/qc_app/templates/index.html
@@ -59,7 +59,7 @@
enctype="multipart/form-data"
id="frm-upload-expression-data">
- {{flash_messages("error-expr-data-error")}}
+ {{flash_messages("error-expr-data")}}