Changeset 12853

Timestamp:

03/01/2021 08:23:16 PM (5 years ago)

Author:

imath

Message:

Use the PHPUnit Composer dependency to run Travis tests

• Adds version 5.7 to the WordPress matrix
• Only run tests about PHP 5.6 with WP 4.9

See #8381

Location:

trunk

Files:

• .travis.yml (modified) (4 diffs)
• Gruntfile.js (modified) (1 diff)
• tests/phpunit/includes/define-constants.php (modified) (1 diff)

trunk/.travis.yml

@@ -22 +22 @@
   - 7.3
   - 7.2
-  - 5.6
 
 # WordPress comes from the Git mirror, where 'master' mirrors svn 'trunk' and
@@ -28 +27 @@
 env:
   - WP_VERSION=master BP_TRAVISCI=travis:phpunit
+  - WP_VERSION=5.7 BP_TRAVISCI=travis:phpunit
   - WP_VERSION=5.6 BP_TRAVISCI=travis:phpunit
   - WP_VERSION=5.5 BP_TRAVISCI=travis:phpunit
@@ -43 +43 @@
     - php: 7.3
       env: WP_VERSION=master BP_TRAVISCI=travis:phpcompat
+    - php: 5.6
+      env: WP_VERSION=4.9 BP_TRAVISCI=travis:phpunit
   exclude:
+    - php: 7.2
+      env: WP_VERSION=4.9 BP_TRAVISCI=travis:phpunit
     - php: 7.3
       env: WP_VERSION=4.9 BP_TRAVISCI=travis:phpunit
-    - php: 7.3
-      env: WP_VERSION=master BP_TRAVISCI=travis:phpunit
 
 # before_install: Failures in this section will result in build status 'errored'
@@ -99 +101 @@
 # before_script: Failures in this section will result in build status 'errored'
 before_script:
-  - if [[ ${TRAVIS_PHP_VERSION:0:3} == "5.6" ]]; then composer global require --dev phpunit/phpunit ^5; composer install; fi
-  - if [[ ${TRAVIS_PHP_VERSION:0:3} == "7.2" ]]; then composer global require --dev phpunit/phpunit ^6; composer install; fi
-  - if [[ ${TRAVIS_PHP_VERSION:0:3} == "7.3" ]]; then composer global require --dev phpunit/phpunit ^6; composer install; fi
   - mkdir -p /tmp/node/node_modules
   - ln -s /tmp/node/node_modules $plugin_dir/node_modules

trunk/Gruntfile.js

@@ -324 +324 @@
         phpunit: {
             'default': {
-                cmd: 'phpunit',
+                cmd: './vendor/phpunit/phpunit/phpunit',
                 args: ['-c', 'phpunit.xml.dist']
             },
             'multisite': {
-                cmd: 'phpunit',
+                cmd: './vendor/phpunit/phpunit/phpunit',
                 args: ['-c', 'tests/phpunit/multisite.xml']
             },
             'codecoverage': {
-                cmd: 'phpunit',
+                cmd: './vendor/phpunit/phpunit/phpunit',
                 args: ['-c', 'tests/phpunit/codecoverage.xml' ]
             }

trunk/tests/phpunit/includes/define-constants.php

@@ -21 +21 @@
  *   up the directory tree
  */
-if ( false !== getenv( 'WP_PHPUNIT__DIR' ) ) {
+if ( false !== getenv( 'WP_PHPUNIT__DIR' ) && defined( 'BP_USE_WP_ENV_TESTS' ) ) {
     define( 'WP_TESTS_DIR', getenv( 'WP_PHPUNIT__DIR' ) );
     define( 'WP_ROOT_DIR', '/var/www/html' );