Merge pull request #19 from testdouble/simplify-executable-test

Simplify find-executables test

Author: searls

lib/resolve-script/find-executables.js

@@ -1,8 +1,9 @@
+var _ = require('lodash')
 var glob = require('glob')
 var path = require('path')
 var async = require('async')
+
 var isExecutable = require('./is-executable')
-var _ = require('lodash')
 
 module.exports = function (pattern, cb) {
   glob(pattern, {nodir: true}, function (er, results) {

lib/resolve-script/find-executables.test.js

@@ -1,73 +1,50 @@
-var fs = require('fs')
+var _ = require('lodash')
 var path = require('path')
-var exec = require('child_process').exec
-var mkdirp = require('mkdirp')
-var rimraf = require('rimraf')
+
+var base = function (glob) {
+  return path.resolve('test/fixtures/user-scripts/find-executables', glob)
+}
+var subject = require('./find-executables')
 
 module.exports = {
   beforeEach: function () {
     td.replace(console, 'warn')
-    this.foo1 = path.join(__dirname, 'foo')
-    this.foo2 = path.join(__dirname, 'foo.lol')
-    this.subject = require('./find-executables')
-  },
-  afterEach: function () {
-    [this.foo1, this.foo2].forEach(function (f) {
-      try {
-        fs.unlinkSync(f)
-      } catch (e) {}
-    })
   },
   noFilesFound: function (done) {
-    this.subject(path.resolve(__dirname, 'foo*'), function (er, result) {
+    subject(base('does-not-exist*'), function (er, result) {
       assert.deepEqual(result, [])
       done(er)
     })
   },
   oneFileFound: function (done) {
-    fs.writeFileSync(this.foo1, 'hi')
-    exec('chmod +x "' + this.foo1 + '"', function () {
-      this.subject(path.resolve(__dirname, 'foo*'), function (er, result) {
-        assert.deepEqual(result, [this.foo1])
-        done(er)
-      }.bind(this))
-    }.bind(this))
+    subject(base('is-executable*'), function (er, result) {
+      assert.deepEqual(result, [base('is-executable')])
+      done(er)
+    })
   },
   oneFileFoundWithOneNonExecutable: function (done) {
     if (process.platform === 'win32') return done()
-    fs.writeFileSync(this.foo1, 'hi')
-    fs.writeFileSync(this.foo2, 'hi')
-    exec('chmod +x "' + this.foo1 + '"', function () {
-      this.subject(path.resolve(__dirname, 'foo*'), function (er, result) {
-        assert.deepEqual(result, [this.foo1])
-        td.verify(console.warn(
-          'Warning: scripty - ignoring script "' + this.foo2 + '" because it' +
-          ' was not executable. Run `chmod +x "' + this.foo2 + '" if you want' +
-          ' scripty to run it.'
-        ))
-        done(er)
-      }.bind(this))
-    }.bind(this))
+    subject(base('file.*'), function (er, result) {
+      assert.deepEqual(result, [base('file.executable')])
+      td.verify(console.warn(
+        'Warning: scripty - ignoring script "' + base('file.not.executable') +
+        '" because it was not executable. Run `chmod +x "' +
+        base('file.not.executable') + '" if you want scripty to run it.'
+      ))
+      done(er)
+    })
   },
   twoFilesFound: function (done) {
-    fs.writeFileSync(this.foo1, 'hi')
-    fs.writeFileSync(this.foo2, 'hi')
-
-    exec('chmod +x "' + this.foo1 + '" "' + this.foo2 + '"', function () {
-      this.subject(path.resolve(__dirname, 'foo*'), function (er, result) {
-        assert.deepEqual(result, [this.foo1, this.foo2])
-        done(er)
-      }.bind(this))
-    }.bind(this))
+    subject(base('exec.*'), function (er, result) {
+      assert.deepEqual(_.sortBy(result), [base('exec.rb'), base('exec.sh')])
+      done(er)
+    })
   },
   dirFound: function (done) {
-    mkdirp.sync(this.foo1)
-    this.subject(path.resolve(__dirname, 'foo*'), function (er, result) {
+    subject(base('exec-dir-wat*'), function (er, result) {
       assert.deepEqual(result, [])
-      rimraf.sync(this.foo1)
       done(er)
-    }.bind(this))
+    })
   }
 }
 
-if (UNSUPPORTED_TDD) module.exports = {}

package.json

@@ -32,8 +32,6 @@
   "devDependencies": {
     "assert": "^1.3.0",
     "intercept-stdout": "^0.1.2",
-    "mkdirp": "^0.5.1",
-    "rimraf": "^2.5.2",
     "semver": "^5.1.0",
     "standard": "^6.0.8",
     "teenytest": "^3.0.0",