Merge branch 'release/2.0.0'

acquia · Apr 16, 2020 · e7f613e · e7f613e
2 parents 77128ed + d35a04d
commit e7f613e
Show file tree

Hide file tree

Showing 32 changed files with 3,187 additions and 2,856 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -46,10 +46,10 @@ jobs:
     - { name: "Integrated test w/ dev package versions & next minor dev version of Drupal core", env: ORCA_JOB=CORE_NEXT }
     - { name: "D9 readiness test", php: "7.3", env: ORCA_JOB=D9_READINESS }
     - { name: "Custom job", env: ORCA_JOB=CUSTOM ORCA_CUSTOM_FIXTURE_INIT_ARGS="--help" ORCA_CUSTOM_TESTS_RUN_ARGS="--help" }
-    - { name: "Integrated live test", env: ORCA_JOB=LIVE_TEST }
+    - { name: "Integrated live test", env: ORCA_JOB=LIVE_TEST ORCA_ENABLE_NIGHTWATCH=FALSE }
   allow_failures:
     - { php: "7.3", env: ORCA_JOB=D9_READINESS }
-    - env: ORCA_JOB=LIVE_TEST
+    - env: ORCA_JOB=LIVE_TEST ORCA_ENABLE_NIGHTWATCH=FALSE
 
 before_install:
   - ../orca/bin/travis/self-test/before_install.sh

diff --git a/bin/pipelines/refresh.sh b/bin/pipelines/refresh.sh
@@ -26,7 +26,7 @@
 SITE="$1"
 TARGET_ENV="$2"
 
-cd "$(dirname "$0")/../../../";
+cd "$(dirname "$0")/../../../" || exit;
 
-./vendor/bin/drush @$SITE.$TARGET_ENV sql:query --file=db.sql
-./vendor/bin/drush @$SITE.$TARGET_ENV cache:rebuild
+./vendor/bin/drush "@${SITE}.${TARGET_ENV}" sql:query --file=db.sql
+./vendor/bin/drush "@{$SITE}.{$TARGET_ENV}" cache:rebuild
diff --git a/bin/travis/_includes.sh b/bin/travis/_includes.sh
@@ -35,7 +35,8 @@ export ORCA_ROOT
 export ORCA_FIXTURE_DIR=${ORCA_FIXTURE_DIR:="$ORCA_ROOT/../orca-build"}
 export ORCA_FIXTURE_PROFILE=${ORCA_FIXTURE_PROFILE:="orca"}
 export ORCA_SUT_DIR=${ORCA_SUT_DIR:=${TRAVIS_BUILD_DIR}}
-export ORCA_SUT_HAS_NIGHTWATCH_TESTS=$(cd "$ORCA_SUT_DIR"; find . -regex ".*/Nightwatch/.*" -name \*.js)
+ORCA_SUT_HAS_NIGHTWATCH_TESTS=$(cd "$ORCA_SUT_DIR"; find . -regex ".*/Nightwatch/.*" -name \*.js)
+export ORCA_SUT_HAS_NIGHTWATCH_TESTS
 export ORCA_SUT_MACHINE_NAME=${ORCA_SUT_NAME##*\/}
 export ORCA_TELEMETRY_ENABLE=${ORCA_TELEMETRY_ENABLE:="FALSE"}
 export ORCA_AMPLITUDE_USER_ID=${ORCA_AMPLITUDE_USER_ID:="$ORCA_SUT_NAME:$ORCA_SUT_BRANCH"}
@@ -55,10 +56,6 @@ export DRUPAL_TEST_WEBDRIVER_PORT="4444"
 # too narrowly.
 export COLUMNS=125
 
-# Correct Selenium URL for new versions of Chrome/ChromeDriver:
-# @see https://github.com/acquia/orca/pull/38
-export BEHAT_PARAMS='{"extensions":{"Behat\\MinkExtension":{"selenium2":{"wd_host":"http://127.0.0.1:4444","capabilities":{"chrome":{"switches":["--headless","--disable-gpu"]}}}}}}'
-
 # Add binary directories to PATH.
 export PATH="$HOME/.composer/vendor/bin:$PATH"
 export PATH="$ORCA_ROOT/bin:$PATH"

diff --git a/bin/travis/install.sh b/bin/travis/install.sh
@@ -23,11 +23,11 @@ case "$ORCA_JOB" in
   "ISOLATED_DEV") orca debug:packages CURRENT_DEV; eval "orca fixture:init -f --sut=$ORCA_SUT_NAME --sut-only --core=CURRENT_DEV --dev --profile=$ORCA_FIXTURE_PROFILE" ;;
   "INTEGRATED_DEV") orca debug:packages CURRENT_DEV; eval "orca fixture:init -f --sut=$ORCA_SUT_NAME --core=CURRENT_DEV --dev --profile=$ORCA_FIXTURE_PROFILE" ;;
   "CORE_NEXT") orca debug:packages NEXT_DEV; eval "orca fixture:init -f --sut=$ORCA_SUT_NAME --core=NEXT_DEV --dev --profile=$ORCA_FIXTURE_PROFILE" ;;
