Merge branch 'dev' into recaptcha

Situphen · Jan 13, 2024 · 85e949e · 85e949e
2 parents 85b8938 + 8c6c3d2
commit 85e949e
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 17 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -11,7 +11,6 @@ env:
   PYTHON_VERSION: "3.9"
   MARIADB_VERSION: "10.4.10"
   COVERALLS_VERSION: "3.3.1" # check if Coverage needs to be also updated in requirements-ci.txt
-  GECKODRIVER_VERSION: "0.34.0"
 
   # As GitHub Action does not allow environment variables
   # to be used in services definitions, these are only for
@@ -184,15 +183,6 @@ jobs:
           mysql database: "ci_db_name"
           mysql root password: "ci_root_password"
 
-      - name: Install Firefox
-        run: sudo apt-get update && sudo apt-get install firefox
-
-      - name: Install Geckodriver
-        run: |
-          wget https://github.com/mozilla/geckodriver/releases/download/v${{ env.GECKODRIVER_VERSION }}/geckodriver-v${{ env.GECKODRIVER_VERSION }}-linux64.tar.gz
-          mkdir geckodriver
-          tar -xzf geckodriver-v${{ env.GECKODRIVER_VERSION }}-linux64.tar.gz -C geckodriver
-
       - name: Checkout
         uses: actions/checkout@v3
 
@@ -248,9 +238,7 @@ jobs:
           make zmd-start
 
       - name: Run tests for ${{ matrix.module }}
-        run: |
-          export PATH="$PATH:$PWD/geckodriver"
-          coverage run --source='.' manage.py test -v=2 --keepdb --settings zds.settings.ci_test ${{ matrix.module }}
+        run: coverage run --source='.' manage.py test -v=2 --keepdb --settings zds.settings.ci_test ${{ matrix.module }}
 
       - name: Analyze coverage
         shell: bash -l {0}

diff --git a/doc/source/utils/selenium.rst b/doc/source/utils/selenium.rst
@@ -52,7 +52,7 @@ Voici le contenu d'un test :
       def setUpClass(cls):
           super().setUpClass()
           options = Options()
-          options.headless = True
+          options.add_argument("--headless")
           cls.selenium = Firefox(options=options)
           cls.selenium.implicitly_wait(30)
 

diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -7,6 +7,6 @@ django-extensions==3.2.3
 Faker==22.2.0
 pre-commit==3.6.0
 PyYAML==6.0.1
-selenium==4.9.1
+selenium==4.16.0
 Sphinx==7.2.6
 sphinx-rtd-theme==2.0.0
diff --git a/zds/member/tests/tests_front.py b/zds/member/tests/tests_front.py
@@ -12,7 +12,7 @@ class MemberFrontTests(StaticLiveServerTestCase):
     def setUpClass(cls):
         super().setUpClass()
         options = Options()
-        options.headless = True
+        options.add_argument("--headless")
         cls.selenium = Firefox(options=options)
         cls.selenium.implicitly_wait(30)
 

diff --git a/zds/tutorialv2/tests/tests_front.py b/zds/tutorialv2/tests/tests_front.py
@@ -37,7 +37,7 @@ class PublicationFronttest(StaticLiveServerTestCase, TutorialTestMixin, Tutorial
     def setUpClass(cls):
         super().setUpClass()
         options = Options()
-        options.headless = True
+        options.add_argument("--headless")
         cls.selenium = Firefox(options=options)
         cls.selenium.implicitly_wait(10)