Get tests to run

tests/bugs/issue105.js

@@ -1,6 +1,8 @@
-define(["Filer", "util"], function(Filer, util) {
+var Filer = require('../..');
+var util = require('../lib/test-utils.js');
+var expect = require('chai').expect;
 
- describe('trailing slashes in path names, issue 105', function() {
+describe('trailing slashes in path names, issue 105', function() {
   beforeEach(util.setup);
   afterEach(util.cleanup);
 
@@ -31,5 +33,4 @@ define(["Filer", "util"], function(Filer, util) {
       });
     });
   });
-  });
 });

tests/bugs/issue106.js

@@ -1,6 +1,8 @@
-define(["Filer", "util"], function(Filer, util) {
+var Filer = require('../..');
+var util = require('../lib/test-utils.js');
+var expect = require('chai').expect;
 
-  describe('fs.writeFile truncation - issue 106', function() {
+describe('fs.writeFile truncation - issue 106', function() {
   beforeEach(util.setup);
   afterEach(util.cleanup);
 
@@ -27,5 +29,4 @@ define(["Filer", "util"], function(Filer, util) {
       });
     });
   });
-  });
 });

tests/lib/test-utils.js

@@ -52,7 +52,7 @@
     }
 
     // Allow passing FS flags on query string
-    var flags = global.filerArgs && global.filerArgs.flags) ?
+    var flags = global.filerArgs && global.filerArgs.flags ?
       global.filerArgs.flags : 'FORMAT';
 
     // Create a file system and wait for it to get setup

tests/spec/errors.spec.js

@@ -1,6 +1,7 @@
-define(["Filer"], function(Filer) {
+var Filer = require('../..');
+var expect = require('chai').expect;
 
-  describe("Filer.Errors", function() {
+describe("Filer.Errors", function() {
   it("has expected errors", function() {
     expect(Filer.Errors).to.exist;
 
@@ -132,5 +133,4 @@ define(["Filer"], function(Filer) {
     expect(Filer.Errors[1001]).to.equal(Filer.Errors.EFILESYSTEMERROR);
     expect(Filer.Errors[1002]).to.equal(Filer.Errors.ENOATTR);
   });
-  });
 });

tests/spec/filer.spec.js

@@ -1,6 +1,7 @@
-define(["Filer"], function(Filer) {
+var Filer = require('../..');
+var expect = require('chai');
 
-  describe("Filer", function() {
+describe("Filer", function() {
   it("is defined", function() {
     expect(typeof Filer).not.to.equal(undefined);
   });
@@ -8,6 +9,4 @@ define(["Filer"], function(Filer) {
   it("has FileSystem constructor", function() {
     expect(typeof Filer.FileSystem).to.equal('function');
   });
-  });
-
 });

tests/spec/fs.appendFile.spec.js

@@ -1,6 +1,8 @@
-define(["Filer", "util"], function(Filer, util) {
+var Filer = require('../..');
+var util = require('../lib/test-utils.js');
+var expect = require('chai').expect;
 
-  describe('fs.appendFile', function() {
+describe('fs.appendFile', function() {
   beforeEach(function(done) {
     util.setup(function() {
       var fs = util.fs();
@@ -125,5 +127,4 @@ define(["Filer", "util"], function(Filer, util) {
       });
     });
   });
-  });
 });

tests/spec/fs.close.spec.js

@@ -1,6 +1,8 @@
-define(["Filer", "util"], function(Filer, util) {
+var Filer = require('../..');
+var util = require('../lib/test-utils.js');
+var expect = require('chai').expect;
 
-  describe('fs.close', function() {
+describe('fs.close', function() {
   beforeEach(util.setup);
   afterEach(util.cleanup);
 
@@ -25,6 +27,4 @@ define(["Filer", "util"], function(Filer, util) {
       });
     });
   });
-  });
-
 });

tests/spec/fs.exists.spec.js

@@ -1,6 +1,8 @@
-define(["Filer", "util"], function(Filer, util) {
+var Filer = require('../..');
+var util = require('../lib/test-utils.js');
+var expect = require('chai').expect;
 
-  describe('fs.exists', function() {
+describe('fs.exists', function() {
   beforeEach(util.setup);
   afterEach(util.cleanup);
 
@@ -55,5 +57,4 @@ define(["Filer", "util"], function(Filer, util) {
       });
     });
   });
-  });
 });

tests/spec/fs.link.spec.js

@@ -1,6 +1,8 @@
-define(["Filer", "util"], function(Filer, util) {
+var Filer = require('../..');
+var util = require('../lib/test-utils.js');
+var expect = require('chai').expect;
 
-  describe('fs.link', function() {
+describe('fs.link', function() {
   beforeEach(util.setup);
   afterEach(util.cleanup);
 
@@ -67,6 +69,4 @@ define(["Filer", "util"], function(Filer, util) {
       });
     });
   });
-  });
-
 });

tests/spec/fs.lseek.spec.js

@@ -1,6 +1,8 @@
-define(["Filer", "util"], function(Filer, util) {
+var Filer = require('../..');
+var util = require('../lib/test-utils.js');
+var expect = require('chai').expect;
 
-  describe('fs.lseek', function() {
+describe('fs.lseek', function() {
   beforeEach(util.setup);
   afterEach(util.cleanup);
 
@@ -159,6 +161,4 @@ define(["Filer", "util"], function(Filer, util) {
       });
     });
   });
-  });
-
 });

tests/spec/fs.lstat.spec.js

@@ -1,6 +1,8 @@
-define(["Filer", "util"], function(Filer, util) {
+var Filer = require('../..');
+var util = require('../lib/test-utils.js');
+var expect = require('chai').expect;
 
- describe('fs.lstat', function() {
+describe('fs.lstat', function() {
   beforeEach(util.setup);
   afterEach(util.cleanup);
 
@@ -46,6 +48,4 @@ define(["Filer", "util"], function(Filer, util) {
       });
     });
   });
-  });
-
 });

