Merge pull request #1338 from step2yeung/url

Cleanup: Moving utils files into lib/utils
testem · May 7, 2019 · 47773ff · 47773ff
2 parents 82c633e + 025a2e3
commit 47773ff
Show file tree

Hide file tree

Showing 29 changed files with 38 additions and 35 deletions.
diff --git a/lib/app.js b/lib/app.js
@@ -12,7 +12,7 @@ const BrowserTestRunner = require('./runners/browser_test_runner');
 const ProcessTestRunner = require('./runners/process_test_runner');
 const TapProcessTestRunner = require('./runners/tap_process_test_runner');
 const HookRunner = require('./runners/hook_runner');
-const cleanExit = require('./clean_exit');
+const cleanExit = require('./utils/clean_exit');
 const FileWatcher = require('./file_watcher');
 const LauncherFactory = require('./launcher-factory');
 

diff --git a/lib/browser_launcher.js b/lib/browser_launcher.js
@@ -10,8 +10,8 @@ This file more or less figures out how to launch any browser on any platform.
 
 var Bluebird = require('bluebird');
 
-var fileutils = require('./fileutils');
-var envWithLocalPath = require('./env-with-local-path');
+var fileutils = require('./utils/fileutils');
+var envWithLocalPath = require('./utils/env-with-local-path');
 
 var executableExists = function(exe, config) {
   return fileutils.executableExists(exe, { env: envWithLocalPath(config) });

diff --git a/lib/config.js b/lib/config.js
@@ -21,10 +21,10 @@ const Bluebird = require('bluebird');
 
 const browser_launcher = require('./browser_launcher');
 const LauncherFactory = require('./launcher-factory');
-const Chars = require('./chars');
-const pad = require('./strutils').pad;
-const isa = require('./isa');
-const fileExists = require('./fileutils').fileExists;
+const Chars = require('./utils/chars');
+const pad = require('./utils/strutils').pad;
+const isa = require('./utils/isa');
+const fileExists = require('./utils/fileutils').fileExists;
 const uniqBy = require('lodash.uniqby');
 
 const knownBrowsers = require('./utils/known-browsers');

diff --git a/lib/launcher.js b/lib/launcher.js
@@ -5,7 +5,7 @@ const tmp = require('tmp');
 const path = require('path');
 const Bluebird = require('bluebird');
 
-const template = require('./strutils').template;
+const template = require('./utils/strutils').template;
 const ProcessCtl = require('./process-ctl');
 
 // setup graceful cleanup: removes the created directories when an uncaught exception occurs.

diff --git a/lib/process-ctl.js b/lib/process-ctl.js
@@ -8,8 +8,8 @@ const EventEmitter = require('events').EventEmitter;
 const spawnargs = require('spawn-args');
 const extend = require('lodash.assignin');
 
-const envWithLocalPath = require('./env-with-local-path');
-const fileutils = require('./fileutils');
+const envWithLocalPath = require('./utils/env-with-local-path');
+const fileutils = require('./utils/fileutils');
 const Process = require('./utils/process');
 
 const fileExists = fileutils.fileExists;

diff --git a/lib/reporters/dev/error_messages_panel.js b/lib/reporters/dev/error_messages_panel.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const ScrollableTextPanel = require('./scrollable_text_panel');
-const Chars = require('../../chars');
+const Chars = require('../../utils/chars');
 
 module.exports = ScrollableTextPanel.extend({
   initialize(attrs) {

diff --git a/lib/reporters/dev/index.js b/lib/reporters/dev/index.js
@@ -19,7 +19,7 @@ const constants = require('./constants');
 const RunnerTab = tabs.RunnerTab;
 const RunnerTabs = tabs.RunnerTabs;
 const Screen = require('./screen');
-const pad = require('../../strutils').pad;
+const pad = require('../../utils/strutils').pad;
 const ErrorMessagesPanel = require('./error_messages_panel');
 const Runner = require('./runner');
 

diff --git a/lib/reporters/dev/runner_tabs.js b/lib/reporters/dev/runner_tabs.js
@@ -12,8 +12,8 @@ When the tab is not selected, it hides the associated log panel.
 const SplitLogPanel = require('./split_log_panel');
 const View = require('./view');
 const Backbone = require('backbone');
-const pad = require('../../strutils').pad;
-const Chars = require('../../chars');
+const pad = require('../../utils/strutils').pad;
+const Chars = require('../../utils/chars');
 const Screen = require('./screen');
 const notifier = require('node-notifier');
 const constants = require('./constants');

diff --git a/lib/reporters/dev/scrollable_text_panel.js b/lib/reporters/dev/scrollable_text_panel.js
@@ -1,7 +1,7 @@
 'use strict';
 
 var View = require('./view');
-var splitLines = require('../../strutils').splitLines;
+var splitLines = require('../../utils/strutils').splitLines;
 var Screen = require('./screen');
 
 // This is a generic scrollable text viewer widget. Should be refactored

diff --git a/lib/reporters/dev/split_log_panel.js b/lib/reporters/dev/split_log_panel.js
@@ -4,8 +4,8 @@ var View = require('./view');
 var ScrollableTextPanel = require('./scrollable_text_panel');
 var tabs = require('./constants');
 var styledString = require('styled_string');
-var Chars = require('../../chars');
-var indent = require('../../strutils').indent;
+var Chars = require('../../utils/chars');
+var indent = require('../../utils/strutils').indent;
 var Screen = require('./screen');
 
 function failureDisplay(item) {

diff --git a/lib/reporters/dot_reporter.js b/lib/reporters/dot_reporter.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const indent = require('../strutils').indent;
+const indent = require('../utils/strutils').indent;
 const printf = require('printf');
 
 module.exports = class DotReporter {

diff --git a/lib/reporters/tap_reporter.js b/lib/reporters/tap_reporter.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const displayutils = require('../displayutils');
+const displayutils = require('../utils/displayutils');
 
 module.exports = class TapReporter {
   constructor(silent, out, config) {

diff --git a/lib/reporters/xunit_reporter.js b/lib/reporters/xunit_reporter.js
@@ -1,7 +1,7 @@
 'use strict';
 
 var XmlDom = require('xmldom');
-var indent = require('../strutils').indent;
+var indent = require('../utils/strutils').indent;
 
 class XUnitReporter {
   constructor(silent, out, config) {

diff --git a/lib/runners/hook_runner.js b/lib/runners/hook_runner.js
@@ -3,7 +3,7 @@
 const Bluebird = require('bluebird');
 const log = require('npmlog');
 
-const template = require('../strutils').template;
+const template = require('../utils/strutils').template;
 const ProcessCtl = require('../process-ctl');
 
 module.exports = class HookRunner {

diff --git a/lib/add-to-PATH.js → lib/utils/add-to-PATH.js b/lib/add-to-PATH.js → lib/utils/add-to-PATH.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const cloneDeep = require('lodash.clonedeep');
-const isWin = require('./utils/is-win')();
+const isWin = require('./is-win')();
 let PATH = 'PATH';
 let delimiter = ':';
 

diff --git a/lib/chars.js → lib/utils/chars.js b/lib/chars.js → lib/utils/chars.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const isWin = require('./utils/is-win')();
+const isWin = require('./is-win')();
 
 // Special characters to use for drawing.
 

diff --git a/lib/clean_exit.js → lib/utils/clean_exit.js b/lib/clean_exit.js → lib/utils/clean_exit.js
@@ -3,7 +3,7 @@
 module.exports = function cleanExit(code) {
   // Workaround for this node core bug <https://github.com/joyent/node/issues/3584>
   // Instead of using `process.exit(?code)`, use this instead.
-  //
+
   let draining = 0;
   function exit() {
     if (!(draining--)) {

diff --git a/lib/displayutils.js → lib/utils/displayutils.js b/lib/displayutils.js → lib/utils/displayutils.js
diff --git a/lib/env-with-local-path.js → lib/utils/env-with-local-path.js b/lib/env-with-local-path.js → lib/utils/env-with-local-path.js
@@ -4,6 +4,7 @@ const path = require('path');
 const fs = require('fs');
 const addToPATH = require('./add-to-PATH');
 
+
 module.exports = function envWithLocalPath(config) {
   let configPath = path.join(config.cwd(), 'node_modules', '.bin');
   let modulesPath;

diff --git a/lib/fileutils.js → lib/utils/fileutils.js b/lib/fileutils.js → lib/utils/fileutils.js
@@ -7,7 +7,7 @@ const log = require('npmlog');
 
 const fsStatAsync = Bluebird.promisify(fs.stat);
 
-const isWin = require('./utils/is-win')();
+const isWin = require('./is-win')();
 
 exports.fileExists = function fileExists(path) {
   return fsStatAsync(path).then(stat => stat.isFile()).catchReturn(false);

diff --git a/lib/isa.js → lib/utils/isa.js b/lib/isa.js → lib/utils/isa.js
@@ -13,10 +13,12 @@ Examples:
 */
 'use strict';
 
+const toString = Object.prototype.toString;
+
 function typeName(ctr) {
   return ctr.name || String(ctr).match(/function (.{1,})\(/)[1];
 }
-const toString = Object.prototype.toString;
+
 function objTypeName(obj) {
   return toString.call(obj).match(/^\[object (.*)\]$/)[1];
 }
@@ -25,8 +27,8 @@ module.exports = function isa(obj, type) {
   if (obj === null || obj === undefined) {
     return false;
   }
+
   return obj instanceof type || // the straight-forward case
     obj.constructor === type || // .constructor check to catch the primitives case
     objTypeName(obj) === typeName(type); // name-based check for the cross window case
-
 };
diff --git a/lib/utils/reporter.js b/lib/utils/reporter.js
@@ -4,7 +4,7 @@ const Bluebird = require('bluebird');
 const log = require('npmlog');
 
 const reporters = require('../reporters');
-const isa = require('../isa');
+const isa = require('./isa');
 const ReportFile = require('./report-file');
 
 function setupReporter(name, out, config, app) {

diff --git a/lib/strutils.js → lib/utils/strutils.js b/lib/strutils.js → lib/utils/strutils.js
diff --git a/tests/env-with-local-path_tests.js b/tests/env-with-local-path_tests.js
@@ -5,7 +5,7 @@ const fs = require('fs');
 
 const expect = require('chai').expect;
 
-const envWithLocalPath = require('../lib/env-with-local-path');
+const envWithLocalPath = require('../lib/utils/env-with-local-path');
 const Config = require('../lib/config');
 
 describe('envWithLocalPath', function() {

diff --git a/tests/fileutils_tests.js b/tests/fileutils_tests.js
@@ -5,8 +5,8 @@ const path = require('path');
 const expect = require('chai').expect;
 const sinon = require('sinon');
 
-const fileutils = require('../lib/fileutils');
-const addToPATH = require('../lib/add-to-PATH');
+const fileutils = require('../lib/utils/fileutils');
+const addToPATH = require('../lib/utils/add-to-PATH');
 
 describe('fileutils', function() {
   let sandbox;

diff --git a/tests/strutils_tests.js b/tests/strutils_tests.js
@@ -2,7 +2,7 @@
 
 const expect = require('chai').expect;
 const styledString = require('styled_string');
-const strutils = require('../lib/strutils');
+const strutils = require('../lib/utils/strutils');
 const splitLines = strutils.splitLines;
 const indent = strutils.indent;
 const template = strutils.template;

diff --git a/tests/ui/error_messages_panel_tests.js b/tests/ui/error_messages_panel_tests.js
@@ -3,7 +3,7 @@
 var expect = require('chai').expect;
 var screen = require('./fake_screen');
 var ErrorMessagesPanel = require('../../lib/reporters/dev/error_messages_panel');
-var Chars = require('../../lib/chars');
+var Chars = require('../../lib/utils/chars');
 
 var isWin = /^win/.test(process.platform);
 

diff --git a/tests/ui/runner_tabs_tests.js b/tests/ui/runner_tabs_tests.js
@@ -5,7 +5,7 @@ var screen = require('./fake_screen');
 var Backbone = require('backbone');
 var runnertabs = require('../../lib/reporters/dev/runner_tabs');
 var Config = require('../../lib/config');
-var Chars = require('../../lib/chars');
+var Chars = require('../../lib/utils/chars');
 var RunnerTab = runnertabs.RunnerTab;
 var RunnerTabs = runnertabs.RunnerTabs;
 

diff --git a/tests/ui/split_log_panel_tests.js b/tests/ui/split_log_panel_tests.js
@@ -6,7 +6,7 @@ const sinon = require('sinon');
 
 const screen = require('./fake_screen');
 const SplitLogPanel = require('../../lib/reporters/dev/split_log_panel');
-const Chars = require('../../lib/chars');
+const Chars = require('../../lib/utils/chars');
 const TestResults = require('../../lib/reporters/dev/test_results');
 const isWin = /^win/.test(process.platform);