Changeset 26064

Timestamp:

11/09/2013 09:18:23 PM (13 years ago)

Author:

nacin

Message:

Add grunt phpunit which runs three tasks: phpunit, ajax tests, and phpunit as multisite.

You can also run grunt phpunit:default, grunt phpunit:ajax, and grunt phpunit:multisite separately.

grunt test now runs the qunit task (both compiled and uncompiled scripts) and the phpunit tasks.

props bpetty.
fixes #25854, see #25781.

File:

• trunk/Gruntfile.js (modified) (3 diffs)

trunk/Gruntfile.js

@@ -67 +67 @@
                                 src: []
                         },
-                        'qunit-compiled': {
+                        qunit: {
                                 src: 'tests/qunit/index.html',
                                 dest: 'tests/qunit/compiled.html',
@@ -160 +160 @@
                         files: ['tests/qunit/**/*.html']
                 },
+                phpunit: {
+                        default: {
+                                cmd: 'phpunit',
+                                args: ['-c', 'phpunit.xml.dist']
+                        },
+                        ajax: {
+                                cmd: 'phpunit',
+                                args: ['-c', 'phpunit.xml.dist', '--group', 'ajax']
+                        },
+                        multisite: {
+                                cmd: 'phpunit',
+                                args: ['-c', 'tests/phpunit/multisite.xml']
+                        }
+                },
                 uglify: {
                         core: {
@@ -261 +275 @@
 
         // Testing tasks.
-        grunt.registerTask('test', ['qunit']);
-        grunt.registerTask('test:compiled', ['build', 'clean:qunit', 'copy:qunit-compiled', 'qunit']);
+        grunt.registerMultiTask('phpunit', "Runs PHPUnit tests, including the ajax and multisite tests.", function() { 
+                grunt.util.spawn({ 
+                        cmd: this.data.cmd, 
+                        args: this.data.args, 
+                        opts: {stdio: 'inherit'} 
+                }, this.async()); 
+        });
+
+        grunt.registerTask('qunit:compiled', "Runs QUnit tests on compiled as well as uncompiled scripts.",
+                ['build', 'copy:qunit', 'qunit', 'clean:qunit']);
+        grunt.registerTask('test', "Runs all QUnit and PHPUnit tasks.", ['qunit:compiled', 'phpunit']);
 
         // Default task.