tests/spec/fs.mkdir.spec.js

@@ -1,6 +1,8 @@
-define(["Filer", "util"], function(Filer, util) {
+var Filer = require('../..');
+var util = require('../lib/test-utils.js');
+var expect = require('chai').expect;
 
- describe('fs.mkdir', function() {
+describe('fs.mkdir', function() {
   beforeEach(util.setup);
   afterEach(util.cleanup);
 
@@ -44,6 +46,4 @@ define(["Filer", "util"], function(Filer, util) {
       });
     });
   });
-  });
-
 });

tests/spec/fs.mknod.spec.js

@@ -1,5 +1,8 @@
-define(["Filer", "util"], function(Filer, util) {
-  describe('fs.mknod', function() {
+var Filer = require('../..');
+var util = require('../lib/test-utils.js');
+var expect = require('chai').expect;
+
+describe('fs.mknod', function() {
   beforeEach(util.setup);
   afterEach(util.cleanup);
 
@@ -75,6 +78,4 @@ define(["Filer", "util"], function(Filer, util) {
       });
     });
   });
-    
-  });
 });

tests/spec/fs.open.spec.js

@@ -1,6 +1,9 @@
-define(["Filer", "util", "src/constants"], function(Filer, util, constants) {
+var Filer = require('../..');
+var util = require('../lib/test-utils.js');
+var expect = require('chai').expect;
+var constants = require('../../src/constants.js');
 
-  describe('fs.open', function() {
+describe('fs.open', function() {
   beforeEach(util.setup);
   afterEach(util.cleanup);
 
@@ -31,7 +34,6 @@ define(["Filer", "util", "src/constants"], function(Filer, util, constants) {
     });
   });
 
-
   it('should return an error when flagged for write and the path is a directory', function(done) {
     var fs = util.fs();
 
@@ -104,6 +106,4 @@ define(["Filer", "util", "src/constants"], function(Filer, util, constants) {
       });
     });
   });
-  });
-
 });

tests/spec/fs.read.spec.js

