Remove some duplication

laravel · Feb 7, 2016 · cc5cab9 · cc5cab9
1 parent f0491ba
commit cc5cab9
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 50 deletions.
diff --git a/tasks/phpspec.js b/tasks/phpspec.js
@@ -2,11 +2,12 @@ var gulp   = require('gulp');
 var Elixir = require('laravel-elixir');
 
 var config = Elixir.config;
-var notify = new Elixir.Notification();
+var runTests = require('./shared/Tests.js');
+
 
 /*
  |----------------------------------------------------------------
- | PHPUnit Testing
+ | PHPSpec Testing
  |----------------------------------------------------------------
  |
  | This task will trigger your entire PHPUnit test suite and it
@@ -16,24 +17,10 @@ var notify = new Elixir.Notification();
  */
 
 Elixir.extend('phpSpec', function(src, command) {
-    src = src || (config.testing.phpSpec.path + '/**/*Spec.php'),
-    command = command || 'vendor/bin/phpspec run';
-
-    new Elixir.Task('phpSpec', function(error) {
-        Elixir.Log.heading('Triggering PHPSpec: ' + command);
-
-        return (
-            gulp
-            .src('')
-            .pipe(Elixir.Plugins.shell(command))
-            .on('error', function(e) {
-                notify.forFailedTests(e, 'PHPSpec');
-
-                this.emit('end');
-            })
-            .pipe(notify.forPassedTests('PHPSpec'))
-        );
-    })
-    .watch(src);
+    runTests(
+        'PHPSpec',
+        src || (config.testing.phpSpec.path + '/**/*Spec.php'),
+        command || 'vendor/bin/phpspec run'
+    );
 });
 
diff --git a/tasks/phpunit.js b/tasks/phpunit.js
@@ -2,7 +2,8 @@ var gulp   = require('gulp');
 var Elixir = require('laravel-elixir');
 
 var config = Elixir.config;
-var notify = new Elixir.Notification();
+var runTests = require('./shared/Tests.js');
+
 
 /*
  |----------------------------------------------------------------
@@ -16,24 +17,10 @@ var notify = new Elixir.Notification();
  */
 
 Elixir.extend('phpUnit', function(src, command) {
-    src = src || (config.testing.phpUnit.path + '/**/*Test.php');
-    command = command || 'vendor/bin/phpunit --verbose';
-
-    new Elixir.Task('phpUnit', function(error) {
-        Elixir.Log.heading('Triggering PHPUnit: ' + command);
-
-        return (
-            gulp
-            .src('')
-            .pipe(Elixir.Plugins.shell(command))
-            .on('error', function(e) {
-                notify.forFailedTests(e, 'PHPUnit');
-
-                this.emit('end');
-            })
-            .pipe(notify.forPassedTests('PHPUnit'))
-        );
-    })
-    .watch(src);
+    runTests(
+        'PHPUnit',
+        src || (config.testing.phpUnit.path + '/**/*Test.php'),
+        command || 'vendor/bin/phpunit --verbose'
+    );
 });
 
diff --git a/tasks/shared/Tests.js b/tasks/shared/Tests.js
@@ -3,23 +3,24 @@ var Elixir = require('../../index');
 
 var notify = new Elixir.Notification();
 
-module.exports = function(options) {
-    new Elixir.Task(options.name, function() {
-        this.log(options.src);
+module.exports = function(name, src, command) {
+    new Elixir.Task(name, function(error) {
+        Elixir.Log.heading('Triggering ' + name + ': ' + command);
 
         return (
             gulp
-            .src(options.src)
-            .pipe(options.plugin('', options.pluginOptions))
+            .src('')
+            .pipe(Elixir.Plugins.shell(command))
             .on('error', function(e) {
-                notify.forFailedTests(e, options.name);
+                notify.forFailedTests(e, name);
 
                 this.emit('end');
             })
-            .pipe(notify.forPassedTests(options.name))
+            .pipe(notify.forPassedTests(name))
         );
     })
-    .watch(options.src, 'tdd')
+    .watch(src)
     .watch(Elixir.config.appPath + '/**/*.php', 'tdd')
-    .watch(Elixir.config.viewPath +'/**/*.php', 'tdd')
+    .watch(Elixir.config.viewPath +'/**/*.php', 'tdd');
 };
+