structure and test check changed

moevm · Mar 11, 2024 · a53c77a · a53c77a
1 parent d462a12
commit a53c77a
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 31 deletions.
diff --git a/.github/workflows/selenium_tests.yml b/.github/workflows/selenium_tests.yml
@@ -19,16 +19,17 @@ jobs:
           docker-compose -f docker-compose-tests.yml build
       - name: Run docker-compose-tests
         run: |
-          docker-compose -f docker-compose-tests.yml up
-          ./tests/docker_check_tests.sh
-      - name: Tests results
-        run: |
-          docker-compose -f docker-compose-tests.yml logs selenium-tests
-          if [ $(docker-compose -f docker-compose-tests.yml logs selenium-tests | grep -c "OK") -eq 1 ]; then
-              echo true
-              exit 0
-          else
-              echo false
-              exit 1
-          fi
+          docker-compose -f docker-compose-tests.yml up -d
+          chmod +x tests/scripts/docker_check_tests.sh
+          ./tests/scripts/docker_check_tests.sh
+      # - name: Tests results
+      #   run: |
+      #     docker-compose -f docker-compose-tests.yml logs selenium-tests
+      #     if [ $(docker-compose -f docker-compose-tests.yml logs selenium-tests | grep -c "OK") -eq 1 ]; then
+      #         echo true
+      #         exit 0
+      #     else
+      #         echo false
+      #         exit 1
+      #     fi
 
diff --git a/tests/docker_check_tests.sh b/tests/docker_check_tests.sh
diff --git a/tests/example_of_pres.pptx b/tests/example_of_pres.pptx
diff --git a/tests/example_of_report.doc b/tests/example_of_report.doc
diff --git a/tests/example_of_report.docx b/tests/example_of_report.docx
diff --git a/tests/main.py b/tests/main.py
@@ -5,20 +5,19 @@
 from basic_selenium_test import BasicSeleniumTest
 from test_statistic import StatisticTestSelenium
 from test_authorization import AuthTestSelenium
-from test_pres_load import PresLoadTestSelenium
 from test_single_card_check import SingleCheckTestSelenium
 from test_version import VersionTestSelenium
-from tests.test_file_load import FileLoadTestSelenium
+from test_file_load import FileLoadTestSelenium
 
 def parse_arguments():
     parser = argparse.ArgumentParser(description='Run Selenium tests with specified data')
     parser.add_argument('--host', type=str, default='http://127.0.0.1:8080', help='Host address for testing')
     parser.add_argument('--login', type=str, required=True, help='insert Username')
     parser.add_argument('--password', type=str, required=True, help='insert Password')
     script_dir = os.path.dirname(os.path.abspath(__file__))
-    parser.add_argument('--pres', type=str, default=os.path.join(script_dir, 'example_of_pres.pptx'), help='your path to press for testing')
-    parser.add_argument('--report', type=str, default=os.path.join(script_dir, 'example_of_report.docx'), help='your path to report in .docx')
-    parser.add_argument('--report_doc', type=str, default=os.path.join(script_dir, 'example_of_report.doc'), help='your path to report in .doc')
+    parser.add_argument('--pres', type=str, default=os.path.join(script_dir, 'tests_data/example_of_pres.pptx'), help='your path to press for testing')
+    parser.add_argument('--report', type=str, default=os.path.join(script_dir, 'tests_data/example_of_report.docx'), help='your path to report in .docx')
+    parser.add_argument('--report_doc', type=str, default=os.path.join(script_dir, 'tests_data/example_of_report.doc'), help='your path to report in .doc')
 
 
     return parser.parse_args()