@@ -1,6 +1,8 @@
-define(["Filer", "util"], function(Filer, util) {
+var Filer = require('../..');
+var util = require('../lib/test-utils.js');
+var expect = require('chai').expect;
 
-  describe('fs.read', function() {
+describe('fs.read', function() {
   beforeEach(util.setup);
   afterEach(util.cleanup);
 
@@ -57,6 +59,4 @@ define(["Filer", "util"], function(Filer, util) {
       });
     });
   });
-  });
-
 });

tests/spec/fs.readdir.spec.js

@@ -1,6 +1,8 @@
-define(["Filer", "util"], function(Filer, util) {
+var Filer = require('../..');
+var util = require('../lib/test-utils.js');
+var expect = require('chai').expect;
 
- describe('fs.readdir', function() {
+describe('fs.readdir', function() {
   beforeEach(util.setup);
   afterEach(util.cleanup);
 
@@ -53,6 +55,4 @@ define(["Filer", "util"], function(Filer, util) {
       });
     });
   });
-  });
-
 });

tests/spec/fs.readlink.spec.js

@@ -1,6 +1,8 @@
-define(["Filer", "util"], function(Filer, util) {
+var Filer = require('../..');
+var util = require('../lib/test-utils.js');
+var expect = require('chai').expect;
 
-  describe('fs.readlink', function() {
+describe('fs.readlink', function() {
   beforeEach(util.setup);
   afterEach(util.cleanup);
 
@@ -42,6 +44,4 @@ define(["Filer", "util"], function(Filer, util) {
       });
     });
   });
-  });
-
 });

tests/spec/fs.rename.spec.js

@@ -1,6 +1,8 @@
-define(["Filer", "util"], function(Filer, util) {
+var Filer = require('../..');
+var util = require('../lib/test-utils.js');
+var expect = require('chai').expect;
 
-  describe('fs.rename', function() {
+describe('fs.rename', function() {
   beforeEach(util.setup);
   afterEach(util.cleanup);
 
@@ -45,6 +47,4 @@ define(["Filer", "util"], function(Filer, util) {
       });
     });
   });
-  });
-
 });

tests/spec/fs.rmdir.spec.js

@@ -1,6 +1,8 @@
-define(["Filer", "util"], function(Filer, util) {
+var Filer = require('../..');
+var util = require('../lib/test-utils.js');
+var expect = require('chai').expect;
 
- describe('fs.rmdir', function() {
+describe('fs.rmdir', function() {
   beforeEach(util.setup);
   afterEach(util.cleanup);
 
@@ -96,6 +98,4 @@ define(["Filer", "util"], function(Filer, util) {
       });
     });
   });
-  });
-
 });

tests/spec/fs.spec.js

@@ -1,6 +1,8 @@
-define(["Filer", "util"], function(Filer, util) {
+var Filer = require('../..');
+var util = require('../lib/test-utils.js');
+var expect = require('chai').expect;
 
-  describe("fs", function() {
+describe("fs", function() {
   beforeEach(util.setup);
   afterEach(util.cleanup);
 
@@ -19,6 +21,4 @@ define(["Filer", "util"], function(Filer, util) {
       done();
     });
   });
-  });
-
 });

tests/spec/fs.stat.spec.js

@@ -1,6 +1,8 @@
-define(["Filer", "util"], function(Filer, util) {
+var Filer = require('../..');
+var util = require('../lib/test-utils.js');
+var expect = require('chai').expect;
 
-  describe('fs.stat', function() {
+describe('fs.stat', function() {
   beforeEach(util.setup);
   afterEach(util.cleanup);
 
@@ -90,6 +92,4 @@ define(["Filer", "util"], function(Filer, util) {
       });
     });
   });
-  });
-
 });

tests/spec/fs.stats.spec.js

@@ -1,6 +1,8 @@
-define(["Filer", "util"], function(Filer, util) {
+var Filer = require('../..');
+var util = require('../lib/test-utils.js');
+var expect = require('chai').expect;
 
-  describe('fs.stats', function() {
+describe('fs.stats', function() {
   describe('#isFile()', function() {
     beforeEach(util.setup);
     afterEach(util.cleanup);
@@ -243,5 +245,4 @@ define(["Filer", "util"], function(Filer, util) {
       });
     });
   });
-  });
 });

