undo re-arrange for now

maxplanck-ie · Nov 7, 2023 · 36ee91d · 36ee91d
1 parent 16e6055
commit 36ee91d
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -16,6 +16,6 @@ models*.pdf
 models.png
 models.svg
 models.dot
-frontend_testing_suite/results/playwright-tests-*/
+backend/frontend_testing_suite/results/**/trace.zip
 .*_cache/
 *.ignore
diff --git a/...nd_testing_suite/data/library_request.csv → ...nd_testing_suite/data/library_request.csv b/...nd_testing_suite/data/library_request.csv → ...nd_testing_suite/data/library_request.csv
diff --git a/...end_testing_suite/data/sample_request.csv → ...end_testing_suite/data/sample_request.csv b/...end_testing_suite/data/sample_request.csv → ...end_testing_suite/data/sample_request.csv
diff --git a/frontend_testing_suite/tests/login_page.py → ...rontend_testing_suite/tests/login_page.py b/frontend_testing_suite/tests/login_page.py → ...rontend_testing_suite/tests/login_page.py
diff --git a/...tend_testing_suite/tests/requests_page.py → ...tend_testing_suite/tests/requests_page.py b/...tend_testing_suite/tests/requests_page.py → ...tend_testing_suite/tests/requests_page.py
@@ -7,6 +7,8 @@
 import utilities
 from playwright.sync_api import Page, expect
 
+CSV_DATA = os.path.dirname(os.path.realpath(__file__)) + "/../data/"
+
 
 @pytest.fixture(scope="session")
 def browser_context_args(browser_context_args):
@@ -61,7 +63,7 @@ def test_requests_page(page: Page):
     expect(page.get_by_text("Add Libraries")).to_be_visible()
     createEmptyRowInput.fill("1")
     with open(
-        os.getcwd() + "/playwright/data/library_request.csv",
+        CSV_DATA + "library_request.csv",
         newline="",
         encoding="utf-8",
     ) as library_csv_file:
@@ -104,7 +106,7 @@ def test_requests_page(page: Page):
     expect(page.get_by_text("Add Samples")).to_be_visible()
     createEmptyRowInput.fill("1")
     with open(
-        os.getcwd() + "/playwright/data/sample_request.csv",
+        CSV_DATA + "sample_request.csv",
         newline="",
         encoding="utf-8",
     ) as sample_csv_file:
@@ -140,7 +142,7 @@ def test_requests_page(page: Page):
         "#librariesTable-body>div>div>table>tbody>tr>td>.x-grid-cell-inner-treecolumn>.x-tree-expander"
     ).nth(0).click()
     with open(
-        os.getcwd() + "/playwright/data/sample_request.csv",
+        CSV_DATA + "sample_request.csv",
         newline="",
         encoding="utf-8",
     ) as sample_csv_file:
@@ -208,7 +210,7 @@ def test_requests_page(page: Page):
         "#librariesTable-body>div>div>table>tbody>tr>td>.x-grid-cell-inner-treecolumn>.x-tree-expander"
     ).nth(1).click()
     with open(
-        os.getcwd() + "/playwright/data/library_request.csv",
+        CSV_DATA + "library_request.csv",
         newline="",
         encoding="utf-8",
     ) as library_csv_file:

diff --git a/frontend_testing_suite/tests/utilities.py → ...frontend_testing_suite/tests/utilities.py b/frontend_testing_suite/tests/utilities.py → ...frontend_testing_suite/tests/utilities.py
diff --git a/playwright.ini → backend/playwright.ini b/playwright.ini → backend/playwright.ini
@@ -1,3 +1,3 @@
 [pytest]
 python_files = frontend_testing_suite/tests/*
-addopts = --ignore=frontend_testing_suite/tests/utilities.py --browser=firefox --slowmo=75 --tracing=on --output=playwright/results/
+addopts = --ignore=frontend_testing_suite/tests/utilities.py --browser=firefox --slowmo=75 --tracing=on --output=frontend_testing_suite/results/