WordPress.org
Get WordPress

Make WordPress Core

Ticket #25854: ticket-25854-grunt-phpunit.patch

File ticket-25854-grunt-phpunit.patch, 3.7 KB (added by bpetty, 11 years ago)

  • Gruntfile.js 

    diff --git Gruntfile.js Gruntfile.js
index 8d4955f..de3c00b 100644
    module.exports = function(grunt) { 
    137137                qunit: {
    138138                        files: ['tests/qunit/**/*.html']
    139139                },
     140                phpunit: {
     141                        default: {
     142                                cmd: 'phpunit',
     143                                args: ['-c', 'tests/phpunit/phpunit.xml.dist']
     144                        },
     145                        ajax: {
     146                                cmd: 'phpunit',
     147                                args: ['-c', 'tests/phpunit/phpunit.xml.dist', '--group', 'ajax']
     148                        },
     149                        multisite: {
     150                                cmd: 'phpunit',
     151                                args: ['-c', 'tests/phpunit/multisite.xml']
     152                        }
     153                },
    140154                uglify: {
    141155                        core: {
    142156                                expand: true,
    … … module.exports = function(grunt) { 
    237251        grunt.registerTask('build', ['clean:all', 'copy:all', 'cssmin:core', 'uglify:core',
    238252                'uglify:tinymce', 'concat:tinymce', 'compress:tinymce', 'clean:tinymce']);
    239253
    240         // Testing task.
    241         grunt.registerTask('test', ['qunit']);
     254        // Testing tasks.
     255        grunt.registerMultiTask('phpunit', function() {
     256                grunt.util.spawn({
     257                        cmd: this.data.cmd,
     258                        args: this.data.args,
     259                        opts: {stdio: 'inherit'}
     260                }, this.async());
     261        });
     262        grunt.registerTask('test', ['phpunit:default', 'qunit']);
    242263
    243264        // Default task.
    244265        grunt.registerTask('default', ['build']);

  • deleted file phpunit.xml.dist 

    diff --git phpunit.xml.dist phpunit.xml.dist
deleted file mode 100644
index 2178ce2..0000000
    + -  
    1 <phpunit
    2         bootstrap="tests/phpunit/includes/bootstrap.php"
    3         backupGlobals="false"
    4         colors="true"
    5         >
    6     <testsuites>
    7         <!-- Default test suite to run all tests -->
    8         <testsuite>
    9             <directory suffix=".php">tests/phpunit/tests</directory>
    10             <exclude>tests/phpunit/tests/actions/closures.php</exclude>
    11             <exclude>tests/phpunit/tests/image/editor.php</exclude>
    12             <exclude>tests/phpunit/tests/image/editor_gd.php</exclude>
    13             <exclude>tests/phpunit/tests/image/editor_imagick.php</exclude>
    14             <file phpVersion="5.3.0">tests/phpunit/tests/actions/closures.php</file>
    15             <file phpVersion="5.3.0">tests/phpunit/tests/image/editor.php</file>
    16             <file phpVersion="5.3.0">tests/phpunit/tests/image/editor_gd.php</file>
    17             <file phpVersion="5.3.0">tests/phpunit/tests/image/editor_imagick.php</file>
    18         </testsuite>
    19     </testsuites>
    20     <groups>
    21         <exclude>
    22             <group>ajax</group>
    23         </exclude>
    24     </groups>
    25     <logging>
    26         <log type="junit" target="tests/phpunit/build/logs/junit.xml" logIncompleteSkipped="false"/>
    27     </logging>
    28 </phpunit>

  • new file tests/phpunit/phpunit.xml.dist 

    diff --git tests/phpunit/phpunit.xml.dist tests/phpunit/phpunit.xml.dist
new file mode 100644
index 0000000..c9ed498
    - +  
     1<phpunit
     2        bootstrap="includes/bootstrap.php"
     3        backupGlobals="false"
     4        colors="true"
     5        >
     6    <testsuites>
     7        <!-- Default test suite to run all tests -->
     8        <testsuite>
     9            <directory suffix=".php">tests</directory>
     10            <exclude>tests/actions/closures.php</exclude>
     11            <exclude>tests/image/editor.php</exclude>
     12            <exclude>tests/image/editor_gd.php</exclude>
     13            <exclude>tests/image/editor_imagick.php</exclude>
     14            <file phpVersion="5.3.0">tests/actions/closures.php</file>
     15            <file phpVersion="5.3.0">tests/image/editor.php</file>
     16            <file phpVersion="5.3.0">tests/image/editor_gd.php</file>
     17            <file phpVersion="5.3.0">tests/image/editor_imagick.php</file>
     18        </testsuite>
     19    </testsuites>
     20    <groups>
     21        <exclude>
     22            <group>ajax</group>
     23        </exclude>
     24    </groups>
     25    <logging>
     26        <log type="junit" target="build/logs/junit.xml" logIncompleteSkipped="false"/>
     27    </logging>
     28</phpunit>