tests/spec/fs.symlink.spec.js

@@ -1,6 +1,8 @@
-define(["Filer", "util"], function(Filer, util) {
+var Filer = require('../..');
+var util = require('../lib/test-utils.js');
+var expect = require('chai').expect;
 
-  describe('fs.symlink', function() {
+describe('fs.symlink', function() {
   beforeEach(util.setup);
   afterEach(util.cleanup);
 
@@ -42,6 +44,4 @@ define(["Filer", "util"], function(Filer, util) {
       });
     });
   });
-  });
-
 });

tests/spec/fs.truncate.spec.js

@@ -1,6 +1,8 @@
-define(["Filer", "util"], function(Filer, util) {
+var Filer = require('../..');
+var util = require('../lib/test-utils.js');
+var expect = require('chai').expect;
 
-  describe('fs.truncate', function() {
+describe('fs.truncate', function() {
   beforeEach(util.setup);
   afterEach(util.cleanup);
 
@@ -185,5 +187,4 @@ define(["Filer", "util"], function(Filer, util) {
       });
     });
   });
-  });
 });

tests/spec/fs.unlink.spec.js

@@ -1,6 +1,8 @@
-define(["Filer", "util"], function(Filer, util) {
+var Filer = require('../..');
+var util = require('../lib/test-utils.js');
+var expect = require('chai').expect;
 
-  describe('fs.unlink', function() {
+describe('fs.unlink', function() {
   beforeEach(util.setup);
   afterEach(util.cleanup);
 
@@ -80,6 +82,4 @@ define(["Filer", "util"], function(Filer, util) {
       });
     });
   });
-  });
-
 });

tests/spec/fs.utimes.spec.js

@@ -1,6 +1,8 @@
-define(["Filer", "util"], function(Filer, util) {
+var Filer = require('../..');
+var util = require('../lib/test-utils.js');
+var expect = require('chai').expect;
 
-  describe('fs.utimes', function() {
+describe('fs.utimes', function() {
   beforeEach(util.setup);
   afterEach(util.cleanup);
 
@@ -175,5 +177,4 @@ define(["Filer", "util"], function(Filer, util) {
       });
     });
   });
-  });
 });

tests/spec/fs.watch.spec.js

@@ -1,6 +1,8 @@
-define(["Filer", "util"], function(Filer, util) {
+var Filer = require('../..');
+var util = require('../lib/test-utils.js');
+var expect = require('chai').expect;
 
-  describe('fs.watch', function() {
+describe('fs.watch', function() {
   beforeEach(util.setup);
   afterEach(util.cleanup);
 
@@ -38,6 +40,4 @@ define(["Filer", "util"], function(Filer, util) {
       if(error) throw error;
     });
   });
-  });
-
 });

tests/spec/fs.write.spec.js

@@ -1,6 +1,8 @@
-define(["Filer", "util"], function(Filer, util) {
+var Filer = require('../..');
+var util = require('../lib/test-utils.js');
+var expect = require('chai').expect;
 
-  describe('fs.write', function() {
+describe('fs.write', function() {
   beforeEach(util.setup);
   afterEach(util.cleanup);
 
@@ -57,6 +59,4 @@ define(["Filer", "util"], function(Filer, util) {
       });
     });
   });
-  });
-
 });

tests/spec/fs.writeFile-readFile.spec.js

@@ -1,6 +1,8 @@
-define(["Filer", "util"], function(Filer, util) {
+var Filer = require('../..');
+var util = require('../lib/test-utils.js');
+var expect = require('chai').expect;
 
-  describe('fs.writeFile, fs.readFile', function() {
+describe('fs.writeFile, fs.readFile', function() {
   beforeEach(util.setup);
   afterEach(util.cleanup);
 
@@ -99,6 +101,4 @@ define(["Filer", "util"], function(Filer, util) {
       });
     });
   });
-  });
-
 });

