Trying to make far run on windows. + cleanup

alexindigo · alexindigo · commit e426dfcefb07 · 2015-12-31T01:52:40.000-08:00
diff --git a/test/common.js b/test/common.js
@@ -48,6 +48,16 @@ common.actions.submit = function(form, server)
   });
 };
 
+common.actions.basicFormOnField = function(name, value) {
+  assert.strictEqual(name, 'my_field');
+  assert.strictEqual(value, 'my_value');
+};
+
+common.actions.formOnField = function(FIELDS, name, value) {
+  assert.ok(name in FIELDS);
+  var field = FIELDS[name];
+  assert.strictEqual(value, field.value + '');
+};
 
 common.actions.formOnFile = function(FIELDS, name, file) {
   assert.ok(name in FIELDS);
diff --git a/test/integration/test-pipe.js b/test/integration/test-pipe.js
@@ -40,9 +40,7 @@ var server = http.createServer(function(req, res) {
   form
     .on('field', function(name, value) {
       fieldsPassed--;
-      assert.ok(name in FIELDS);
-      var field = FIELDS[name];
-      assert.strictEqual(value, field.value + '');
+      common.actions.formOnField(FIELDS, name, value);
     })
     .on('file', function(name, file) {
       fieldsPassed--;
diff --git a/test/integration/test-submit-custom-header.js b/test/integration/test-submit-custom-header.js
@@ -41,9 +41,7 @@ var server = http.createServer(function(req, res) {
   form
     .on('field', function(name, value) {
       fieldsPassed--;
-      assert.ok(name in FIELDS);
-      var field = FIELDS[name];
-      assert.strictEqual(value, field.value + '');
+      common.actions.formOnField(FIELDS, name, value);
     })
     .on('file', function(name, file) {
       fieldsPassed--;
diff --git a/test/integration/test-submit-custom.js b/test/integration/test-submit-custom.js
@@ -40,9 +40,7 @@ var server = http.createServer(function(req, res) {
   form
     .on('field', function(name, value) {
       fieldsPassed--;
-      assert.ok(name in FIELDS);
-      var field = FIELDS[name];
-      assert.strictEqual(value, field.value + '');
+      common.actions.formOnField(FIELDS, name, value);
     })
     .on('file', function(name, file) {
       fieldsPassed--;
diff --git a/test/integration/test-submit-multi-nocallback.js b/test/integration/test-submit-multi-nocallback.js
@@ -15,10 +15,7 @@ var server = http.createServer(function(req, res) {
   form.parse(req);
 
   form
-    .on('field', function(name, value) {
-      assert.strictEqual(name, 'my_field');
-      assert.strictEqual(value, 'my_value');
-    })
+    .on('field', common.actions.basicFormOnField)
     .on('end', function() {
       res.writeHead(200);
       res.end('done');
diff --git a/test/integration/test-submit-multi.js b/test/integration/test-submit-multi.js
@@ -41,10 +41,7 @@ server = http.createServer(function(req, res) {
   form.parse(req);
 
   form
-    .on('field', function(name, value) {
-      assert.strictEqual(name, 'my_field');
-      assert.strictEqual(value, 'my_value');
-    })
+    .on('field', common.actions.basicFormOnField)
     .on('end', common.actions.formOnEnd.bind(null, res));
 });
 
diff --git a/test/integration/test-submit.js b/test/integration/test-submit.js
@@ -39,9 +39,7 @@ var server = http.createServer(function(req, res) {
   form
     .on('field', function(name, value) {
       fieldsPassed--;
-      assert.ok(name in FIELDS);
-      var field = FIELDS[name];
-      assert.strictEqual(value, field.value + '');
+      common.actions.formOnField(FIELDS, name, value);
     })
     .on('file', function(name, file) {
       fieldsPassed--;
diff --git a/test/run.js b/test/run.js
@@ -3,6 +3,7 @@ var path = require('path');
 var spawn = require('child_process').spawn;
 var static = require('./static');
 var far = require('far').create();
+var farPaths = require('far/lib/paths');
 var basePath = process.cwd();
 var istanbul = path.join(basePath, './node_modules/.bin/istanbul');
 
@@ -48,6 +49,30 @@ if (process.env.running_under_istanbul) {
     }.bind(this));
   };
 }
+
+// augment far to work on windows
+
+farPaths.expandSync = function(pathList) {
+  var expanded = {};
+
+  pathList.forEach(function(p) {
+    p = path.resolve(process.cwd(), p);
+
+    if (!farPaths.isDirectory(p)) {
+      expanded[p] = true;
+      return;
+    }
+
+    farPaths
+      .findRecursiveSync(p)
+      .forEach(function(pp) {
+        expanded[pp] = true;
+      });
+  });
+
+  return Object.keys(expanded);
+};
+
 // continue as normal
 
 if (process.env.verbose) {
