Merge pull request #23 from LionsAd/phpunit-core

Add new phpunit-core runner for Drupal 8.

.travis.yml

@@ -36,9 +36,9 @@ matrix:
   exclude:
   # Drupal-8 does not work on PHP 5.3 or PHP 5.4.
     - php: 5.3
-      env: DRUPAL_TI_RUNNERS="test phpunit simpletest behat" DRUPAL_TI_ENVIRONMENT="drupal-8" DRUPAL_TI_SAVE_CACHE="0"
+      env: DRUPAL_TI_RUNNERS="test phpunit phpunit-core simpletest behat" DRUPAL_TI_ENVIRONMENT="drupal-8" DRUPAL_TI_SAVE_CACHE="0"
     - php: 5.4
-      env: DRUPAL_TI_RUNNERS="test phpunit simpletest behat" DRUPAL_TI_ENVIRONMENT="drupal-8" DRUPAL_TI_SAVE_CACHE="0"
+      env: DRUPAL_TI_RUNNERS="test phpunit phpunit-core simpletest behat" DRUPAL_TI_ENVIRONMENT="drupal-8" DRUPAL_TI_SAVE_CACHE="0"
   include:
     # Test single runners on PHP 5.4.
     - php: 5.4
@@ -52,6 +52,9 @@ matrix:
       env: DRUPAL_TI_BEHAT_DRIVER="selenium" DRUPAL_TI_BEHAT_BROWSER="firefox" DRUPAL_TI_RUNNERS="behat" DRUPAL_TI_ENVIRONMENT="drupal-7" DRUPAL_TI_SAVE_CACHE="0"
     - php: 5.4
       env: DRUPAL_TI_BEHAT_DRIVER="selenium" DRUPAL_TI_BEHAT_BROWSER="chrome" DRUPAL_TI_RUNNERS="behat" DRUPAL_TI_ENVIRONMENT="drupal-7" DRUPAL_TI_SAVE_CACHE="0"
+    # Test phpunit-core in isolation.
+    - php: 5.5
+      env: DRUPAL_TI_RUNNERS="phpunit-core" DRUPAL_TI_ENVIRONMENT="drupal-8" DRUPAL_TI_SAVE_CACHE="0"
     # Test working hhvm tests.
     - php: hhvm
       env: DRUPAL_TI_RUNNERS="phpunit behat" DRUPAL_TI_ENVIRONMENT="drupal-8" DRUPAL_TI_SAVE_CACHE="0"
@@ -104,6 +107,10 @@ env:
 
     # PHPUnit specific commandline arguments.
     - DRUPAL_TI_PHPUNIT_ARGS=""
+    # Specifying the phpunit-core src/ directory is useful when e.g. a vendor/
+    # directory is present in the module directory, which phpunit would then
+    # try to find tests in. This option is relative to $TRAVIS_BUILD_DIR.
+    - DRUPAL_TI_PHPUNIT_CORE_SRC_DIRECTORY="./tests/src"
 
     # Code coverage via coveralls.io
     - DRUPAL_TI_COVERAGE="satooshi/php-coveralls:0.6.*"
@@ -136,7 +143,7 @@ env:
     #- DRUPAL_TI_RUNNERS="behat" DRUPAL_TI_ENVIRONMENT="drupal-7"
     # And in combination.
     - DRUPAL_TI_RUNNERS="test phpunit simpletest behat" DRUPAL_TI_ENVIRONMENT="drupal-7"
-    - DRUPAL_TI_RUNNERS="test phpunit simpletest behat" DRUPAL_TI_ENVIRONMENT="drupal-8" DRUPAL_TI_SAVE_CACHE="0"
+    - DRUPAL_TI_RUNNERS="test phpunit phpunit-core simpletest behat" DRUPAL_TI_ENVIRONMENT="drupal-8" DRUPAL_TI_SAVE_CACHE="0"
 
 mysql:
   database: drupal_travis_db

.travis.yml.dist

@@ -68,6 +68,10 @@ env:
 
     # PHPUnit specific commandline arguments.
     - DRUPAL_TI_PHPUNIT_ARGS=""
+    # Specifying the phpunit-core src/ directory is useful when e.g. a vendor/
+    # directory is present in the module directory, which phpunit would then
+    # try to find tests in. This option is relative to $TRAVIS_BUILD_DIR.
+    - DRUPAL_TI_PHPUNIT_CORE_SRC_DIRECTORY="./tests/src"
 
     # Code coverage via coveralls.io
     - DRUPAL_TI_COVERAGE="satooshi/php-coveralls:0.6.*"

runners/phpunit-core/before_script.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+# Simple script to install drupal for travis-ci running.
+
+set -e $DRUPAL_TI_DEBUG
+
+# Ensure the right Drupal version is installed.
+drupal_ti_ensure_drupal
+
+# Ensure the module is linked into the code base and enabled.
+drupal_ti_ensure_module

runners/phpunit-core/install.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+# Simple script to install dependencies for travis-ci running.
+
+set -e $DRUPAL_TI_DEBUG
+
+# Ensure that drush is installed.
+drupal_ti_ensure_drush

runners/phpunit-core/script.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+# @file
+# Simple script to run the core phpunit tests via travis-ci.
+
+cd "$DRUPAL_TI_DRUPAL_DIR"
+
+# Find absolute path to modules directory.
+MODULE_DIR=$(cd "$DRUPAL_TI_MODULES_PATH"; pwd)
+
+ARGS=( $DRUPAL_TI_PHPUNIT_ARGS )
+
+# Run core tests
+cd core
+./vendor/bin/phpunit "${ARGS[@]}" "$MODULE_DIR/$DRUPAL_TI_MODULE_NAME/$DRUPAL_TI_PHPUNIT_CORE_SRC_DIRECTORY"

tests/drupal-7/drupal_ti_test/tests/src/DrupalTiTestTest.php

@@ -15,7 +15,7 @@
 class DrupalTiTestTest extends \PHPUnit_Framework_TestCase {
 
   /**
-   * @covers ::bar()
+   * @covers ::bar
    */
   public function test_bar() {
     $test = new DrupalTiTest();

tests/drupal-8/drupal_ti_test/tests/src/DrupalTiTestTest.php

@@ -15,7 +15,7 @@
 class DrupalTiTestTest extends \PHPUnit_Framework_TestCase {
 
   /**
-   * @covers ::bar()
+   * @covers ::bar
    */
   public function test_bar() {
     $test = new DrupalTiTest();