Commit 0dbb4eae authored by David Snopek's avatar David Snopek
Browse files

Issue #3275349: Update automated tests to use Chrome 100

parent 8c6f01fe

.gitlab-ci.yml

+0 −4
Original line number Diff line number Diff line
@@ -19,10 +19,6 @@ test: 
        PHP_VERSION:

          - '7.4'

          - '7.3'

          - '7.2'

          - '7.1'

          - '7.0'

          - '5.6'

      - UPGRADE:

          - '7.x-1.87'

          - '7.x-1.86'

.gitlab-ci/lando.yml

+11 −9
Original line number Diff line number Diff line
@@ -13,18 +13,20 @@ services: 
        PANOPOLY_BEHAT_FLAG_PHP_NOTICES: 1

    build:

      - mkdir -p /app/sites/default/files/screenshots

  chromedriver:

  selenium:

    type: compose

    moreHttpPorts:

      - '7900'

    services:

      image: robcherry/docker-chromedriver:latest

      image: selenium/standalone-chrome:100.0-20220405

      environment:

        CHROMEDRIVER_WHITELISTED_IPS: ""

        CHROMEDRIVER_URL_BASE: "/wd/hub"

        SCREEN_GEOMETRY: "1920x1080x24"

      privileged: true

      security_opt:

        - seccomp:unconfined

      command: ["/usr/local/bin/supervisord", "-c", "/etc/supervisord.conf"]

        SCREEN_WIDTH: "1920"

        SCREEN_HEIGHT: "1080"

        SCREEN_DEPTH: "24"

      shm_size: 2gb

      ports:

        - '7900'

      command: /opt/bin/entry_point.sh

tooling:

  behat:

    service: appserver

.gitlab-ci/test.sh

+1 −5
Original line number Diff line number Diff line
@@ -12,10 +12,6 @@ function panopoly_header() { 
	echo

}



# Switch to the composer.json/lock files that will work with old PHP.

cp composer.json-travis composer.json

cp composer.lock-travis composer.lock



# Create new Lando home directory within $CI_SHARED_DIR so that it can be

# mounted by the docker:dind service.

CI_SHARED_DIR=$(dirname $CI_PROJECT_DIR)
@@ -74,8 +70,8 @@ else 


	panopoly_header "Upgrading Panopoly..."

	cp "$CI_SHARED_DIR/panopoly-$UPGRADE/sites/default/settings.php" sites/default/

	lando drush cc all

	lando drush updb -y

	lando drush cc all

fi



# Post installation setup.

composer.json

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
        "consolidation/robo": "^1.4",

        "spomky-labs/otphp": "^9.0",

        "drupal/drupal-extension": "^4.0.1",

        "friends-of-behat/mink-extension": "^2.5",

        "symfony/yaml": "~3.4"

    },

    "replace": {

modules/panopoly/panopoly_test/behat/behat.common.yml

+8 −8
Original line number Diff line number Diff line
@@ -15,14 +15,14 @@ default: 
      selenium2:

        browser: chrome

        capabilities:

          browser: chrome

          browserName: chrome

          browserVersion: ANY

          chrome:

            switches:

              - "--headless"

              - "--disable-gpu"

          version: ANY

          marionette: true

          extra_capabilities:

            chromeOptions:

              w3c: false

              args:

                # Try to prevent random crashes: https://stackoverflow.com/a/53970825/1949744

                - "--no-sandbox"

                - "--disable-dev-shm-usage"

      #base_url: http://mydrupalsite.com

      #files_path: './profiles/panopoly/modules/panopoly/panopoly_test/tests'

    Drupal\DrupalExtension: