Fix #340 - Set provider type for unit tests in the browser

tests/lib/test-utils.js

@@ -1,21 +1,20 @@
-(function(global) {
+var Filer = require('../..');
+var IndexedDBTestProvider = require('./indexeddb.js');
+var WebSQLTestProvider = require('./websql.js');
+var MemoryTestProvider = require('./memory.js');
+var Url = require('url');
 
-  var Filer = require('../..');
+var _provider;
-  var IndexedDBTestProvider = require('./indexeddb.js');
+var _fs;
-  var WebSQLTestProvider = require('./websql.js');
-  var MemoryTestProvider = require('./memory.js');
 
-  var _provider;
+function uniqueName() {
-  var _fs;
-
-  function uniqueName() {
   if(!uniqueName.seed) {
     uniqueName.seed = Date.now();
   }
   return 'filer-testdb-' + uniqueName.seed++;
-  }
+}
 
-  function findBestProvider() {
+function findBestProvider() {
   var providers = Filer.FileSystem.providers;
   if(providers.IndexedDB.isSupported()) {
     return IndexedDBTestProvider;
@@ -24,15 +23,37 @@
     return WebSQLTestProvider;
   }
   return MemoryTestProvider;
+}
+
+function getUrlParams() {
+  // Check if we are running in node
+  if(!global.location) {
+    return null;
   }
 
-  function setup(callback) {
+  var url = Url.parse(global.location.href, true);
+
+  return url.query;
+}
+
+function getProviderType() {
+  var defaultProvider = 'Memory';
+  var queryString = getUrlParams();
+
+  // If the environment is node or the query string is empty,
+  // the memory provider will be used.
+  if(!queryString) {
+    return defaultProvider;
+  }
+
+  return queryString['filer-provider'] || defaultProvider;
+}
+
+function setup(callback) {
   // In browser we support specifying the provider via the query string
   // (e.g., ?filer-provider=IndexedDB). If not specified, we use
-    // the Memory provider by default.  See test/require-config.js
+  // the Memory provider by default.
-    // for definition of window.filerArgs.
+  var providerType = getProviderType();
-    var providerType = global.filerArgs && global.filerArgs.provider ?
-      global.filerArgs.provider : 'Memory';
 
   var name = uniqueName();
 
@@ -68,28 +89,28 @@
     provider: _provider.provider,
     flags: flags
   }, complete);
-  }
+}
 
-  function fs() {
+function fs() {
   if(!_fs) {
     throw "TestUtil: call setup() before fs()";
   }
   return _fs;
-  }
+}
 
-  function provider() {
+function provider() {
   if(!_provider) {
     throw "TestUtil: call setup() before provider()";
   }
   return _provider;
-  }
+}
 
-  function shell(options) {
+function shell(options) {
   var _fs = fs();
   return new _fs.Shell(options);
-  }
+}
 
-  function cleanup(callback) {
+function cleanup(callback) {
   if(!_provider) {
     return;
   }
@@ -98,9 +119,9 @@
     _fs = null;
     callback();
   });
-  }
+}
 
-  function typedArrayEqual(a, b) {
+function typedArrayEqual(a, b) {
   if(!(a && b)) {
     return false;
   }
@@ -115,9 +136,9 @@
   }
 
   return true;
-  }
+}
 
-  module.exports = {
+module.exports = {
   uniqueName: uniqueName,
   setup: setup,
   fs: fs,
@@ -130,6 +151,4 @@
   },
   cleanup: cleanup,
   typedArrayEqual: typedArrayEqual
-  };
+};
-
-}(this));