Ticket #25781: 25781.5.diff

Gruntfile.js

@@ -225 +225 @@
                         }
                 },
                 qunit: {
-                        files: ['tests/qunit/**/*.html']
+                        files: ['tests/qunit/index.html']
                 },
                 phpunit: {
                         'default': {
@@ -371 +371 @@
                 }, this.async());
         });
 
-        grunt.registerTask('qunit:compiled', 'Runs QUnit tests on compiled as well as uncompiled scripts.',
-                ['build', 'copy:qunit', 'qunit']);
-        grunt.registerTask('test', 'Runs all QUnit and PHPUnit tasks.', ['qunit:compiled', 'phpunit']);
+        grunt.registerTask('qunit:compiled', 'Runs QUnit tests on compiled as well as uncompiled scripts.', function() {
+                grunt.task.run('build');
+                grunt.task.run('copy:qunit');
+                grunt.config(['qunit', 'files'], ['tests/qunit/compiled.html']);
+                grunt.task.run('qunit');
+        });
+        grunt.registerTask('test', 'Runs all QUnit and PHPUnit tasks.', ['qunit', 'qunit:compiled', 'phpunit']);
 
         // Default task.
         grunt.registerTask('default', ['build']);