[Tests] Dockerized tests fix (aces#7319)

Fix dockerized tests so that they can be run locally.
jeffersoncasimir · Feb 12, 2021 · e2ae079 · e2ae079
1 parent 308657a
commit e2ae079
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 17 deletions.
diff --git a/Dockerfile.test.php7.debug b/Dockerfile.test.php7.debug
@@ -1,4 +1,4 @@
-FROM php:7.2
+FROM php:7.4
 
 RUN apt-get update && \
     apt-get install -y mariadb-client zlib1g-dev

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -13,13 +13,11 @@ services:
       - MYSQL_RANDOM_ROOT_PASSWORD=yes
 
   selenium:
-    image: selenium/standalone-firefox-debug:3.8.1-aluminum
+    image: selenium/standalone-firefox-debug:3.141.59-zirconium
     volumes:
       - /dev/shm:/dev/shm
     ports:
       - "5900:5900"
-    environment:
-      - SE_OPTS=-enablePassThrough false
 
   web:
     build:
@@ -66,7 +64,7 @@ services:
     entrypoint: /app/test/wait-for-services.sh
 
   selenium-debug:
-    image: selenium/standalone-firefox-debug:3.8.1-aluminum
+    image: selenium/standalone-firefox-debug:3.141.59-zirconium
     links:
       - web-debug:web
     ports:

diff --git a/modules/create_timepoint/test/create_timepointTest.php b/modules/create_timepoint/test/create_timepointTest.php
@@ -117,7 +117,7 @@ function testCreateTimepointErrorEmptySubproject()
         $this->safeGet(
             $this->url . "/create_timepoint/?candID=900000&identifier=900000"
         );
-        $this->webDriver->findElement(WebDriverBy::Name("fire_away"))->click();
+        $this->safeFindElement(WebDriverBy::Name("fire_away"))->click();
         $bodyText = $this->webDriver->getPageSource();
         $this->assertStringNotContainsString(
             "New time point successfully registered.",

diff --git a/modules/survey_accounts/test/survey_accountsTest.php b/modules/survey_accounts/test/survey_accountsTest.php
@@ -221,9 +221,7 @@ function testSurveyAccountsAddSurvey()
         // Ensure that an instrument must be supplied.
         $this->safeGet($this->url . "/survey_accounts/");
         $btn = self::$add;
-        $this->webDriver->executescript(
-            "document.querySelector('$btn').click()"
-        );
+        $this->safeFindElement(WebDriverBy::cssSelector($btn))->click();
         $this->safeFindElement(
             WebDriverBy::Name("CandID")
         )->sendKeys("999999");
@@ -247,9 +245,7 @@ function testSurveyAccountsAddSurvey()
         // Ensure visit label exists for a candidate.
         $this->safeGet($this->url . "/survey_accounts/");
         $btn = self::$add;
-        $this->webDriver->executescript(
-            "document.querySelector('$btn').click()"
-        );
+        $this->safeFindElement(WebDriverBy::cssSelector($btn))->click();
         $this->safeFindElement(
             WebDriverBy::Name("CandID")
         )->sendKeys("999999");

diff --git a/test/phpunit.xml b/test/phpunit.xml
@@ -56,14 +56,13 @@
             <directory>../modules/user_accounts/test/</directory>
             <directory>../test/test_instrument/</directory>
         </testsuite>
-
     </testsuites>
     <!-- This is currently breaking the coverage.xml generation, so
          for now it's disabled, but eventually we'll want to make
          sure everything is tested.. -->
 
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
+    <coverage>
+        <include>
             <directory suffix=".inc">../php/libraries</directory>
             <!-- CodeCov crashes because installer/ has classes with the same
                  name as libraries/, so for now we only cover libraries and
@@ -72,7 +71,7 @@
             <!--directory suffix=".php">../htdocs</directory-->
             <directory suffix=".inc">../modules/*/php</directory>
             <!--directory>../modules/dashboard/ajax/</directory-->
-        </whitelist>
-    </filter>
+        </include>
+    </coverage>
 
 </phpunit>