tests/spec/fs.xattr.spec.js

@@ -1,6 +1,8 @@
-define(["Filer", "util"], function(Filer, util) {
+var Filer = require('../..');
+var util = require('../lib/test-utils.js');
+var expect = require('chai').expect;
 
-  describe('fs.xattr', function() {
+describe('fs.xattr', function() {
   beforeEach(util.setup);
   afterEach(util.cleanup);
 
@@ -389,5 +391,4 @@ define(["Filer", "util"], function(Filer, util) {
       });
     });
   });
-  });
 });

tests/spec/lib.spec.js

@@ -1,6 +1,7 @@
-define(['../../src/network'], function(network) {
+var network = require('../../src/network.js');
+var expect = require('chai').expect;
 
-  describe('Network download tool', function() {
+describe('Network download tool', function() {
   var uri;
 
   if (typeof XMLHttpRequest === 'undefined') {
@@ -62,5 +63,4 @@ define(['../../src/network'], function(network) {
       done();
     });
   });
-  });
 });

tests/spec/node-js/simple/test-fs-mkdir.js

@@ -1,7 +1,8 @@
-define(["Filer", "util"], function(Filer, util) {
-
-  describe("node.js tests: https://github.com/joyent/node/blob/master/test/simple/test-fs-mkdir.js", function() {
+var Filer = require('../../../..');
+var util = require('../../../lib/test-utils.js');
+var expect = require('chai').expect;
 
+describe("node.js tests: https://github.com/joyent/node/blob/master/test/simple/test-fs-mkdir.js", function() {
   beforeEach(util.setup);
   afterEach(util.cleanup);
 
@@ -36,6 +37,4 @@ define(["Filer", "util"], function(Filer, util) {
       });
     });
   });
-  });
-
 });

tests/spec/node-js/simple/test-fs-null-bytes.js

@@ -1,7 +1,8 @@
-define(["Filer", "util"], function(Filer, util) {
-
-  describe("node.js tests: https://github.com/joyent/node/blob/master/test/simple/test-fs-null-bytes.js", function() {
+var Filer = require('../../../..');
+var util = require('../../../lib/test-utils.js');
+var expect = require('chai').expect;
 
+describe("node.js tests: https://github.com/joyent/node/blob/master/test/simple/test-fs-null-bytes.js", function() {
   beforeEach(util.setup);
   afterEach(util.cleanup);
 
@@ -58,5 +59,4 @@ define(["Filer", "util"], function(Filer, util) {
       fn();
     });
   });
-  });
 });

tests/spec/node-js/simple/test-fs-watch-recursive.js

@@ -1,13 +1,13 @@
-define(["Filer", "util"], function(Filer, util) {
+var Filer = require('../../../..');
+var util = require('../../../lib/test-utils.js');
+var expect = require('chai').expect;
 
-  /**
+/**
  * NOTE: unlike node.js, which either doesn't give filenames (e.g., in case of
  * fd vs. path) for events, or gives only a portion thereof (e.g., basname),
  * we give full, abs paths always.
  */
-
-  describe("node.js tests: https://github.com/joyent/node/blob/master/test/simple/test-fs-watch-recursive.js", function() {
-
+describe("node.js tests: https://github.com/joyent/node/blob/master/test/simple/test-fs-watch-recursive.js", function() {
   beforeEach(util.setup);
   afterEach(util.cleanup);
 
@@ -33,6 +33,4 @@ define(["Filer", "util"], function(Filer, util) {
       });
     });
   });
-
-  });
 });

tests/spec/node-js/simple/test-fs-watch.js

