From d9791f79d65ebbdca8f30fbbf11a5db8193c3f8e Mon Sep 17 00:00:00 2001
From: ellenyuX <ellen.yu@computas.com>
Date: Tue, 13 Aug 2024 12:05:22 +0200
Subject: [PATCH 01/18] Modified tests, and added test to workflow

---
 .github/workflows/deploy-dev-environment.yml | 3 +++
 src/test/test_db.py                          | 7 ++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/deploy-dev-environment.yml b/.github/workflows/deploy-dev-environment.yml
index e899e78..e650541 100644
--- a/.github/workflows/deploy-dev-environment.yml
+++ b/.github/workflows/deploy-dev-environment.yml
@@ -31,6 +31,9 @@ jobs:
         run: pip install -r requirements.txt
         
       # Optional: Add step to run tests here (PyTest, Django test suites, etc.)
+      - name: Run tests
+        run: |
+        python3 /src/runTests.py --keys "$(echo '[{\"name\": \"SECRET_KEY\", \"value\": \"${{ secrets.SECRET_KEY }}\"}]')"
 
       - name: Zip artifact for deployment
         run: zip release.zip ./* -r
diff --git a/src/test/test_db.py b/src/test/test_db.py
index 08a1aa3..79e5582 100644
--- a/src/test/test_db.py
+++ b/src/test/test_db.py
@@ -7,13 +7,18 @@
 import uuid
 import datetime
 from pytest import raises
+import sys
+import os
+
+current_directory = os.getcwd()
+utilities_directory = current_directory.replace("/test", "")
+sys.path.insert(0, utilities_directory)
 
 from utilities.difficulties import DifficultyId
 from webapp import api
 from webapp import models
 from utilities.exceptions import UserError
 
-
 class TestValues:
     PLAYER_ID = uuid.uuid4().hex
     PLAYER_2 = uuid.uuid4().hex

From 6b83067ecaf8494a741cb2df3b33787090a9c8d9 Mon Sep 17 00:00:00 2001
From: ellenyuX <ellen.yu@computas.com>
Date: Tue, 13 Aug 2024 12:08:02 +0200
Subject: [PATCH 02/18] fixed small typo in yaml

---
 .github/workflows/deploy-dev-environment.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/deploy-dev-environment.yml b/.github/workflows/deploy-dev-environment.yml
index e650541..890779a 100644
--- a/.github/workflows/deploy-dev-environment.yml
+++ b/.github/workflows/deploy-dev-environment.yml
@@ -33,7 +33,7 @@ jobs:
       # Optional: Add step to run tests here (PyTest, Django test suites, etc.)
       - name: Run tests
         run: |
-        python3 /src/runTests.py --keys "$(echo '[{\"name\": \"SECRET_KEY\", \"value\": \"${{ secrets.SECRET_KEY }}\"}]')"
+        python3 src/runTests.py --keys "$(echo '[{\"name\": \"SECRET_KEY\", \"value\": \"${{ secrets.SECRET_KEY }}\"}]')"
 
       - name: Zip artifact for deployment
         run: zip release.zip ./* -r

From 5748346f67608434df2f6763bb061c16a5f4f175 Mon Sep 17 00:00:00 2001
From: ellenyuX <ellen.yu@computas.com>
Date: Tue, 13 Aug 2024 12:10:40 +0200
Subject: [PATCH 03/18] another small fix

---
 .github/workflows/deploy-dev-environment.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/deploy-dev-environment.yml b/.github/workflows/deploy-dev-environment.yml
index 890779a..70218b8 100644
--- a/.github/workflows/deploy-dev-environment.yml
+++ b/.github/workflows/deploy-dev-environment.yml
@@ -33,7 +33,7 @@ jobs:
       # Optional: Add step to run tests here (PyTest, Django test suites, etc.)
       - name: Run tests
         run: |
-        python3 src/runTests.py --keys "$(echo '[{\"name\": \"SECRET_KEY\", \"value\": \"${{ secrets.SECRET_KEY }}\"}]')"
+        cd src && python runTests.py --keys='${{ secrets.TEST_SETTINGS }}'
 
       - name: Zip artifact for deployment
         run: zip release.zip ./* -r

From 7917827a66e2ce73fb5beeab85250d2f185b2415 Mon Sep 17 00:00:00 2001
From: ellenyuX <ellen.yu@computas.com>
Date: Tue, 13 Aug 2024 12:44:22 +0200
Subject: [PATCH 04/18] added another test folder with tests

---
 .github/workflows/deploy-dev-environment.yml |  2 +-
 src/tests/__init__.py                        |  0
 src/tests/test_dbmodels.py                   | 50 ++++++++++++++++++++
 3 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100644 src/tests/__init__.py
 create mode 100644 src/tests/test_dbmodels.py

diff --git a/.github/workflows/deploy-dev-environment.yml b/.github/workflows/deploy-dev-environment.yml
index 70218b8..7fe066c 100644
--- a/.github/workflows/deploy-dev-environment.yml
+++ b/.github/workflows/deploy-dev-environment.yml
@@ -33,7 +33,7 @@ jobs:
       # Optional: Add step to run tests here (PyTest, Django test suites, etc.)
       - name: Run tests
         run: |
-        cd src && python runTests.py --keys='${{ secrets.TEST_SETTINGS }}'
+        cd src && pytest tests/test_dbmodels.py --keys='${{ secrets.TEST_SETTINGS }}'
 
       - name: Zip artifact for deployment
         run: zip release.zip ./* -r
diff --git a/src/tests/__init__.py b/src/tests/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/src/tests/test_dbmodels.py b/src/tests/test_dbmodels.py
new file mode 100644
index 0000000..c7af726
--- /dev/null
+++ b/src/tests/test_dbmodels.py
@@ -0,0 +1,50 @@
+"""
+    Functions for testing to manipulate the database. The
+    functions is used on an identical test database.
+
+    YOUR IP SHOULD BE WHITELISTED DB_SERVER ON THE AZURE PROJECT
+"""
+import uuid
+import datetime
+from pytest import raises
+import sys
+import os
+
+current_directory = os.getcwd()
+utilities_directory = current_directory.replace("/tests", "")
+sys.path.insert(0, utilities_directory)
+
+from utilities.difficulties import DifficultyId
+from webapp import api
+from webapp import models
+#from utilities.exceptions import UserError
+
+class TestValues:
+    PLAYER_ID = uuid.uuid4().hex
+    PLAYER_2 = uuid.uuid4().hex
+    GAME_ID = uuid.uuid4().hex
+    TODAY = datetime.datetime.today()
+    CV_ITERATION_NAME_LENGTH = 36
+    LABELS = "label1, label2, label3"
+    STATE = "Ready"
+    DIFFICULTY_ID = 1
+
+
+def test_create_tables():
+    """
+        Check that the tables exists.
+    """
+    result = models.create_tables(api.app)
+    assert result
+
+
+def test_insert_into_games():
+    """
+        Check that records exists in Games table after inserting.
+    """
+    with api.app.app_context():
+        result = models.insert_into_games(
+            TestValues.GAME_ID, TestValues.LABELS, TestValues.TODAY, TestValues.DIFFICULTY_ID
+        )
+
+    assert result

From 26221543505f503d1f58ac7dc97596538eef1905 Mon Sep 17 00:00:00 2001
From: ellenyuX <ellen.yu@computas.com>
Date: Tue, 13 Aug 2024 12:45:24 +0200
Subject: [PATCH 05/18] trying to fix fault at workfile yaml

---
 .github/workflows/deploy-dev-environment.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/deploy-dev-environment.yml b/.github/workflows/deploy-dev-environment.yml
index 7fe066c..771c7c7 100644
--- a/.github/workflows/deploy-dev-environment.yml
+++ b/.github/workflows/deploy-dev-environment.yml
@@ -32,8 +32,7 @@ jobs:
         
       # Optional: Add step to run tests here (PyTest, Django test suites, etc.)
       - name: Run tests
-        run: |
-        cd src && pytest tests/test_dbmodels.py --keys='${{ secrets.TEST_SETTINGS }}'
+        run: cd src && pytest tests/test_dbmodels.py --keys='${{ secrets.TEST_SETTINGS }}'
 
       - name: Zip artifact for deployment
         run: zip release.zip ./* -r

From 274be12f3ca7bb240c33b7f8db4961ad2283a790 Mon Sep 17 00:00:00 2001
From: ellenyuX <ellen.yu@computas.com>
Date: Tue, 13 Aug 2024 12:50:24 +0200
Subject: [PATCH 06/18] working on yaml

---
 .github/workflows/deploy-dev-environment.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/deploy-dev-environment.yml b/.github/workflows/deploy-dev-environment.yml
index 771c7c7..61bca3d 100644
--- a/.github/workflows/deploy-dev-environment.yml
+++ b/.github/workflows/deploy-dev-environment.yml
@@ -32,7 +32,7 @@ jobs:
         
       # Optional: Add step to run tests here (PyTest, Django test suites, etc.)
       - name: Run tests
-        run: cd src && pytest tests/test_dbmodels.py --keys='${{ secrets.TEST_SETTINGS }}'
+        run: cd src && pytest tests/test_dbmodels.py
 
       - name: Zip artifact for deployment
         run: zip release.zip ./* -r

From 46264f5ddc2ac88630d25a182ec539bf58beee8b Mon Sep 17 00:00:00 2001
From: ellenyuX <ellen.yu@computas.com>
Date: Tue, 13 Aug 2024 13:03:22 +0200
Subject: [PATCH 07/18] fixing yaml

---
 .github/workflows/deploy-dev-environment.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/deploy-dev-environment.yml b/.github/workflows/deploy-dev-environment.yml
index 61bca3d..267df96 100644
--- a/.github/workflows/deploy-dev-environment.yml
+++ b/.github/workflows/deploy-dev-environment.yml
@@ -32,7 +32,7 @@ jobs:
         
       # Optional: Add step to run tests here (PyTest, Django test suites, etc.)
       - name: Run tests
-        run: cd src && pytest tests/test_dbmodels.py
+        run: cd src && pytest
 
       - name: Zip artifact for deployment
         run: zip release.zip ./* -r

From b89d3a60f4c86522c84bf5cbb1e7c4e8fbc22c85 Mon Sep 17 00:00:00 2001
From: ellenyuX <ellen.yu@computas.com>
Date: Tue, 13 Aug 2024 13:09:23 +0200
Subject: [PATCH 08/18] hoping this yaml is working

---
 .github/workflows/deploy-dev-environment.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/deploy-dev-environment.yml b/.github/workflows/deploy-dev-environment.yml
index 267df96..bb7856a 100644
--- a/.github/workflows/deploy-dev-environment.yml
+++ b/.github/workflows/deploy-dev-environment.yml
@@ -32,7 +32,7 @@ jobs:
         
       # Optional: Add step to run tests here (PyTest, Django test suites, etc.)
       - name: Run tests
-        run: cd src && pytest
+        run: cd src && pytest runTests.py --keys='${{ secrets.TEST_SETTINGS }}'
 
       - name: Zip artifact for deployment
         run: zip release.zip ./* -r

From 4f9e4dedc96ed62b45793a0122b09f9f422f2b78 Mon Sep 17 00:00:00 2001
From: ellenyuX <ellen.yu@computas.com>
Date: Tue, 13 Aug 2024 13:14:02 +0200
Subject: [PATCH 09/18] working on and testing yaml

---
 .github/workflows/deploy-dev-environment.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/deploy-dev-environment.yml b/.github/workflows/deploy-dev-environment.yml
index bb7856a..9190e8d 100644
--- a/.github/workflows/deploy-dev-environment.yml
+++ b/.github/workflows/deploy-dev-environment.yml
@@ -32,7 +32,7 @@ jobs:
         
       # Optional: Add step to run tests here (PyTest, Django test suites, etc.)
       - name: Run tests
-        run: cd src && pytest runTests.py --keys='${{ secrets.TEST_SETTINGS }}'
+        run: cd src && pytest --keys='${{ secrets.TEST_SETTINGS }}'
 
       - name: Zip artifact for deployment
         run: zip release.zip ./* -r

From 050aa20a77808920a29edfa55cf34b28d3dd09fa Mon Sep 17 00:00:00 2001
From: ellenyuX <ellen.yu@computas.com>
Date: Tue, 13 Aug 2024 13:15:56 +0200
Subject: [PATCH 10/18] testing

---
 .github/workflows/deploy-dev-environment.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/deploy-dev-environment.yml b/.github/workflows/deploy-dev-environment.yml
index 9190e8d..771c7c7 100644
--- a/.github/workflows/deploy-dev-environment.yml
+++ b/.github/workflows/deploy-dev-environment.yml
@@ -32,7 +32,7 @@ jobs:
         
       # Optional: Add step to run tests here (PyTest, Django test suites, etc.)
       - name: Run tests
-        run: cd src && pytest --keys='${{ secrets.TEST_SETTINGS }}'
+        run: cd src && pytest tests/test_dbmodels.py --keys='${{ secrets.TEST_SETTINGS }}'
 
       - name: Zip artifact for deployment
         run: zip release.zip ./* -r

From a9995554fc65a3836026262d518438487f2a9576 Mon Sep 17 00:00:00 2001
From: ellenyuX <ellen.yu@computas.com>
Date: Tue, 13 Aug 2024 13:22:28 +0200
Subject: [PATCH 11/18] hope this works

---
 .github/workflows/deploy-dev-environment.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/deploy-dev-environment.yml b/.github/workflows/deploy-dev-environment.yml
index 771c7c7..b669168 100644
--- a/.github/workflows/deploy-dev-environment.yml
+++ b/.github/workflows/deploy-dev-environment.yml
@@ -32,7 +32,7 @@ jobs:
         
       # Optional: Add step to run tests here (PyTest, Django test suites, etc.)
       - name: Run tests
-        run: cd src && pytest tests/test_dbmodels.py --keys='${{ secrets.TEST_SETTINGS }}'
+        run: cd src && python3 runTests.py --keys='${{ secrets.TEST_SETTINGS }}'
 
       - name: Zip artifact for deployment
         run: zip release.zip ./* -r

From 01af2d4b47b06b6f239d321b46f7935384109443 Mon Sep 17 00:00:00 2001
From: ellenyuX <ellen.yu@computas.com>
Date: Tue, 13 Aug 2024 13:25:53 +0200
Subject: [PATCH 12/18] running the correct python tests

---
 src/runTests.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/runTests.py b/src/runTests.py
index 6f06726..46fc0fa 100644
--- a/src/runTests.py
+++ b/src/runTests.py
@@ -24,5 +24,5 @@
 # clear cli arguments as pytest reads them
 sys.argv = [sys.argv[0]]
 # run pytets
-TEST_RESULT = pytest.main()
+TEST_RESULT = pytest.main(["tests/"])
 assert TEST_RESULT == 0

From f6c2feebd3267778588d877be01d0ad4dc8e22a0 Mon Sep 17 00:00:00 2001
From: ellenyuX <ellen.yu@computas.com>
Date: Tue, 13 Aug 2024 13:39:29 +0200
Subject: [PATCH 13/18] doing some debugging

---
 src/runTests.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/runTests.py b/src/runTests.py
index 46fc0fa..a124a25 100644
--- a/src/runTests.py
+++ b/src/runTests.py
@@ -18,6 +18,7 @@
 ARGUMENTS = parser.parse_args()
 # export keys
 KEYLIST = json.loads(ARGUMENTS.keys)
+print(KEYLIST)
 for keydict in KEYLIST:
     os.environ[keydict["name"]] = keydict["value"]
 

From 9457ce5fa06d720a39192cf328d4b117b1caef86 Mon Sep 17 00:00:00 2001
From: ellenyuX <ellen.yu@computas.com>
Date: Thu, 15 Aug 2024 07:48:58 +0200
Subject: [PATCH 14/18] added necessary filepaths

---
 src/test/test_db.py        | 14 +++++++-------
 src/test/websocket_test.py | 11 +++++++++--
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/test/test_db.py b/src/test/test_db.py
index 79e5582..dc8482e 100644
--- a/src/test/test_db.py
+++ b/src/test/test_db.py
@@ -10,8 +10,8 @@
 import sys
 import os
 
-current_directory = os.getcwd()
-utilities_directory = current_directory.replace("/test", "")
+#current_directory = os.getcwd()
+utilities_directory = sys.path[0].replace("/test", "")
 sys.path.insert(0, utilities_directory)
 
 from utilities.difficulties import DifficultyId
@@ -43,7 +43,7 @@ def test_insert_into_games():
     """
     with api.app.app_context():
         result = models.insert_into_games(
-            TestValues.GAME_ID, TestValues.LABELS, TestValues.TODAY
+            TestValues.GAME_ID, TestValues.LABELS, TestValues.TODAY, DifficultyId.Easy
         )
 
     assert result
@@ -92,7 +92,7 @@ def test_illegal_parameter_games():
     """
     with raises(UserError):
         models.insert_into_games(
-            10, ["label1", "label2", "label3"], "date_time"
+            10, ["label1", "label2", "label3"], "date_time", DifficultyId.Easy
         )
 
 
@@ -162,7 +162,7 @@ def test_delete_session_from_game():
     game_id = uuid.uuid4().hex
     player_id = uuid.uuid4().hex
     with api.app.app_context():
-        models.insert_into_games(game_id, TestValues.LABELS, TestValues.TODAY)
+        models.insert_into_games(game_id, TestValues.LABELS, TestValues.TODAY, DifficultyId.Medium)
         models.insert_into_players(player_id, game_id, "Waiting")
         models.insert_into_mulitplayer(game_id, player_id, None)
         result = models.delete_session_from_game(game_id)
@@ -185,7 +185,7 @@ def test_get_n_labels_correct_size():
     """
     with api.app.app_context():
         for i in range(5):
-            result = models.get_n_labels(i)
+            result = models.get_n_labels(i, DifficultyId.Hard)
             assert len(result) == i
 
 
@@ -226,4 +226,4 @@ def test_get_iteration_name_length():
     with api.app.app_context():
         iteration_name = models.get_iteration_name()
 
-    assert len(iteration_name) == TestValues.CV_ITERATION_NAME_LENGTH
+    assert len(iteration_name) > 0
diff --git a/src/test/websocket_test.py b/src/test/websocket_test.py
index 2bc60f1..d930a29 100644
--- a/src/test/websocket_test.py
+++ b/src/test/websocket_test.py
@@ -11,9 +11,13 @@
 import json
 import tempfile
 import werkzeug
+import sys
+import os
 
-from webapp.api import app, socketio
+utilities_directory = sys.path[0].replace("/test", "")
+sys.path.insert(0, utilities_directory)
 
+from webapp.api import app, socketio
 
 HARAMBE_PATH = "data/harambe.png"
 mock_classifier = MagicMock()
@@ -31,6 +35,9 @@ def test_clients():
         test_client2 = socketio.test_client(
             app, flask_test_client=flask_client
         )
+        """ response = flask_client.get("/")
+        assert response.status_code == 200 """
+        
         yield flask_client, test_client1, test_client2
 
 
@@ -59,7 +66,7 @@ def four_test_clients():
     ('{"pair_id": "same_pair_id"}')])
 def test_join_game_same_pair_id(test_clients, data, ):
     """
-        tests wether a player is able to join game
+        tests whether a player is able to join game
     """
     _, ws_client1, ws_client2 = test_clients
 

From 0c8475ab13107563997126d99e5999ea5caf1172 Mon Sep 17 00:00:00 2001
From: ellenyuX <ellen.yu@computas.com>
Date: Mon, 19 Aug 2024 16:19:59 +0200
Subject: [PATCH 15/18] Fixed tests for test_db.py

---
 src/test/test_db.py  | 34 +++++++++++++++++-----------------
 src/webapp/models.py | 14 +++++++-------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/test/test_db.py b/src/test/test_db.py
index dc8482e..11b1928 100644
--- a/src/test/test_db.py
+++ b/src/test/test_db.py
@@ -48,34 +48,34 @@ def test_insert_into_games():
 
     assert result
 
-
-def test_insert_into_scores():
+def test_insert_into_players():
     """
-        Check that records exists in Scores table after inserting.
+        Check that record exists in Players table after inserting.
     """
-    easy_difficulty = DifficultyId.Easy
     with api.app.app_context():
-        result = models.insert_into_scores(
-            "Test User", 500, TestValues.TODAY, easy_difficulty)
+        result = models.insert_into_players(
+            TestValues.PLAYER_ID, TestValues.GAME_ID, TestValues.STATE
+        )
 
     assert result
 
 
-def test_insert_into_players():
+def test_insert_into_scores():
     """
-        Check that record exists in Players table after inserting.
+        Check that records exists in Scores table after inserting.
     """
     with api.app.app_context():
-        result = models.insert_into_players(
-            TestValues.PLAYER_ID, TestValues.GAME_ID, TestValues.STATE
-        )
 
-    assert result
+       #models.insert_into_players(TestValues.PLAYER_ID, TestValues.GAME_ID, TestValues.STATE)
+       
+        result = models.insert_into_scores(
+            TestValues.PLAYER_ID, 500, TestValues.TODAY, DifficultyId.Easy)
 
+    assert result
 
-def test_insert_into_mulitplayer():
+def test_insert_into_multiplayer():
     """
-        Check that record exists in MulitPlayer after inserting.
+        Check that record exists in MultiPlayer after inserting.
     """
     with api.app.app_context():
         result = models.insert_into_mulitplayer(
@@ -133,7 +133,7 @@ def test_illegal_parameter_mulitplayer():
         models.insert_into_mulitplayer(100, 200, 11)
 
 
-def test_query_euqals_insert_games():
+def test_query_equals_insert_games():
     """
         Check that inserted record is the same as record catched by query.
     """
@@ -202,13 +202,13 @@ def test_to_norwegian_correct_translation():
         Test that to_norwegian translates words correctly
     """
     english_words = ["mermaid", "axe", "airplane"]
-    norwgian_words = ["havfrue", "øks", "fly"]
+    norwegian_words = ["havfrue", "øks", "fly"]
 
     with api.app.app_context():
         for i in range(0, len(english_words)):
             translation = models.to_norwegian(english_words[i])
             print(translation)
-            assert translation == norwgian_words[i]
+            assert translation == norwegian_words[i]
 
 
 def test_to_norwegian_illegal_parameter():
diff --git a/src/webapp/models.py b/src/webapp/models.py
index 75e8c56..71066fe 100644
--- a/src/webapp/models.py
+++ b/src/webapp/models.py
@@ -187,9 +187,9 @@ def insert_into_scores(player_id, score, date, difficulty_id: DifficultyId):
         and isinstance(difficulty_id, int)
     ):
         try:
-            score = Scores(player_id=player_id, score=score,
+            scores = Scores(player_id=player_id, score=score,
                            date=date, difficulty_id=difficulty_id)
-            db.session.add(score)
+            db.session.add(scores)
             db.session.commit()
             return True
         except Exception as e:
@@ -371,7 +371,7 @@ def update_iteration_name(new_name):
 
 def delete_session_from_game(game_id):
     """
-        To avoid unecessary data in the database this function is called by
+        To avoid unnecessary data in the database this function is called by
         the api after a session is finished. The record in games table,
         connected to the particular game_id, is deleted.
     """
@@ -448,7 +448,7 @@ def get_daily_high_score(difficulty_id):
 
 def get_top_n_high_score_list(top_n, difficulty_id):
     """
-        Funtion for reading total top n list from database.
+        Function for reading total top n list from database.
 
         Parameter: top_n, number of players in top list.
 
@@ -460,7 +460,7 @@ def get_top_n_high_score_list(top_n, difficulty_id):
             Scores.query.filter_by(difficulty_id=difficulty_id).order_by(
                 Scores.score.desc()).limit(top_n).all()
         )
-        # strucutre data
+   
         new = [
             {"id": score.score_id, "score": score.score}
             for score in top_n_list
@@ -475,7 +475,7 @@ def get_top_n_high_score_list(top_n, difficulty_id):
 
 def to_norwegian(english_label):
     """
-        Reads the labels tabel and return the norwegian translation of the
+        Reads the labels-table and return the norwegian translation of the
         english word.
     """
     try:
@@ -490,7 +490,7 @@ def to_norwegian(english_label):
 
 def to_english(norwegian_label):
     """
-        Reads the labels table and return the english translation of the norwegian label
+        Reads the labels-table and return the english translation of the norwegian label
     """
     try:
         query = Labels.query.filter(Labels.norwegian == norwegian_label)[0]

From 90c1f9e69bbfa65f71119bc5314c8cd02375bb2a Mon Sep 17 00:00:00 2001
From: ellenyuX <ellen.yu@computas.com>
Date: Mon, 19 Aug 2024 16:25:26 +0200
Subject: [PATCH 16/18] Small mods

---
 .github/workflows/deploy-dev-environment.yml | 4 ++--
 src/test/test_db.py                          | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/deploy-dev-environment.yml b/.github/workflows/deploy-dev-environment.yml
index b669168..01ddd63 100644
--- a/.github/workflows/deploy-dev-environment.yml
+++ b/.github/workflows/deploy-dev-environment.yml
@@ -31,8 +31,8 @@ jobs:
         run: pip install -r requirements.txt
         
       # Optional: Add step to run tests here (PyTest, Django test suites, etc.)
-      - name: Run tests
-        run: cd src && python3 runTests.py --keys='${{ secrets.TEST_SETTINGS }}'
+      # - name: Run tests
+      #  run: cd src && python3 runTests.py --keys='${{ secrets.TEST_SETTINGS }}'
 
       - name: Zip artifact for deployment
         run: zip release.zip ./* -r
diff --git a/src/test/test_db.py b/src/test/test_db.py
index 11b1928..65d612d 100644
--- a/src/test/test_db.py
+++ b/src/test/test_db.py
@@ -24,7 +24,7 @@ class TestValues:
     PLAYER_2 = uuid.uuid4().hex
     GAME_ID = uuid.uuid4().hex
     TODAY = datetime.datetime.today()
-    CV_ITERATION_NAME_LENGTH = 36
+    CV_ITERATION_NAME = "Iteration5"
     LABELS = "label1, label2, label3"
     STATE = "Ready"
 
@@ -226,4 +226,4 @@ def test_get_iteration_name_length():
     with api.app.app_context():
         iteration_name = models.get_iteration_name()
 
-    assert len(iteration_name) > 0
+    assert iteration_name == TestValues.CV_ITERATION_NAME
\ No newline at end of file

From ff4741e4b062f36043d34a9a744cfc6d88721626 Mon Sep 17 00:00:00 2001
From: ellenyuX <ellen.yu@computas.com>
Date: Mon, 19 Aug 2024 16:26:28 +0200
Subject: [PATCH 17/18] deleted unused tests

---
 src/tests/__init__.py      |  0
 src/tests/test_dbmodels.py | 50 --------------------------------------
 2 files changed, 50 deletions(-)
 delete mode 100644 src/tests/__init__.py
 delete mode 100644 src/tests/test_dbmodels.py

diff --git a/src/tests/__init__.py b/src/tests/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/src/tests/test_dbmodels.py b/src/tests/test_dbmodels.py
deleted file mode 100644
index c7af726..0000000
--- a/src/tests/test_dbmodels.py
+++ /dev/null
@@ -1,50 +0,0 @@
-"""
-    Functions for testing to manipulate the database. The
-    functions is used on an identical test database.
-
-    YOUR IP SHOULD BE WHITELISTED DB_SERVER ON THE AZURE PROJECT
-"""
-import uuid
-import datetime
-from pytest import raises
-import sys
-import os
-
-current_directory = os.getcwd()
-utilities_directory = current_directory.replace("/tests", "")
-sys.path.insert(0, utilities_directory)
-
-from utilities.difficulties import DifficultyId
-from webapp import api
-from webapp import models
-#from utilities.exceptions import UserError
-
-class TestValues:
-    PLAYER_ID = uuid.uuid4().hex
-    PLAYER_2 = uuid.uuid4().hex
-    GAME_ID = uuid.uuid4().hex
-    TODAY = datetime.datetime.today()
-    CV_ITERATION_NAME_LENGTH = 36
-    LABELS = "label1, label2, label3"
-    STATE = "Ready"
-    DIFFICULTY_ID = 1
-
-
-def test_create_tables():
-    """
-        Check that the tables exists.
-    """
-    result = models.create_tables(api.app)
-    assert result
-
-
-def test_insert_into_games():
-    """
-        Check that records exists in Games table after inserting.
-    """
-    with api.app.app_context():
-        result = models.insert_into_games(
-            TestValues.GAME_ID, TestValues.LABELS, TestValues.TODAY, TestValues.DIFFICULTY_ID
-        )
-
-    assert result

From 922a0374a2bd4b3a504c78015be8d704637d8fe0 Mon Sep 17 00:00:00 2001
From: ivaj <ivaj@computas.com>
Date: Mon, 19 Aug 2024 16:42:22 +0200
Subject: [PATCH 18/18] add pytest config file

---
 pytest.ini | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 pytest.ini

diff --git a/pytest.ini b/pytest.ini
new file mode 100644
index 0000000..e3a7cf2
--- /dev/null
+++ b/pytest.ini
@@ -0,0 +1,3 @@
+[pytest]
+testpaths = src/test
+pythonpath = src
\ No newline at end of file