Changeset 6373

Timestamp:

03/10/2017 05:02:10 AM (9 years ago)

Author:

netweb

Message:

Build/Test Tools: Update .travis.yml to explicitly use PHPUnit 5.7 for the PHP 7 builds on Travis.

• Add some more debugging to Travis.
• Clean up indentation.

Fixes #3085.

Location:

trunk

Files:

• .travis.yml (modified) (3 diffs)
• tests/phpunit/testcases/common/formatting.php (modified) (3 diffs)

trunk/.travis.yml

@@ -14 +14 @@
 # PHP version used in first build configuration.
 php:
-    - 7.1
-    - 7.0
-    - 5.6
-    - 5.5
-    - 5.4
-    - 5.3
-    - 5.2
+  - 7.1
+  - 7.0
+  - 5.6
+  - 5.5
+  - 5.4
+  - 5.3
+  - 5.2
 
 # WordPress comes from the Git mirror, where 'master' mirrors svn 'trunk' and
 # x.y mirrors the latest from the x.y branch
 env:
-    - WP_VERSION=master
-    - WP_VERSION=4.7
+  - WP_VERSION=master
+  - WP_VERSION=4.7
 
 # Build matrix options
@@ -75 +75 @@
     # setup NodeJS version using NVM
     - node --version
-    - nvm install 4
+    - nvm install 6
     - node --version
     - npm install -g grunt-cli
@@ -81 +81 @@
     - phpenv versions
     - mysql --version
+    - php --version
+    - php -m
+    - phpunit --version
+    - curl --version
+    - grunt --version
+    - git --version
+    - svn --version
 
 # before_script: Failures in this section will result in build status 'failed'
 before_script:
   - stable='^[0-9\.]+$'; if [[ "$TRAVIS_PHP_VERSION" =~ $stable ]]; then phpenv config-rm xdebug.ini; fi
+  - export PATH="$HOME/.composer/vendor/bin:$PATH"
+  - |
+  if [[ ${TRAVIS_PHP_VERSION:0:2} == "7." ]]; then
+    composer global require "phpunit/phpunit=5.7.*"
+  elif [[ ${TRAVIS_PHP_VERSION:0:3} != "5.2" ]]; then
+    composer global require "phpunit/phpunit=4.8.*"
+  fi
   - npm install
   - grunt build

trunk/tests/phpunit/testcases/common/formatting.php

@@ -135 +135 @@
         $this->assertEquals( $at_name_comma_final, bbp_make_clickable( $at_name_comma ) );
 
-        // Don"t link non-existent users
+        // Don't link non-existent users
         $text = "Don't link @non @existent @users";
         $this->assertSame( $text, bbp_make_clickable( $text ) );
@@ -174 +174 @@
 
         // Multiples
-        $at_name_in_mailto       = sprintf( "Send messages to @%s, @%s.", $link_1, $link_2 );
+        $at_name_in_mailto       = sprintf( "Send messages to @%s, @%s.", $name_1, $name_2 );
         $at_name_in_mailto_final = sprintf( "Send messages to @%s, @%s.", $link_1, $link_2 );
         $this->assertEquals( $at_name_in_mailto_final, bbp_make_clickable( $at_name_in_mailto ) );
+
+        // Two names separated by `&`
+        $at_names_inbetween_ampersand       = sprintf( "Oh hi @%s & @%s.", $name_1, $name_2 );
+        $at_names_inbetween_ampersand_final = sprintf( "Oh hi @%s & @%s.", $link_1, $link_2 );
+        $this->assertEquals( $at_names_inbetween_ampersand_final, bbp_make_clickable( $at_names_inbetween_ampersand ) );
+
+        // Two names separated by `and`
+        $at_names_inbetween_and       = sprintf( "Oh hi @%s and @%s.", $name_1, $name_2 );
+        $at_names_inbetween_and_final = sprintf( "Oh hi @%s and @%s.", $link_1, $link_2 );
+        $this->assertEquals( $at_names_inbetween_and_final, bbp_make_clickable( $at_names_inbetween_and ) );
 
         remove_filter( 'bbp_make_mentions_clickable_classes', '__return_empty_array' );
@@ -213 +223 @@
 
         // Multiples
-        $at_name_in_mailto       = sprintf( "Send messages to @%s, @non1, @%s, @non2.", $link_1, $link_2 );
+        $at_name_in_mailto       = sprintf( "Send messages to @%s, @non1, @%s, @non2.", $name_1, $name_2 );
         $at_name_in_mailto_final = sprintf( "Send messages to @%s, @non1, @%s, @non2.", $link_1, $link_2 );
         $this->assertEquals( $at_name_in_mailto_final, bbp_make_clickable( $at_name_in_mailto ) );