@@ -1,16 +1,16 @@
-define(["Filer", "util"], function(Filer, util) {
+var Filer = require('../../../..');
+var util = require('../../../lib/test-utils.js');
+var expect = require('chai').expect;
 
-  /**
+/**
  * NOTE: unlike node.js, which either doesn't give filenames (e.g., in case of
  * fd vs. path) for events, or gives only a portion thereof (e.g., basname),
  * we give full, abs paths always.
  */
+var filenameOne = '/watch.txt';
+var filenameTwo = '/hasOwnProperty';
 
-  var filenameOne = '/watch.txt';
-  var filenameTwo = '/hasOwnProperty';
-
-  describe("node.js tests: https://github.com/joyent/node/blob/master/test/simple/test-fs-watch.js", function() {
-
+describe("node.js tests: https://github.com/joyent/node/blob/master/test/simple/test-fs-watch.js", function() {
   beforeEach(util.setup);
   afterEach(util.cleanup);
 
@@ -70,5 +70,4 @@ define(["Filer", "util"], function(Filer, util) {
       });
     });
   });
-  });
 });

tests/spec/path-resolution.spec.js

@@ -1,6 +1,8 @@
-define(["Filer", "util"], function(Filer, util) {
+var Filer = require('../..');
+var util = require('../lib/test-utils.js');
+var expect = require('chai').expect;
 
-  describe('path resolution', function() {
+describe('path resolution', function() {
   beforeEach(util.setup);
   afterEach(util.cleanup);
 
@@ -221,6 +223,4 @@ define(["Filer", "util"], function(Filer, util) {
       });
     });
   });
-  });
-
 });

tests/spec/providers/providers.indexeddb.spec.js