-  "D9_READINESS") orca debug:packages D9_READINESS; eval "orca fixture:init -f --sut=$ORCA_SUT_NAME --sut-only --core='~9' --dev --profile=$ORCA_FIXTURE_PROFILE" ;;
+  "D9_READINESS") orca debug:packages D9_READINESS; eval "orca fixture:init -f --sut=$ORCA_SUT_NAME --sut-only --core=D9_READINESS --dev --profile=$ORCA_FIXTURE_PROFILE" ;;
   "CUSTOM") eval "orca fixture:init -f --sut=$ORCA_SUT_NAME --profile=$ORCA_FIXTURE_PROFILE ${ORCA_CUSTOM_FIXTURE_INIT_ARGS:=}" ;;
 esac
 
-if [[ "$ORCA_ENABLE_NIGHTWATCH" && "$ORCA_SUT_HAS_NIGHTWATCH_TESTS" && -d "$ORCA_YARN_DIR" ]]; then
+if [[ "$ORCA_ENABLE_NIGHTWATCH" = "TRUE" && "$ORCA_SUT_HAS_NIGHTWATCH_TESTS" = "TRUE" && -d "$ORCA_YARN_DIR" ]]; then
   (
     cd "$ORCA_YARN_DIR" || exit
     eval "yarn install"

diff --git a/bin/travis/script.sh b/bin/travis/script.sh
@@ -25,28 +25,16 @@ case "$ORCA_JOB" in
   "DEPRECATED_CODE_SCAN") eval "orca qa:deprecated-code-scan --sut=$ORCA_SUT_NAME"; unset ORCA_ENABLE_NIGHTWATCH ;;
   "DEPRECATED_CODE_SCAN_CONTRIB") eval "orca qa:deprecated-code-scan --contrib"; unset ORCA_ENABLE_NIGHTWATCH ;;
   "ISOLATED_RECOMMENDED") eval "orca qa:automated-tests --sut=$ORCA_SUT_NAME --sut-only" ;;
-  "INTEGRATED_RECOMMENDED")
-    eval "orca qa:automated-tests --sut=$ORCA_SUT_NAME $SUT_ONLY --phpunit"
-    eval "orca qa:automated-tests --sut=$ORCA_SUT_NAME --sut-only --behat"
-    ;;
-  "CORE_PREVIOUS")
-    eval "orca qa:automated-tests --sut=$ORCA_SUT_NAME $SUT_ONLY --phpunit"
-    eval "orca qa:automated-tests --sut=$ORCA_SUT_NAME --sut-only --behat"
-    ;;
+  "INTEGRATED_RECOMMENDED") eval "orca qa:automated-tests --sut=$ORCA_SUT_NAME $SUT_ONLY" ;;
+  "CORE_PREVIOUS") eval "orca qa:automated-tests --sut=$ORCA_SUT_NAME $SUT_ONLY" ;;
   "ISOLATED_DEV") eval "orca qa:automated-tests --sut=$ORCA_SUT_NAME --sut-only" ;;
