From 62d306791376f778fe1095e2eda1602ea918918b Mon Sep 17 00:00:00 2001 From: Ian Monroe Date: Fri, 9 Feb 2024 12:33:51 -0700 Subject: [PATCH] VPGE-54: updated profile with field label changes, updated lando config (#15) * VPGE-54: updated profile with field label changes, updated lando config * # This is a combination of 2 commits. # This is the 1st commit message: updated acquia pipelines # The commit message #2 will be skipped: # updated global settings and lock file * # This is a combination of 3 commits. # This is the 1st commit message: updated acquia pipelines # The commit message #2 will be skipped: # updated profile # The commit message #3 will be skipped: # update lockfile * updated lock * updated lock --- acquia-pipelines.yml | 4 +- composer.lock | 99 +++++++++++----------- docroot/sites/settings/global.settings.php | 2 + lando/codeception.yml | 59 +++++++++++++ lando/example.lando.yml | 73 ++++++++++------ lando/example.php.ini | 2 +- 6 files changed, 161 insertions(+), 78 deletions(-) create mode 100644 lando/codeception.yml diff --git a/acquia-pipelines.yml b/acquia-pipelines.yml index 2d284a7..d3ccd98 100644 --- a/acquia-pipelines.yml +++ b/acquia-pipelines.yml @@ -3,7 +3,7 @@ services: - composer: version: 2 - php: - version: 8.1 + version: 8.2 events: build: steps: @@ -12,4 +12,4 @@ events: script: - 'composer install --no-dev --no-interaction --optimize-autoloader' - 'vendor/bin/blt blt:telemetry:disable --no-interaction' - - 'vendor/bin/blt source:build:simplesamlphp-config' + diff --git a/composer.lock b/composer.lock index 199a09e..b270961 100644 --- a/composer.lock +++ b/composer.lock @@ -4721,17 +4721,17 @@ }, { "name": "drupal/ds", - "version": "3.18.0", + "version": "3.19.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/ds.git", - "reference": "8.x-3.18" + "reference": "8.x-3.19" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/ds-8.x-3.18.zip", - "reference": "8.x-3.18", - "shasum": "1e2a8f48e48df54b3663c5aa58a1560e64b7b292" + "url": "https://ftp.drupal.org/files/projects/ds-8.x-3.19.zip", + "reference": "8.x-3.19", + "shasum": "7a1a4ded193ad8489c123a2f20ca2c7908c65eaa" }, "require": { "drupal/core": "^10" @@ -4743,8 +4743,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-3.18", - "datestamp": "1705507467", + "version": "8.x-3.19", + "datestamp": "1707499881", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -16015,16 +16015,16 @@ }, { "name": "phenx/php-svg-lib", - "version": "0.5.1", + "version": "0.5.2", "source": { "type": "git", "url": "https://github.com/dompdf/php-svg-lib.git", - "reference": "8a8a1ebcf6aea861ef30197999f096f7bd4b4456" + "reference": "732faa9fb4309221e2bd9b2fda5de44f947133aa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dompdf/php-svg-lib/zipball/8a8a1ebcf6aea861ef30197999f096f7bd4b4456", - "reference": "8a8a1ebcf6aea861ef30197999f096f7bd4b4456", + "url": "https://api.github.com/repos/dompdf/php-svg-lib/zipball/732faa9fb4309221e2bd9b2fda5de44f947133aa", + "reference": "732faa9fb4309221e2bd9b2fda5de44f947133aa", "shasum": "" }, "require": { @@ -16055,9 +16055,9 @@ "homepage": "https://github.com/PhenX/php-svg-lib", "support": { "issues": "https://github.com/dompdf/php-svg-lib/issues", - "source": "https://github.com/dompdf/php-svg-lib/tree/0.5.1" + "source": "https://github.com/dompdf/php-svg-lib/tree/0.5.2" }, - "time": "2023-12-11T20:56:08+00:00" + "time": "2024-02-07T12:49:40+00:00" }, { "name": "phootwork/collection", @@ -17498,16 +17498,16 @@ }, { "name": "su-sws/drupal-patches", - "version": "10.1.6", + "version": "10.1.7", "source": { "type": "git", "url": "https://github.com/SU-SWS/drupal-patches.git", - "reference": "b0dd383df60ca7daab7732f0fd2ddda0c55206ca" + "reference": "c5daabffd1eff4830977fc51a9aad06e4d5a7390" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/SU-SWS/drupal-patches/zipball/b0dd383df60ca7daab7732f0fd2ddda0c55206ca", - "reference": "b0dd383df60ca7daab7732f0fd2ddda0c55206ca", + "url": "https://api.github.com/repos/SU-SWS/drupal-patches/zipball/c5daabffd1eff4830977fc51a9aad06e4d5a7390", + "reference": "c5daabffd1eff4830977fc51a9aad06e4d5a7390", "shasum": "" }, "require": { @@ -17560,6 +17560,9 @@ "drupal/field_encrypt": { "https://www.drupal.org/project/field_encrypt/issues/3299175": "https://git.drupalcode.org/project/field_encrypt/-/merge_requests/31.patch" }, + "drupal/field_group": { + "https://www.drupal.org/project/field_group/issues/2969051": "https://www.drupal.org/files/issues/2023-12-19/2969051-100_2.patch" + }, "drupal/focal_point": { "https://www.drupal.org/project/focal_point/issues/3328807": "https://www.drupal.org/files/issues/2023-01-06/3328807-focal_point-image_width_when_no_image_to_crop.patch" }, @@ -17612,9 +17615,9 @@ "description": "Drupal core and contrib shared patches", "support": { "issues": "https://github.com/SU-SWS/drupal-patches/issues", - "source": "https://github.com/SU-SWS/drupal-patches/tree/10.1.6" + "source": "https://github.com/SU-SWS/drupal-patches/tree/10.1.7" }, - "time": "2024-01-09T16:54:41+00:00" + "time": "2024-02-09T18:22:28+00:00" }, { "name": "su-sws/react_paragraphs", @@ -17688,16 +17691,16 @@ }, { "name": "su-sws/stanford_fields", - "version": "8.2.5", + "version": "8.2.6", "source": { "type": "git", "url": "https://github.com/SU-SWS/stanford_fields.git", - "reference": "548f939bbb317ee755d25074b4c2eec6d57423ae" + "reference": "b4a05474eeb7221aae30dd074435011a0835ebd1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/SU-SWS/stanford_fields/zipball/548f939bbb317ee755d25074b4c2eec6d57423ae", - "reference": "548f939bbb317ee755d25074b4c2eec6d57423ae", + "url": "https://api.github.com/repos/SU-SWS/stanford_fields/zipball/b4a05474eeb7221aae30dd074435011a0835ebd1", + "reference": "b4a05474eeb7221aae30dd074435011a0835ebd1", "shasum": "" }, "require": { @@ -17713,9 +17716,9 @@ "homepage": "https://github.com/SU-SWS/stanford_fields", "support": { "issues": "https://github.com/SU-SWS/stanford_fields/issues", - "source": "https://github.com/SU-SWS/stanford_fields/tree/8.2.5" + "source": "https://github.com/SU-SWS/stanford_fields/tree/8.2.6" }, - "time": "2023-09-11T21:33:15+00:00" + "time": "2024-02-08T21:14:34+00:00" }, { "name": "su-sws/stanford_media", @@ -17838,12 +17841,12 @@ "source": { "type": "git", "url": "https://github.com/SU-SWS/stanford_profile.git", - "reference": "d8932c33d6386e51ff8c30311cadfba5e0e19c52" + "reference": "c76ca3c344e2aeb7a1a3ca7d09dc27807aa11aa5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/SU-SWS/stanford_profile/zipball/d8932c33d6386e51ff8c30311cadfba5e0e19c52", - "reference": "d8932c33d6386e51ff8c30311cadfba5e0e19c52", + "url": "https://api.github.com/repos/SU-SWS/stanford_profile/zipball/c76ca3c344e2aeb7a1a3ca7d09dc27807aa11aa5", + "reference": "c76ca3c344e2aeb7a1a3ca7d09dc27807aa11aa5", "shasum": "" }, "require": { @@ -18015,7 +18018,7 @@ "issues": "https://github.com/SU-SWS/stanford_profile/issues", "source": "https://github.com/SU-SWS/stanford_profile/tree/11.x" }, - "time": "2024-02-06T20:49:12+00:00" + "time": "2024-02-09T17:04:40+00:00" }, { "name": "su-sws/stanford_profile_helper", @@ -18023,12 +18026,12 @@ "source": { "type": "git", "url": "https://github.com/SU-SWS/stanford_profile_helper.git", - "reference": "29d7a5fa675cdfbaa21a29d05be41467eb95f2e7" + "reference": "a2ffce1cd766f07a66b5adeef267c14a0a5ae8bb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/SU-SWS/stanford_profile_helper/zipball/29d7a5fa675cdfbaa21a29d05be41467eb95f2e7", - "reference": "29d7a5fa675cdfbaa21a29d05be41467eb95f2e7", + "url": "https://api.github.com/repos/SU-SWS/stanford_profile_helper/zipball/a2ffce1cd766f07a66b5adeef267c14a0a5ae8bb", + "reference": "a2ffce1cd766f07a66b5adeef267c14a0a5ae8bb", "shasum": "" }, "require": { @@ -18117,7 +18120,7 @@ "support": { "source": "https://github.com/SU-SWS/stanford_profile_helper/tree/9.x" }, - "time": "2024-01-30T17:07:48+00:00" + "time": "2024-02-09T17:23:16+00:00" }, { "name": "su-sws/stanford_samlauth", @@ -18153,16 +18156,16 @@ }, { "name": "su-sws/vpge_profile", - "version": "11.1.3", + "version": "11.1.5", "source": { "type": "git", "url": "https://github.com/SU-SWS/vpge_profile.git", - "reference": "653ab79d4972481ec08849b8371e90232ea152be" + "reference": "9e378ecf928ef892070329c6227e9cf97162a6c1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/SU-SWS/vpge_profile/zipball/653ab79d4972481ec08849b8371e90232ea152be", - "reference": "653ab79d4972481ec08849b8371e90232ea152be", + "url": "https://api.github.com/repos/SU-SWS/vpge_profile/zipball/9e378ecf928ef892070329c6227e9cf97162a6c1", + "reference": "9e378ecf928ef892070329c6227e9cf97162a6c1", "shasum": "" }, "require": { @@ -18341,9 +18344,9 @@ ], "description": "Installation Profile for the Stanford VPGE.", "support": { - "source": "https://github.com/SU-SWS/vpge_profile/tree/11.1.3" + "source": "https://github.com/SU-SWS/vpge_profile/tree/11.1.5" }, - "time": "2024-02-07T23:59:43+00:00" + "time": "2024-02-08T22:32:46+00:00" }, { "name": "symfony/cache", @@ -22884,16 +22887,16 @@ }, { "name": "composer/composer", - "version": "2.6.6", + "version": "2.7.1", "source": { "type": "git", "url": "https://github.com/composer/composer.git", - "reference": "683557bd2466072777309d039534bb1332d0dda5" + "reference": "aaf6ed5ccd27c23f79a545e351b4d7842a99d0bc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/composer/zipball/683557bd2466072777309d039534bb1332d0dda5", - "reference": "683557bd2466072777309d039534bb1332d0dda5", + "url": "https://api.github.com/repos/composer/composer/zipball/aaf6ed5ccd27c23f79a545e351b4d7842a99d0bc", + "reference": "aaf6ed5ccd27c23f79a545e351b4d7842a99d0bc", "shasum": "" }, "require": { @@ -22911,7 +22914,7 @@ "seld/jsonlint": "^1.4", "seld/phar-utils": "^1.2", "seld/signal-handler": "^2.0", - "symfony/console": "^5.4.11 || ^6.0.11", + "symfony/console": "^5.4.11 || ^6.0.11 || ^7", "symfony/filesystem": "^5.4 || ^6.0 || ^7", "symfony/finder": "^5.4 || ^6.0 || ^7", "symfony/polyfill-php73": "^1.24", @@ -22925,7 +22928,7 @@ "phpstan/phpstan-phpunit": "^1.0", "phpstan/phpstan-strict-rules": "^1", "phpstan/phpstan-symfony": "^1.2.10", - "symfony/phpunit-bridge": "^6.0 || ^7" + "symfony/phpunit-bridge": "^6.4.1 || ^7.0.1" }, "suggest": { "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages", @@ -22938,7 +22941,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "2.6-dev" + "dev-main": "2.7-dev" }, "phpstan": { "includes": [ @@ -22978,7 +22981,7 @@ "irc": "ircs://irc.libera.chat:6697/composer", "issues": "https://github.com/composer/composer/issues", "security": "https://github.com/composer/composer/security/policy", - "source": "https://github.com/composer/composer/tree/2.6.6" + "source": "https://github.com/composer/composer/tree/2.7.1" }, "funding": [ { @@ -22994,7 +22997,7 @@ "type": "tidelift" } ], - "time": "2023-12-08T17:32:26+00:00" + "time": "2024-02-09T14:26:28+00:00" }, { "name": "composer/metadata-minifier", diff --git a/docroot/sites/settings/global.settings.php b/docroot/sites/settings/global.settings.php index 9ee272f..eabdbc8 100644 --- a/docroot/sites/settings/global.settings.php +++ b/docroot/sites/settings/global.settings.php @@ -21,6 +21,8 @@ $settings['file_temp_path'] = '/tmp'; +$settings['stanford_capture_ownership'] = EnvironmentDetector::isProdEnv(); + if (EnvironmentDetector::isAhEnv()) { // Set the temp directory as per https://docs.acquia.com/acquia-cloud/manage/files/broken/ $settings['file_temp_path'] = '/mnt/gfs/' . EnvironmentDetector::getAhGroup() . '.' . EnvironmentDetector::getAhEnv() . '/tmp'; diff --git a/lando/codeception.yml b/lando/codeception.yml new file mode 100644 index 0000000..2613e15 --- /dev/null +++ b/lando/codeception.yml @@ -0,0 +1,59 @@ +paths: + tests: codeception + output: ../artifacts + data: ../artifacts/_data + support: codeception/_support + envs: codeception/_envs +actor_suffix: Tester +extensions: + enabled: + - Codeception\Extension\RunFailed +modules: + enabled: + - Codeception\Module\Asserts + - StanfordCaravan\Codeception\Drupal\DrupalBootstrap: + root: '/app/docroot' + server: + HTTP_HOST: 'localhost' + - StanfordCaravan\Codeception\Drupal\DrupalDrush: + drush: '/app/vendor/bin/drush' + options: + uri: 'localhost' + - PhpBrowser: + url: 'http://vpge.lndo.site/' + - WebDriver: + browser: chrome + url: 'http://vpge.lndo.site/' + host: chromedriver.vpgegryphon.internal + capabilities: + chromeOptions: + args: ["--disable-gpu"] + - StanfordCaravan\Codeception\Drupal\DrupalEntity: + cleanup_test: true + cleanup_failed: false + cleanup_suite: true + route_entities: + - node + - taxonomy_term + - media + - StanfordCaravan\Codeception\Drupal\DrupalUser: + drush: '/app/vendor/bin/drush' + default_role: 'authenticated' + driver: 'WebDriver' + cleanup_entities: + - node + - media + - file + cleanup_test: true + cleanup_failed: false + cleanup_suite: true +env: + ci: + modules: + config: + WebDriver: + url: 'http://drupal8ci/' + browser: chrome + host: selenium + port: 4444 + restart: true diff --git a/lando/example.lando.yml b/lando/example.lando.yml index 7258e61..2e06a20 100644 --- a/lando/example.lando.yml +++ b/lando/example.lando.yml @@ -1,13 +1,15 @@ name: vpge-gryphon -recipe: drupal9 +recipe: drupal10 config: webroot: docroot - php: '8.1' + php: '8.2' xdebug: false proxy: appserver: - vpge.lndo.site - diversityworks.lndo.site + adminer: + - adminervpge.lndo.site services: appserver: build_as_root: @@ -23,16 +25,17 @@ services: config: php: lando/php.ini # Uncomment the below for behat testing - # overrides: - # environment: - # BEHAT_PARAMS: >- - # { - # "extensions" : { - # "Behat\\MinkExtension" : { - # "base_url" : "https://appserver/" - # } - # } - # } + overrides: + environment: + MINK_DRIVER_ARGS_WEBDRIVER: '["chrome", {"browserName":"chrome","chromeOptions":{"args":["--disable-gpu","--headless"]}}, "http://chromedriver:4444"]' + BEHAT_PARAMS: >- + { + "extensions" : { + "Behat\\MinkExtension" : { + "base_url" : "http://vpge.lndo.site/" + } + } + } database: type: mysql:5.7 portforward: 33061 @@ -40,6 +43,12 @@ services: user: drupal password: drupal database: vpge + adminer: + type: compose + services: + image: dehy/adminer + command: /bin/s6-svscan /etc/services.d + portforward: true diversityworks: type: mysql:5.7 portforward: 33062 @@ -47,22 +56,32 @@ services: user: drupal password: drupal database: diversityworks + # Uncomment the below for behat testing + overrides: + environment: + MINK_DRIVER_ARGS_WEBDRIVER: '["chrome", {"browserName":"chrome","chromeOptions":{"args":["--disable-gpu","--headless"]}}, "http://chromedriver:4444"]' + BEHAT_PARAMS: >- + { + "extensions" : { + "Behat\\MinkExtension" : { + "base_url" : "http://diversityworks.lndo.site/" + } + } + } # Uncomment the below for behat testing. - # chromedriver: - # type: compose - # services: - # image: robcherry/docker-chromedriver:latest - # expose: - # - "4444" - # environment: - # CHROMEDRIVER_WHITELISTED_IPS: "" - # CHROMEDRIVER_URL_BASE: "/wd/hub" - # security_opt: - # - seccomp:unconfined - # command: ["/usr/local/bin/supervisord", "-c", "/etc/supervisord.conf"] - # testresults: - # type: nginx - # webroot: artifacts + chromedriver: + type: lando + api: 3 + ssl: false + sslExpose: false + services: + user: root + image: selenium/standalone-chrome:115.0 + command: /opt/bin/entry_point.sh + volumes: + - /dev/shm:/dev/shm + ports: + - 4444 tooling: blt: service: appserver diff --git a/lando/example.php.ini b/lando/example.php.ini index 9c9c249..18e3587 100644 --- a/lando/example.php.ini +++ b/lando/example.php.ini @@ -1,2 +1,2 @@ # extension=/app/library/diseval.so -extension=pcov.so +