Tests: explicitly test bootstrap to ensure its always loaded before t…

…he test code is run. Fixes gh-557, Closes gh- (#799) Closes gh-798 Kick travis. Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
tessel · Jul 15, 2016 · bfdeadf · bfdeadf
1 parent d94e7c2
commit bfdeadf
Show file tree

Hide file tree

Showing 31 changed files with 51 additions and 4 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -11,7 +11,6 @@ module.exports = (grunt) => {
   grunt.initConfig({
     nodeunit: {
       tests: [
-        'test/common/bootstrap.js',
         'test/unit/*.js',
         'test/unit/deployment/*.js',
       ]

diff --git a/test/common/remote-process-simulator.js b/test/common/remote-process-simulator.js
@@ -1,4 +1,5 @@
 // Test dependencies are required and exposed in common/bootstrap.js
+require('./bootstrap');
 
 function RemoteProcessSimulator() {
   this.stdin = new stream.Writable();

diff --git a/test/common/tessel-simulator.js b/test/common/tessel-simulator.js
@@ -1,4 +1,5 @@
 // Test dependencies are required and exposed in common/bootstrap.js
+require('./bootstrap');
 
 function TesselSimulator(options) {
 

diff --git a/test/unit/access-point.js b/test/unit/access-point.js
@@ -1,5 +1,5 @@
 // Test dependencies are required and exposed in common/bootstrap.js
-
+require('../common/bootstrap');
 
 exports['Tessel.prototype.createAccessPoint'] = {
   setUp: function(done) {

diff --git a/test/unit/bin-tessel-2.js b/test/unit/bin-tessel-2.js
@@ -1,4 +1,5 @@
 // Test dependencies are required and exposed in common/bootstrap.js
+require('../common/bootstrap');
 
 // If the defaults are intentionally changed in bin-tessel-2,
 // then they must be changed here as well. This ensures that the

diff --git a/test/unit/constructor.js b/test/unit/constructor.js
@@ -1,4 +1,5 @@
 // Test dependencies are required and exposed in common/bootstrap.js
+require('../common/bootstrap');
 
 exports['Tessel'] = {
   setUp: function(done) {

diff --git a/test/unit/controller.js b/test/unit/controller.js
@@ -1,4 +1,5 @@
 // Test dependencies are required and exposed in common/bootstrap.js
+require('../common/bootstrap');
 
 function newTessel(options) {
   var tessel = new Tessel({

diff --git a/test/unit/crash-reporter.js b/test/unit/crash-reporter.js
@@ -1,3 +1,6 @@
+// Test dependencies are required and exposed in common/bootstrap.js
+require('../common/bootstrap');
+
 /*global CrashReporter */
 /*global Preferences */
 

diff --git a/test/unit/daemon.js b/test/unit/daemon.js
@@ -1,3 +1,6 @@
+// Test dependencies are required and exposed in common/bootstrap.js
+require('../common/bootstrap');
+
 module.exports['Daemon._nextID'] = {
   setUp: function(done) {
     this.sandbox = sinon.sandbox.create();

diff --git a/test/unit/deploy.js b/test/unit/deploy.js
@@ -1,7 +1,9 @@
+// Test dependencies are required and exposed in common/bootstrap.js
+require('../common/bootstrap');
+
 process.on('uncaughtException', function(err) {
   console.error(err.stack);
 });
-// Test dependencies are required and exposed in common/bootstrap.js
 
 var meminfo = fs.readFileSync('test/unit/fixtures/proc-meminfo', 'utf8');
 var sandbox = sinon.sandbox.create();

diff --git a/test/unit/deployment/javascript.js b/test/unit/deployment/javascript.js
@@ -1,7 +1,9 @@
+// Test dependencies are required and exposed in common/bootstrap.js
+require('../../common/bootstrap');
+
 process.on('uncaughtException', function(err) {
   console.error(err.stack);
 });
-// Test dependencies are required and exposed in common/bootstrap.js
 
 var codeContents = 'console.log("testing deploy");';
 var reference = new Buffer(codeContents);

diff --git a/test/unit/deployment/resolve-language.js b/test/unit/deployment/resolve-language.js
@@ -1,3 +1,6 @@
+// Test dependencies are required and exposed in common/bootstrap.js
+require('../../common/bootstrap');
+
 exports['deployment.resolveLanguage()'] = {
   setUp: function(done) {
     this.sandbox = sinon.sandbox.create();

diff --git a/test/unit/deployment/rust.js b/test/unit/deployment/rust.js
@@ -1,3 +1,6 @@
+// Test dependencies are required and exposed in common/bootstrap.js
+require('../../common/bootstrap');
+
 var sandbox = sinon.sandbox.create();
 
 exports['deploy.rust'] = {

diff --git a/test/unit/discover.js b/test/unit/discover.js
@@ -1,4 +1,5 @@
 // Test dependencies are required and exposed in common/bootstrap.js
+require('../common/bootstrap');
 
 function FakeScanner() {
   Emitter.call(this);

diff --git a/test/unit/erase.js b/test/unit/erase.js
@@ -1,4 +1,5 @@
 // Test dependencies are required and exposed in common/bootstrap.js
+require('../common/bootstrap');
 
 exports['Tessel.prototype.erase'] = {
   setUp: function(done) {

diff --git a/test/unit/index.js b/test/unit/index.js
@@ -1,3 +1,6 @@
+// Test dependencies are required and exposed in common/bootstrap.js
+require('../common/bootstrap');
+
 var api = require('../../index');
 
 exports['API Surface'] = {

diff --git a/test/unit/init.js b/test/unit/init.js
@@ -1,3 +1,6 @@
+// Test dependencies are required and exposed in common/bootstrap.js
+require('../common/bootstrap');
+
 exports['init.resolveLanguage()'] = {
   setUp: function(done) {
     done();

diff --git a/test/unit/key.js b/test/unit/key.js
@@ -1,4 +1,5 @@
 // Test dependencies are required and exposed in common/bootstrap.js
+require('../common/bootstrap');
 
 var testDir = __dirname + '/tmp/';
 var testFile = 'test_rsa';

diff --git a/test/unit/lan-connection.js b/test/unit/lan-connection.js
@@ -1,4 +1,5 @@
 // Test dependencies are required and exposed in common/bootstrap.js
+require('../common/bootstrap');
 
 exports['LAN.Connection'] = {
   setUp: function(done) {

diff --git a/test/unit/log.js b/test/unit/log.js
@@ -1,4 +1,5 @@
 // Test dependencies are required and exposed in common/bootstrap.js
+require('../common/bootstrap');
 /*global log, npmlog */
 
 exports['log'] = {

diff --git a/test/unit/menu.js b/test/unit/menu.js
@@ -1,4 +1,5 @@
 // Test dependencies are required and exposed in common/bootstrap.js
+require('../common/bootstrap');
 /*global Menu */
 
 exports['Menu.prompt'] = {

diff --git a/test/unit/name.js b/test/unit/name.js
@@ -1,4 +1,5 @@
 // Test dependencies are required and exposed in common/bootstrap.js
+require('../common/bootstrap');
 
 exports['Tessel.prototype.rename'] = {
   setUp: function(done) {

diff --git a/test/unit/preferences.js b/test/unit/preferences.js
@@ -1,3 +1,5 @@
+// Test dependencies are required and exposed in common/bootstrap.js
+require('../common/bootstrap');
 /*global Preferences */
 
 exports['Preferences'] = {

diff --git a/test/unit/provision.js b/test/unit/provision.js
@@ -1,4 +1,5 @@
 // Test dependencies are required and exposed in common/bootstrap.js
+require('../common/bootstrap');
 
 var testDir = __dirname + '/tmp/';
 var testFile = 'test_rsa';

diff --git a/test/unit/root.js b/test/unit/root.js
@@ -1,3 +1,6 @@
+// Test dependencies are required and exposed in common/bootstrap.js
+require('../common/bootstrap');
+
 exports['tessel.root'] = {
   setUp: function(done) {
     var testContext = this;

diff --git a/test/unit/tessel.js b/test/unit/tessel.js
@@ -1,4 +1,5 @@
 // Test dependencies are required and exposed in common/bootstrap.js
+require('../common/bootstrap');
 /*global Menu */
 
 exports['Tessel (get)'] = {

diff --git a/test/unit/update.js b/test/unit/update.js
@@ -1,4 +1,5 @@
 // Test dependencies are required and exposed in common/bootstrap.js
+require('../common/bootstrap');
 
 var builds = [{
   sha: 'ac4d8d8a5bfd671f7f174c2eaa258856bd82fe29',

diff --git a/test/unit/usb-connection.js b/test/unit/usb-connection.js
@@ -1,4 +1,5 @@
 // Test dependencies are required and exposed in common/bootstrap.js
+require('../common/bootstrap');
 
 exports['USB.Connection'] = {
   setUp: function(done) {

diff --git a/test/unit/usb-process.js b/test/unit/usb-process.js
@@ -1,3 +1,6 @@
+// Test dependencies are required and exposed in common/bootstrap.js
+require('../common/bootstrap');
+
 exports['USBProcess death'] = {
   setUp: function(done) {
     this.context = sinon.sandbox.create();

diff --git a/test/unit/version.js b/test/unit/version.js
@@ -1,4 +1,5 @@
 // Test dependencies are required and exposed in common/bootstrap.js
+require('../common/bootstrap');
 
 exports['Tessel.prototype.fetchCurrentNodeVersion'] = {
   setUp: function(done) {

diff --git a/test/unit/wifi.js b/test/unit/wifi.js
@@ -1,4 +1,5 @@
 // Test dependencies are required and exposed in common/bootstrap.js
+require('../common/bootstrap');
 
 exports['Tessel.prototype.findAvailableNetworks'] = {
   setUp: function(done) {