@@ -1,15 +1,10 @@
-define(["Filer", "util"], function(Filer, util) {
+var Filer = require('../../..');
+var util = require('../../lib/test-utils.js');
+var expect = require('chai').expect;
 
-  if(!Filer.FileSystem.providers.IndexedDB.isSupported()) {
+if(!Filer.FileSystem.providers.IndexedDB.isSupported()) {
   console.log("Skipping Filer.FileSystem.providers.IndexedDB tests, since IndexedDB isn't supported.");
-    return;
-  }
-
-  if(navigator.userAgent.indexOf('PhantomJS') > -1) {
-    console.log("Skipping Filer.FileSystem.providers.IndexedDB tests, since PhantomJS doesn't support it.");
-    return;
-  }
-
+} else {
   describe("Filer.FileSystem.providers.IndexedDB", function() {
     it("is supported -- if it isn't, none of these tests can run.", function() {
       expect(Filer.FileSystem.providers.IndexedDB.isSupported()).to.be.true;
@@ -150,4 +145,4 @@ define(["Filer", "util"], function(Filer, util) {
 
   });
 
-});
+}

tests/spec/providers/providers.memory.spec.js

@@ -1,6 +1,7 @@
-define(["Filer"], function(Filer) {
+var Filer = require('../../..');
+var expect = require('chai').expect;
 
-  describe("Filer.FileSystem.providers.Memory", function() {
+describe("Filer.FileSystem.providers.Memory", function() {
   it("is supported -- if it isn't, none of these tests can run.", function() {
     expect(Filer.FileSystem.providers.Memory.isSupported()).to.be.true;
   });
@@ -109,6 +110,4 @@ define(["Filer"], function(Filer) {
       });
     });
   });
-  });
-
 });

tests/spec/providers/providers.spec.js

@@ -1,5 +1,7 @@
-define(["Filer"], function(Filer) {
-  describe("Filer.FileSystem.providers", function() {
+var Filer = require('../../..');
+var expect = require('chai').expect;
+
+describe("Filer.FileSystem.providers", function() {
   it("is defined", function() {
     expect(Filer.FileSystem.providers).to.exist;
   });
@@ -23,5 +25,4 @@ define(["Filer"], function(Filer) {
   it("has Fallback constructor", function() {
     expect(Filer.FileSystem.providers.Fallback).to.be.a('function');
   });
-  });
 });

tests/spec/providers/providers.websql.spec.js

@@ -1,15 +1,10 @@
-define(["Filer", "util"], function(Filer, util) {
+var Filer = require('../../..');
+var util = require('../../lib/test-utils.js');
+var expect = require('chai').expect;
 
-  if(!Filer.FileSystem.providers.WebSQL.isSupported()) {
+if(!Filer.FileSystem.providers.WebSQL.isSupported()) {
   console.log("Skipping Filer.FileSystem.providers.WebSQL tests, since WebSQL isn't supported.");
-    return;
-  }
-
-  if(navigator.userAgent.indexOf('PhantomJS') > -1) {
-    console.log("Skipping Filer.FileSystem.providers.WebSQL tests, since PhantomJS doesn't support it.");
-    return;
-  }
-
+} else {
   describe("Filer.FileSystem.providers.WebSQL", function() {
     it("is supported -- if it isn't, none of these tests can run.", function() {
       expect(Filer.FileSystem.providers.WebSQL.isSupported()).to.be.true;
@@ -145,4 +140,4 @@ define(["Filer", "util"], function(Filer, util) {
     });
   });
 
-});
+}

tests/spec/shell/cat.spec.js

@@ -1,6 +1,8 @@
-define(["Filer", "util"], function(Filer, util) {
+var Filer = require('../../..');
+var util = require('../../lib/test-utils.js');
+var expect = require('chai').expect;
 
-  describe('FileSystemShell.cat', function() {
+describe('FileSystemShell.cat', function() {
   beforeEach(util.setup);
   afterEach(util.cleanup);
 
@@ -79,6 +81,4 @@ define(["Filer", "util"], function(Filer, util) {
       });
     });
   });
-
-  });
 });

tests/spec/shell/cd.spec.js

@@ -1,6 +1,7 @@
-define(["Filer", "util"], function(Filer, util) {
+var Filer = require('../../..');
+var util = require('../../lib/test-utils.js');
 
-  describe('FileSystemShell.cd', function() {
+describe('FileSystemShell.cd', function() {
   beforeEach(util.setup);
   afterEach(util.cleanup);
 
@@ -118,6 +119,4 @@ define(["Filer", "util"], function(Filer, util) {
       });
     });
   });
-
-  });
 });

tests/spec/shell/env.spec.js

@@ -1,6 +1,8 @@
-define(["Filer", "util"], function(Filer, util) {
+var Filer = require('../../..');
+var util = require('../../lib/test-utils.js');
+var expect = require('chai').expect;
 
-  describe('FileSystemShell.env', function() {
+describe('FileSystemShell.env', function() {
   beforeEach(util.setup);
   afterEach(util.cleanup);
 
@@ -108,6 +110,4 @@ define(["Filer", "util"], function(Filer, util) {
       });
     });
   });
-
-  });
 });

tests/spec/shell/exec.spec.js

@@ -1,6 +1,8 @@
-define(["Filer", "util"], function(Filer, util) {
+var Filer = require('../../..');
+var util = require('../../lib/test-utils.js');
+var expect = require('chai').expect;
 
-  describe('FileSystemShell.exec', function() {
+describe('FileSystemShell.exec', function() {
   beforeEach(util.setup);
   afterEach(util.cleanup);
 
@@ -28,6 +30,4 @@ define(["Filer", "util"], function(Filer, util) {
       });
     });
   });
-  });
-
 });

tests/spec/shell/ls.spec.js

@@ -1,6 +1,8 @@
-define(["Filer", "util"], function(Filer, util) {
+var Filer = require('../../..');
+var util = require('../../lib/test-utils.js');
+var expect = require('chai').expect;
 
-  describe('FileSystemShell.ls', function() {
+describe('FileSystemShell.ls', function() {
   beforeEach(util.setup);
   afterEach(util.cleanup);
 
@@ -182,6 +184,4 @@ define(["Filer", "util"], function(Filer, util) {
       });
     });
   });
-
-  });
 });

tests/spec/shell/mkdirp.spec.js

@@ -1,6 +1,8 @@
-define(["Filer", "util"], function(Filer, util) {
+var Filer = require('../../..');
+var util = require('../../lib/test-utils.js');
+var expect = require('chai').expect;
 
-  describe('FileSystemShell.mkdirp', function() {
+describe('FileSystemShell.mkdirp', function() {
   beforeEach(util.setup);
   afterEach(util.cleanup);
 
@@ -93,5 +95,4 @@ define(["Filer", "util"], function(Filer, util) {
       });
     });
   });
-  });
 });