-  "INTEGRATED_DEV")
-    eval "orca qa:automated-tests --sut=$ORCA_SUT_NAME $SUT_ONLY --phpunit"
-    eval "orca qa:automated-tests --sut=$ORCA_SUT_NAME --sut-only --behat"
-    ;;
-  "CORE_NEXT")
-    eval "orca qa:automated-tests --sut=$ORCA_SUT_NAME $SUT_ONLY --phpunit"
-    eval "orca qa:automated-tests --sut=$ORCA_SUT_NAME --sut-only --behat"
-    ;;
+  "INTEGRATED_DEV") eval "orca qa:automated-tests --sut=$ORCA_SUT_NAME $SUT_ONLY" ;;
+  "CORE_NEXT") eval "orca qa:automated-tests --sut=$ORCA_SUT_NAME $SUT_ONLY" ;;
   "D9_READINESS") eval "orca qa:automated-tests --sut=$ORCA_SUT_NAME --sut-only" ;;
   "CUSTOM") eval "orca qa:automated-tests --sut=$ORCA_SUT_NAME ${ORCA_CUSTOM_TESTS_RUN_ARGS:=}" ;;
 esac
 
-if [[ "$ORCA_ENABLE_NIGHTWATCH" && "$ORCA_SUT_HAS_NIGHTWATCH_TESTS" && -d "$ORCA_YARN_DIR" ]]; then
+if [[ "$ORCA_ENABLE_NIGHTWATCH" = "TRUE" && "$ORCA_SUT_HAS_NIGHTWATCH_TESTS" = "TRUE" && -d "$ORCA_YARN_DIR" ]]; then
   (
     cd "$ORCA_YARN_DIR" || exit
     orca fixture:run-server &

diff --git a/bin/travis/self-test/before_install.sh b/bin/travis/self-test/before_install.sh
@@ -9,7 +9,7 @@
 # DESCRIPTION
 #     Places an example SUT.
 
-cd "$(dirname "$0")"; source _includes.sh
+cd "$(dirname "$0")" || exit; source _includes.sh
 
 (
   cd ../../../

diff --git a/bin/travis/self-test/script.sh b/bin/travis/self-test/script.sh
@@ -9,7 +9,7 @@
 # DESCRIPTION
 #     Runs static code analysis and automated tests on ORCA itself.
 
-cd "$(dirname "$0")"; source _includes.sh
+cd "$(dirname "$0")" || exit; source _includes.sh
 
 if [[ "$ORCA_JOB" = "STATIC_CODE_ANALYSIS" ]]; then
   (

diff --git a/composer.json b/composer.json
@@ -15,15 +15,14 @@
         "ext-json": "*",
         "ext-sqlite3": "*",
         "acquia/coding-standards": "^0.4.0",
-        "behat/behat": "^3.5",
         "composer/composer": "^1.7",
         "dealerdirect/phpcodesniffer-composer-installer": "^0.5",
         "ergebnis/composer-normalize": "^2.0.0",
         "hassankhan/config": "^2.1",
-        "jakub-onderka/php-console-highlighter": "^0.4.0",
-        "jakub-onderka/php-parallel-lint": "^1.0",
         "myclabs/php-enum": "^1.7",
         "oscarotero/env": "^1.2",
+        "php-parallel-lint/php-console-highlighter": "^0.4.0",
+        "php-parallel-lint/php-parallel-lint": "^1.2.0",
         "phploc/phploc": "^5.0",
         "phpmd/phpmd": "^2.6",
         "stecman/symfony-console-completion": "^0.10.1",
@@ -38,6 +37,7 @@
         "symfony/process": "^4.1",
         "symfony/yaml": "^4.1",
         "vaimo/binary-chromedriver": "^5.0",
+        "weitzman/drupal-test-traits": "^1.3",
         "zumba/amplitude-php": "^1.0"
     },
     "conflict": {