From 0ee921d5bda94c708c9480753544856bcb2efb03 Mon Sep 17 00:00:00 2001
From: Marc Egger <marc.egger@uzh.ch>
Date: Thu, 15 Oct 2020 13:16:41 +0200
Subject: [PATCH] fix selenium gitlabci
---
Makefile | 5 -----
extension/Tests/selenium/qfqselenium.py | 3 +++
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/Makefile b/Makefile
index 2b0052f1c..0e7a457bb 100644
--- a/Makefile
+++ b/Makefile
@@ -116,16 +116,11 @@ phpunit:
# update composer with dev to install phpunit package
cd extension; composer update
- # create deprecated test config files and get test database password from environment variable
- # cp -v extension/Tests/phpunit_config.qfq.php extension/config.qfq.php; sed -i "s/#PHPUNIT_PASSWORD#/$(PHPUNIT_MYSQL_PASSWORD)/" extension/config.qfq.php
- # cp -v extension/Tests/phpunit_LocalConfiguration.php extension/LocalConfiguration.php
-
# mock typo3 directory structure
mkdir -p typo3conf/ext/qfq
mv -v extension/* typo3conf/ext/qfq/
# create new kind of config (qfq.json)
- # cp -v typo3conf/ext/qfq/Tests/phpunit_qfq.json typo3conf/ext/qfq.json; sed -i "s/#PHPUNIT_PASSWORD#/$(PHPUNIT_MYSQL_PASSWORD)/" typo3conf/ext/qfq.json
cp -v typo3conf/ext/qfq/Tests/phpunit_qfq.json ../qfq.json; sed -i "s/#PHPUNIT_PASSWORD#/$(PHPUNIT_MYSQL_PASSWORD)/" ../qfq.json
cp -v typo3conf/ext/qfq/Tests/phpunit_LocalConfiguration.php typo3conf/LocalConfiguration.php
diff --git a/extension/Tests/selenium/qfqselenium.py b/extension/Tests/selenium/qfqselenium.py
index fcdf724d7..7c6dcb1a9 100644
--- a/extension/Tests/selenium/qfqselenium.py
+++ b/extension/Tests/selenium/qfqselenium.py
@@ -112,6 +112,9 @@ class QfqSeleniumTestCase(unittest.TestCase):
cls.driver.set_window_size(1920, 1080)
cls.driver.implicitly_wait(5)
+ def __init__(self, *args, **kwargs):
+ super(QfqSeleniumTestCase, self).__init__()
+
@classmethod
def tearDownClass(cls):
"""
--
GitLab