tests/spec/shell/rm.spec.js

@@ -1,6 +1,8 @@
-define(["Filer", "util"], function(Filer, util) {
+var Filer = require('../../..');
+var util = require('../../lib/test-utils.js');
+var expect = require('chai').expect;
 
-  describe('FileSystemShell.rm', function() {
+describe('FileSystemShell.rm', function() {
   beforeEach(util.setup);
   afterEach(util.cleanup);
 
@@ -133,6 +135,4 @@ define(["Filer", "util"], function(Filer, util) {
       });
     });
   });
-
-  });
 });

tests/spec/shell/touch.spec.js

@@ -1,13 +1,15 @@
-define(["Filer", "util"], function(Filer, util) {
+var Filer = require('../../..');
+var util = require('../../lib/test-utils.js');
+var expect = require('chai').expect;
 
-  function getTimes(fs, path, callback) {
+function getTimes(fs, path, callback) {
   fs.stat(path, function(error, stats) {
     if(error) throw error;
     callback({mtime: stats.mtime, atime: stats.atime});
   });
-  }
+}
 
-  describe('FileSystemShell.touch', function() {
+describe('FileSystemShell.touch', function() {
   beforeEach(util.setup);
   afterEach(util.cleanup);
 
@@ -98,6 +100,4 @@ define(["Filer", "util"], function(Filer, util) {
       });
     });
   });
-  });
-
 });

tests/spec/shell/wget.spec.js

@@ -1,6 +1,8 @@
-define(["Filer", "util"], function(Filer, util) {
+var Filer = require('../../..');
+var util = require('../../lib/test-utils.js');
+var expect = require('chai').expect;
 
-  describe('FileSystemShell.wget', function() {
+describe('FileSystemShell.wget', function() {
   beforeEach(util.setup);
   afterEach(util.cleanup);
 
@@ -90,7 +92,4 @@ define(["Filer", "util"], function(Filer, util) {
       });
     });
   });
-
-
-  });
 });

tests/spec/shell/zip-unzip.spec.js

@@ -1,6 +1,8 @@
-define(["Filer", "util"], function(Filer, util) {
+var Filer = require('../../..');
+var util = require('../../lib/test-utils.js');
+var expect = require('chai').expect;
 
-  describe('FileSystemShell.zip() and unzip()', function() {
+describe('FileSystemShell.zip() and unzip()', function() {
   beforeEach(util.setup);
   afterEach(util.cleanup);
 
@@ -183,7 +185,6 @@ define(["Filer", "util"], function(Filer, util) {
          confirmFile('test-dir/test-file2.txt', function() {
            done();
          });});});});});
-
       });
     });
   });
@@ -281,6 +282,4 @@ define(["Filer", "util"], function(Filer, util) {
       });
     });
   });
-
-  });
 });

tests/spec/time-flags.spec.js

@@ -1,6 +1,8 @@
-define(["Filer", "util"], function(Filer, util) {
+var Filer = require('../..');
+var util = require('../lib/test-utils.js');
+var expect = require('chai').expect;
 
-  describe('node times (atime, mtime, ctime) with mount flags', function() {
+describe('node times (atime, mtime, ctime) with mount flags', function() {
 
   var dirname = "/dir";
   var filename = "/dir/file";
@@ -101,6 +103,4 @@ define(["Filer", "util"], function(Filer, util) {
       });
     });
   });
-
-  });
 });

tests/spec/times.spec.js

@@ -1,6 +1,8 @@
-define(["Filer", "util"], function(Filer, util) {
+var Filer = require('../..');
+var util = require('../lib/test-utils.js');
+var expect = require('chai').expect;
 
-  describe('node times (atime, mtime, ctime)', function() {
+describe('node times (atime, mtime, ctime)', function() {
   beforeEach(util.setup);
   afterEach(util.cleanup);
 
@@ -617,6 +619,4 @@ define(["Filer", "util"], function(Filer, util) {
       });
     });
   });
-
-  });
 });