Merge branch 'master' into remove-action-tests

.circleci/config.yml

@@ -11,12 +11,12 @@ jobs:
             name: Update npm
             command: 'sudo npm install -g npm@latest'
         - restore_cache:
-            key: dependency-cache-13-{{ checksum "package.json" }}
+            key: dependency-cache-{{ checksum "package.json" }}
         - run:
             name: Installing dependencies (npm install)
             command: npm install
         - save_cache:
-            key: dependency-cache-13-{{ checksum "package.json" }}
+            key: dependency-cache-{{ checksum "package.json" }}
             paths:
               - node_modules
         - run:

.eslintrc.js

@@ -120,6 +120,34 @@ module.exports = {
         "no-useless-computed-key": "error",
         // https://eslint.org/docs/rules/rest-spread-spacing
         "rest-spread-spacing": ["error"],
+        // https://eslint.org/docs/rules/default-case-last
+        "default-case-last": "error",
+        // https://eslint.org/docs/rules/default-param-last
+        "default-param-last": "error",
+        // https://eslint.org/docs/rules/grouped-accessor-pairs
+        "grouped-accessor-pairs": "error",
+        // https://eslint.org/docs/rules/no-constructor-return
+        "no-constructor-return": "error",
+        // https://eslint.org/docs/rules/array-callback-return
+        "array-callback-return": "error",
+        // https://eslint.org/docs/rules/no-invalid-this
+        "no-invalid-this": "error", // Believe this one actually surfaces some bugs
+        // https://eslint.org/docs/rules/func-style
+        "func-style": ["error", "declaration"],
+        // https://eslint.org/docs/rules/no-unused-expressions
+        "no-unused-expressions": "error",
+        // https://eslint.org/docs/rules/no-useless-concat
+        "no-useless-concat": "error",
+        // https://eslint.org/docs/rules/radix
+        "radix": "error",
+        // https://eslint.org/docs/rules/require-await
+        "require-await": "error",
+        // https://eslint.org/docs/rules/no-alert
+        "no-alert": "error",
+        // https://eslint.org/docs/rules/no-useless-constructor
+        "no-useless-constructor": "error",
+        // https://eslint.org/docs/rules/no-duplicate-imports
+        "no-duplicate-imports": "error",
 
         // https://eslint.org/docs/rules/no-implicit-coercion
         "no-implicit-coercion": "error",
@@ -204,26 +232,21 @@ module.exports = {
             }
         }],
         "vue/multiline-html-element-content-newline": "off",
-        "vue/singleline-html-element-content-newline": "off"
+        "vue/singleline-html-element-content-newline": "off",
+
     },
     "overrides": [
         {
-            "files": ["*Spec.js"],
+            "files": LEGACY_FILES,
             "rules": {
                 "no-unused-vars": [
                     "warn",
                     {
                         "vars": "all",
                         "args": "none",
-                        "varsIgnorePattern": "controller",
+                        "varsIgnorePattern": "controller"
-
                     }
-                ]
+                ],
-            }
-        }, {
-            "files": LEGACY_FILES,
-            "rules": {
-                // https://eslint.org/docs/rules/no-nested-ternary
                 "no-nested-ternary": "off",
                 "no-var": "off"
             }

example/eventGenerator/bundle.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2017, United States Government
+ * Open MCT, Copyright (c) 2014-2020, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -19,7 +19,6 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-/*global define*/
 
 define([
     "./src/EventTelemetryProvider"

example/eventGenerator/src/EventTelemetry.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2017, United States Government
+ * Open MCT, Copyright (c) 2014-2020, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -19,7 +19,6 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-/*global define */
 
 /**
  * Module defining EventTelemetry.

example/eventGenerator/src/EventTelemetryProvider.js

@@ -19,7 +19,6 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-/*global define,Promise*/
 
 /**
  * Module defining EventTelemetryProvider. Created by chacskaylo on 06/18/2015.

example/export/ExportTelemetryAsCSVAction.js

@@ -19,7 +19,6 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-/*global define*/
 
 define([], function () {
     'use strict';

example/export/bundle.js

@@ -19,7 +19,6 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-/*global define*/
 
 define([
     './ExportTelemetryAsCSVAction'

example/forms/bundle.js

@@ -19,7 +19,6 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-/*global define*/
 
 define([
     "./src/ExampleFormController"

example/forms/src/ExampleFormController.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2017, United States Government
+ * Open MCT, Copyright (c) 2014-2020, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -19,7 +19,6 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-/*global define,window*/
 
 define(
     [],
@@ -80,7 +79,7 @@ define(
                                 control: "button",
                                 csslass: "icon-save",
                                 click: function () {
-                                    window.alert("Save");
+                                    console.log("Save");
                                 }
                             },
                             {
@@ -88,7 +87,7 @@ define(
                                 csslass: "icon-x",
                                 description: "Button B",
                                 click: function () {
-                                    window.alert("Cancel");
+                                    console.log("Cancel");
                                 }
                             },
                             {
@@ -97,7 +96,7 @@ define(
                                 description: "Button C",
                                 disabled: true,
                                 click: function () {
-                                    window.alert("Delete");
+                                    console.log("Delete");
                                 }
                             }
                         ]

example/generator/GeneratorMetadataProvider.js

@@ -117,7 +117,7 @@ define([
     }
 
     GeneratorMetadataProvider.prototype.supportsMetadata = function (domainObject) {
-        return METADATA_BY_TYPE.hasOwnProperty(domainObject.type);
+        return Object.prototype.hasOwnProperty.call(METADATA_BY_TYPE, domainObject.type);
     };
 
     GeneratorMetadataProvider.prototype.getMetadata = function (domainObject) {

example/generator/GeneratorProvider.js

@@ -62,15 +62,15 @@ define([
         var workerRequest = {};
 
         props.forEach(function (prop) {
-            if (domainObject.telemetry && domainObject.telemetry.hasOwnProperty(prop)) {
+            if (domainObject.telemetry && Object.prototype.hasOwnProperty.call(domainObject.telemetry, prop)) {
                 workerRequest[prop] = domainObject.telemetry[prop];
             }
 
-            if (request && request.hasOwnProperty(prop)) {
+            if (request && Object.prototype.hasOwnProperty.call(request, prop)) {
                 workerRequest[prop] = request[prop];
             }
 
-            if (!workerRequest.hasOwnProperty(prop)) {
+            if (!Object.prototype.hasOwnProperty.call(workerRequest, prop)) {
                 workerRequest[prop] = REQUEST_DEFAULTS[prop];
             }
 

example/generator/SinewaveLimitProvider.js

@@ -19,7 +19,6 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-/*global define*/
 
 define([
 

example/generator/WorkerInterface.js

@@ -72,6 +72,7 @@ define([
         });
         var messageId;
 
+        let self = this;
         function callback(message) {
             if (message.error) {
                 deferred.reject(message.error);
@@ -79,7 +80,8 @@ define([
                 deferred.resolve(message.data);
             }
 
-            delete this.callbacks[messageId];
+            delete self.callbacks[messageId];
+
         }
 
         messageId = this.dispatch('request', request, callback.bind(this));

example/generator/generatorWorker.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2017, United States Government
+ * Open MCT, Copyright (c) 2014-2020, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -20,8 +20,6 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
-/*global self*/
-
 (function () {
 
     var FIFTEEN_MINUTES = 15 * 60 * 1000;

example/generator/plugin.js

@@ -19,7 +19,6 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-/*global define*/
 
 define([
     "./GeneratorProvider",

example/identity/bundle.js

@@ -19,7 +19,6 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-/*global define*/
 
 define([
     "./src/ExampleIdentityService"

example/identity/src/ExampleIdentityService.js

@@ -19,7 +19,6 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-/*global define*/
 
 define(
     function () {

example/mobile/bundle.js

@@ -19,7 +19,6 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-/*global define*/
 
 define([], function () {
     "use strict";

example/msl/bundle.js

@@ -19,7 +19,6 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-/*global define*/
 
 define([
     "./src/RemsTelemetryServerAdapter",

example/msl/src/MSLDataDictionary.js

@@ -19,7 +19,6 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-/*global define*/
 
 define(
     [],

example/msl/src/RemsTelemetryModelProvider.js

@@ -19,7 +19,6 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-/*global define*/
 
 define(
     function () {

example/msl/src/RemsTelemetryProvider.js

@@ -19,7 +19,6 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-/*global define */
 define (
     ['./RemsTelemetrySeries'],
     function (RemsTelemetrySeries) {

example/msl/src/RemsTelemetrySeries.js

@@ -19,7 +19,6 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-/*global define */
 define(
     function () {
         "use strict";

example/msl/src/RemsTelemetryServerAdapter.js

@@ -19,7 +19,6 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-/*global define*/
 /*jslint es5: true */
 
 define(

example/notifications/bundle.js

@@ -19,7 +19,6 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-/*global define*/
 
 define([
     "./src/DialogLaunchController",

example/notifications/src/DialogLaunchController.js

@@ -19,7 +19,6 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-/*global define*/
 
 define(
     [],

example/notifications/src/DialogLaunchIndicator.js

@@ -19,7 +19,6 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-/*global define,window*/
 
 define(
     [],

example/notifications/src/NotificationLaunchController.js

@@ -19,7 +19,6 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-/*global define*/
 
 define(
     [],

example/notifications/src/NotificationLaunchIndicator.js

@@ -19,7 +19,6 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-/*global define,window*/
 
 define(
     [],

example/persistence/bundle.js

@@ -19,7 +19,6 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-/*global define*/
 
 define([
     "./src/BrowserPersistenceProvider"

example/persistence/src/BrowserPersistenceProvider.js

@@ -19,7 +19,6 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-/*global define*/
 
 /**
  * Stubbed implementation of a persistence provider,

example/policy/bundle.js

@@ -19,7 +19,6 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-/*global define*/
 
 define([
     "./src/ExamplePolicy"

example/policy/src/ExamplePolicy.js

@@ -19,7 +19,6 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-/*global define*/
 
 define(
     [],

example/profiling/bundle.js

@@ -19,7 +19,6 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-/*global define*/
 
 define([
     "./src/WatchIndicator",

example/profiling/src/DigestIndicator.js

@@ -19,7 +19,6 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-/*global define*/
 
 define(
     [],

example/profiling/src/WatchIndicator.js

@@ -19,7 +19,6 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-/*global define*/
 
 define(
     [],

example/scratchpad/bundle.js

@@ -19,7 +19,6 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-/*global define*/
 
 define([
     "./src/ScratchPersistenceProvider"

example/scratchpad/src/ScratchPersistenceProvider.js

@@ -20,8 +20,6 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
-/*global define,window*/
-
 define(
     [],
     function () {

example/styleguide/src/ExampleStyleGuideModelProvider.js

@@ -19,7 +19,6 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-/*global define*/
 
 define(
     [],

indexTest.js

@@ -0,0 +1,3 @@
+const testsContext = require.context('.', true, /\/(src|platform)\/.*Spec.js$/);
+
+testsContext.keys().forEach(testsContext);

karma.conf.js

@@ -52,12 +52,16 @@ module.exports = (config) => {
         basePath: '',
         frameworks: ['jasmine'],
         files: [
-            'platform/**/*Spec.js',
+            'indexTest.js'
-            'src/**/*Spec.js'
         ],
         port: 9876,
         reporters: reporters,
         browsers: browsers,
+        client: {
+            jasmine: {
+                random: false
+            }
+        },
         customLaunchers: {
             ChromeDebugging: {
                 base: 'Chrome',
@@ -82,20 +86,20 @@ module.exports = (config) => {
             reports: ['html', 'lcovonly', 'text-summary'],
             thresholds: {
                 global: {
-                    lines: 62
+                    lines: 64
                 }
             }
         },
         preprocessors: {
-            'platform/**/*Spec.js': ['webpack', 'sourcemap'],
+            'indexTest.js': ['webpack', 'sourcemap']
-            'src/**/*Spec.js': ['webpack', 'sourcemap']
         },
         webpack: webpackConfig,
         webpackMiddleware: {
             stats: 'errors-only',
             logLevel: 'warn'
         },
+        concurrency: 1,
         singleRun: true,
         browserNoActivityTimeout: 90000
     });
-}
+};

package.json

@@ -6,7 +6,7 @@
   "devDependencies": {
     "angular": ">=1.8.0",
     "angular-route": "1.4.14",
-    "babel-eslint": "8.2.6",
+    "babel-eslint": "10.0.3",
     "comma-separated-values": "^3.6.4",
     "concurrently": "^3.6.1",
     "copy-webpack-plugin": "^4.5.2",
@@ -22,7 +22,7 @@
     "d3-selection": "1.3.x",
     "d3-time": "1.0.x",
     "d3-time-format": "2.1.x",
-    "eslint": "5.2.0",
+    "eslint": "7.0.0",
     "eslint-plugin-vue": "^6.0.0",
     "eslint-plugin-you-dont-need-lodash-underscore": "^6.10.0",
     "eventemitter3": "^1.2.0",
@@ -39,27 +39,27 @@
     "istanbul-instrumenter-loader": "^3.0.1",
     "jasmine-core": "^3.1.0",
     "jsdoc": "^3.3.2",
-    "karma": "^2.0.3",
+    "karma": "5.1.1",
-    "karma-chrome-launcher": "^2.2.0",
+    "karma-chrome-launcher": "3.1.0",
-    "karma-firefox-launcher": "^1.3.0",
+    "karma-firefox-launcher": "1.3.0",
-    "karma-cli": "^1.0.1",
+    "karma-cli": "2.0.0",
-    "karma-coverage": "^1.1.2",
+    "karma-coverage": "2.0.3",
-    "karma-coverage-istanbul-reporter": "^2.1.1",
+    "karma-coverage-istanbul-reporter": "3.0.3",
-    "karma-html-reporter": "^0.2.7",
+    "karma-html-reporter": "0.2.7",
-    "karma-jasmine": "^1.1.2",
+    "karma-jasmine": "3.3.1",
-    "karma-sourcemap-loader": "^0.3.7",
+    "karma-sourcemap-loader": "0.3.7",
-    "karma-webpack": "^3.0.0",
+    "karma-webpack": "4.0.2",
     "location-bar": "^3.0.1",
     "lodash": "^4.17.12",
     "markdown-toc": "^0.11.7",
     "marked": "^0.3.5",
     "mini-css-extract-plugin": "^0.4.1",
-    "minimist": "^1.1.1",
+    "minimist": "^1.2.5",
     "moment": "2.25.3",
     "moment-duration-format": "^2.2.2",
     "moment-timezone": "0.5.28",
     "node-bourbon": "^4.2.3",
-    "node-sass": "^4.9.2",
+    "node-sass": "^4.14.1",
     "painterro": "^1.0.35",
     "printj": "^1.2.1",
     "raw-loader": "^0.5.1",

platform/commonUI/edit/src/actions/SaveAsAction.js

@@ -164,7 +164,7 @@ function (
         }
 
         function saveAfterClone(clonedObject) {
-            return this.openmct.editor.save().then(() => {
+            return self.openmct.editor.save().then(() => {
                 // Force mutation for search indexing
                 return clonedObject;
             });

platform/commonUI/edit/src/capabilities/TransactionCapabilityDecorator.js

@@ -19,7 +19,6 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-/*global define*/
 
 define(
     ['./TransactionalPersistenceCapability'],

platform/commonUI/edit/src/capabilities/TransactionalPersistenceCapability.js

@@ -19,7 +19,6 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-/*global define*/
 
 define(
     [],

platform/commonUI/edit/src/creation/CreateWizard.js

@@ -56,10 +56,11 @@ define(
          */
         CreateWizard.prototype.getFormStructure = function (includeLocation) {
             var sections = [],
-                domainObject = this.domainObject;
+                domainObject = this.domainObject,
+                self = this;
 
             function validateLocation(parent) {
-                return parent && this.openmct.composition.checkPolicy(parent.useCapability('adapter'), domainObject.useCapability('adapter'));
+                return parent && self.openmct.composition.checkPolicy(parent.useCapability('adapter'), domainObject.useCapability('adapter'));
             }
 
             sections.push({

platform/commonUI/edit/src/services/TransactionService.js

@@ -19,7 +19,6 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-/*global define*/
 define(
     ['./Transaction', './NestedTransaction'],
     function (Transaction, NestedTransaction) {

platform/commonUI/edit/test/actions/SaveActionSpec.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2020, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -19,7 +19,6 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-/*global describe,it,expect,beforeEach,jasmine*/
 
 define(
     ["../../src/actions/SaveAction"],

platform/commonUI/edit/test/actions/SaveAndStopEditingActionSpec.js

@@ -19,7 +19,6 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-/*global describe,it,expect,beforeEach,jasmine*/
 
 define(
     ["../../src/actions/SaveAndStopEditingAction"],

platform/commonUI/edit/test/actions/SaveAsActionSpec.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2020, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -19,7 +19,6 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-/*global describe,it,expect,beforeEach,jasmine,spyOn*/
 
 define(
     ["../../src/actions/SaveAsAction"],

platform/commonUI/edit/test/capabilities/TransactionalPersistenceCapabilitySpec.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2020, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -19,7 +19,6 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-/*global define,describe,it,expect,beforeEach,jasmine*/
 
 define(
     [

platform/commonUI/edit/test/controllers/EditActionControllerSpec.js

@@ -19,7 +19,6 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-/*global describe,it,expect,beforeEach,jasmine*/
 
 define(
     ["../../src/controllers/EditActionController"],

platform/commonUI/edit/test/services/NestedTransactionSpec.js

@@ -19,7 +19,6 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-/*global define,describe,it,expect,beforeEach,jasmine*/
 
 define(["../../src/services/NestedTransaction"], function (NestedTransaction) {
     var TRANSACTION_METHODS = ['add', 'commit', 'cancel', 'size'];

platform/commonUI/edit/test/services/TransactionManagerSpec.js

@@ -19,7 +19,6 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-/*global define,describe,it,expect,beforeEach,jasmine*/
 
 define(
     ["../../src/services/TransactionManager"],

platform/commonUI/edit/test/services/TransactionServiceSpec.js

@@ -19,7 +19,6 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-/*global define,describe,it,expect,beforeEach,jasmine*/
 
 define(
     ["../../src/services/TransactionService"],
@@ -28,6 +27,7 @@ define(
         describe("The Transaction Service", function () {
             var mockQ,
                 mockLog,
+                mockCacheService,
                 transactionService;
 
             function fastPromise(val) {
@@ -40,9 +40,10 @@ define(
 
             beforeEach(function () {
                 mockQ = jasmine.createSpyObj("$q", ["all"]);
+                mockCacheService = jasmine.createSpyObj("cacheService", ["flush"]);
                 mockQ.all.and.returnValue(fastPromise());
                 mockLog = jasmine.createSpyObj("$log", ["error"]);
-                transactionService = new TransactionService(mockQ, mockLog);
+                transactionService = new TransactionService(mockQ, mockLog, mockCacheService);
             });
 
             it("isActive returns true if a transaction is in progress", function () {
@@ -85,17 +86,20 @@ define(
 
                 it("commit calls all queued commit functions", function () {
                     expect(transactionService.size()).toBe(3);
-                    transactionService.commit();
+
-                    onCommits.forEach(function (spy) {
+                    return transactionService.commit().then(() => {
-                        expect(spy).toHaveBeenCalled();
+                        onCommits.forEach(function (spy) {
+                            expect(spy).toHaveBeenCalled();
+                        });
                     });
                 });
 
                 it("commit resets active state and clears queues", function () {
-                    transactionService.commit();
+                    return transactionService.commit().then(() => {
-                    expect(transactionService.isActive()).toBe(false);
+                        expect(transactionService.isActive()).toBe(false);
-                    expect(transactionService.size()).toBe(0);
+                        expect(transactionService.size()).toBe(0);
-                    expect(transactionService.size()).toBe(0);
+                        expect(transactionService.size()).toBe(0);
+                    });
                 });
 
             });

platform/commonUI/edit/test/services/TransactionSpec.js

@@ -19,7 +19,6 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-/*global define,describe,it,expect,beforeEach,jasmine*/
 
 define(
     ["../../src/services/Transaction"],

platform/commonUI/general/src/directives/MCTSelectable.js

@@ -58,7 +58,8 @@ define(
                     var removeSelectable = openmct.selection.selectable(
                         element[0],
                         scope.$eval(attrs.mctSelectable),
-                        attrs.hasOwnProperty('mctInitSelect') && scope.$eval(attrs.mctInitSelect) !== false
+                        Object.prototype.hasOwnProperty.call(attrs, 'mctInitSelect')
+                        && scope.$eval(attrs.mctInitSelect) !== false
                     );
 
                     scope.$on("$destroy", function () {

platform/commonUI/general/src/services/UrlService.js

@@ -76,7 +76,7 @@ define(
             var search = this.$location.search(),
                 arr = [];
             for (var key in search) {
-                if (search.hasOwnProperty(key)) {
+                if (Object.prototype.hasOwnProperty.call(search, key)) {
                     arr.push(key + '=' + search[key]);
                 }
             }

platform/commonUI/general/test/directives/MCTTreeSpec.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2020, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -19,7 +19,6 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-/* global console*/
 
 define([
     '../../src/directives/MCTTree',

platform/commonUI/general/test/ui/TreeViewSpec.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2020, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -19,7 +19,6 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-/*global describe,beforeEach,jasmine,it,expect*/
 
 define([
     '../../src/ui/TreeView',

platform/commonUI/notification/src/NotificationService.js

@@ -27,7 +27,7 @@ export default class NotificationService {
         if (typeof message === 'string') {
             return this.openmct.notifications.info(message);
         } else {
-            if (message.hasOwnProperty('progress')) {
+            if (Object.prototype.hasOwnProperty.call(message, 'progress')) {
                 return this.openmct.notifications.progress(message.title, message.progress, message.progressText);
             } else {
                 return this.openmct.notifications.info(message.title);

platform/core/src/models/ModelCacheService.js

@@ -56,7 +56,7 @@ define([], function () {
      * @returns {boolean} true if present; false if not
      */
     ModelCacheService.prototype.has = function (id) {
-        return this.cache.hasOwnProperty(id);
+        return Object.prototype.hasOwnProperty.call(this.cache, id);
     };
 
     /**

platform/core/src/runs/TransactingMutationListener.js

@@ -19,7 +19,6 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-/*global define*/
 
 define([], function () {
 

platform/core/src/types/MergeModels.js

@@ -75,13 +75,13 @@ define(
             function mergeObjects(a, b) {
                 var result = {};
                 Object.keys(a).forEach(function (k) {
-                    result[k] = b.hasOwnProperty(k)
+                    result[k] = Object.prototype.hasOwnProperty.call(b, k)
                         ? mergeModels(a[k], b[k], (merger || {})[k])
                         : a[k];
                 });
                 Object.keys(b).forEach(function (k) {
                     // Copy any properties not already merged
-                    if (!a.hasOwnProperty(k)) {
+                    if (!Object.prototype.hasOwnProperty.call(a, k)) {
                         result[k] = b[k];
                     }
                 });

platform/entanglement/test/ControlledPromise.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2020, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -19,7 +19,7 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-/*global spyOn*/
+
 define(
     function () {
 

platform/entanglement/test/DomainObjectFactory.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2020, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -20,7 +20,6 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
-/*global jasmine*/
 define(
     function () {
 
@@ -110,7 +109,7 @@ define(
              * @returns {*} capability object
              */
             domainObject.getCapability.and.callFake(function (capability) {
-                if (config.capabilities.hasOwnProperty(capability)) {
+                if (Object.prototype.hasOwnProperty.call(config.capabilities, capability)) {
                     return config.capabilities[capability];
                 }
             });
@@ -124,7 +123,7 @@ define(
              * @returns {boolean}
              */
             domainObject.hasCapability.and.callFake(function (capability) {
-                return config.capabilities.hasOwnProperty(capability);
+                return Object.prototype.hasOwnProperty.call(config.capabilities, capability);
             });
 
             /**
@@ -137,7 +136,7 @@ define(
              * @returns {*} result whatever was returned by `invoke`.
              */
             domainObject.useCapability.and.callFake(function (capability) {
-                if (config.capabilities.hasOwnProperty(capability)) {
+                if (Object.prototype.hasOwnProperty.call(config.capabilities, capability)) {
                     if (!config.capabilities[capability].invoke) {
                         throw new Error(
                             capability + ' missing invoke function.'

platform/entanglement/test/services/MockCopyService.js

@@ -20,7 +20,6 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
-/*global jasmine*/
 define(
     function () {
 
@@ -60,7 +59,7 @@ define(
                 ]
             );
 
-            mockCopyService.perform.and.callFake(function () {
+            mockCopyService.perform.and.callFake(() => {
                 var performPromise,
                     callExtensions,
                     spy;
@@ -79,7 +78,7 @@ define(
                     }
                 };
 
-                spy = this.perform;
+                spy = mockCopyService.perform;
 
                 Object.keys(callExtensions).forEach(function (key) {
                     spy.calls.mostRecent()[key] = callExtensions[key];

platform/entanglement/test/services/MockLinkService.js

@@ -20,7 +20,6 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
-/*global jasmine*/
 define(
     [
         '../ControlledPromise'
@@ -63,11 +62,11 @@ define(
                 ]
             );
 
-            mockLinkService.perform.and.callFake(function (object) {
+            mockLinkService.perform.and.callFake(object => {
                 var performPromise = new ControlledPromise();
 
-                this.perform.calls.mostRecent().promise = performPromise;
+                mockLinkService.perform.calls.mostRecent().promise = performPromise;
-                this.perform.calls.all()[this.perform.calls.count() - 1].promise =
+                mockLinkService.perform.calls.all()[mockLinkService.perform.calls.count() - 1].promise =
                     performPromise;
 
                 return performPromise.then(function (overrideObject) {

platform/entanglement/test/services/MockMoveService.js

@@ -20,7 +20,6 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
-/*global jasmine*/
 define(
     function () {
 
@@ -60,7 +59,7 @@ define(
                 ]
             );
 
-            mockMoveService.perform.and.callFake(function () {
+            mockMoveService.perform.and.callFake(() => {
                 var performPromise,
                     callExtensions,
                     spy;
@@ -79,7 +78,7 @@ define(
                     }
                 };
 
-                spy = this.perform;
+                spy = mockMoveService.perform;
 
                 Object.keys(callExtensions).forEach(function (key) {
                     spy.calls.mostRecent()[key] = callExtensions[key];

platform/forms/src/FileInputService.js

@@ -47,6 +47,7 @@ define(["zepto"], function ($) {
         return new Promise(function (resolve, reject) {
             input.trigger("click");
             input.on('change', function (event) {
+                // eslint-disable-next-line no-invalid-this
                 file = this.files[0];
                 input.remove();
                 if (file) {

platform/framework/src/FrameworkLayer.js

@@ -20,8 +20,6 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
-/*global window*/
-
 define([
     './Constants',
     './FrameworkInitializer',

platform/framework/src/Main.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2020, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -20,8 +20,6 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
-/*global window*/
-
 /**
  * Implements the framework layer, which handles the loading of bundles
  * and the wiring-together of the extensions they expose.

platform/framework/src/register/CustomRegistrars.js

@@ -19,6 +19,7 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
+/* eslint-disable no-invalid-this */
 
 /**
  * Module defining CustomRegistrars. Created by vwoeltje on 11/3/14.

platform/import-export/bundle.js

@@ -19,7 +19,6 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-/*global define*/
 
 define([
     "./src/actions/ExportAsJSONAction",

platform/import-export/src/actions/ExportAsJSONAction.js

@@ -86,7 +86,7 @@ define(['lodash'], function (_) {
                         // Only export if object is creatable
                         if (this.isCreatable(child)) {
                             // Prevents infinite export of self-contained objs
-                            if (!this.tree.hasOwnProperty(this.getId(child))) {
+                            if (!Object.prototype.hasOwnProperty.call(this.tree, this.getId(child))) {
                                 // If object is a link to something absent from
                                 // tree, generate new id and treat as new object
                                 if (this.isExternal(child, parent)) {

platform/import-export/test/actions/ExportAsJSONActionSpec.js

@@ -144,7 +144,7 @@ define(
                     setTimeout(resolve, 100);
                 }).then(function () {
                     expect(Object.keys(action.tree).length).toBe(1);
-                    expect(action.tree.hasOwnProperty("parentId"))
+                    expect(Object.prototype.hasOwnProperty.call(action.tree, "parentId"))
                         .toBeTruthy();
                 });
             });
@@ -184,9 +184,9 @@ define(
                     setTimeout(resolve, 100);
                 }).then(function () {
                     expect(Object.keys(action.tree).length).toBe(2);
-                    expect(action.tree.hasOwnProperty("infiniteParentId"))
+                    expect(Object.prototype.hasOwnProperty.call(action.tree, "infiniteParentId"))
                         .toBeTruthy();
-                    expect(action.tree.hasOwnProperty("infiniteChildId"))
+                    expect(Object.prototype.hasOwnProperty.call(action.tree, "infiniteChildId"))
                         .toBeTruthy();
                 });
             });
@@ -224,9 +224,9 @@ define(
                     setTimeout(resolve, 100);
                 }).then(function () {
                     expect(Object.keys(action.tree).length).toBe(2);
-                    expect(action.tree.hasOwnProperty('parentId'))
+                    expect(Object.prototype.hasOwnProperty.call(action.tree, "parentId"))
                         .toBeTruthy();
-                    expect(action.tree.hasOwnProperty('brandNewId'))
+                    expect(Object.prototype.hasOwnProperty.call(action.tree, "brandNewId"))
                         .toBeTruthy();
                     expect(action.tree.brandNewId.location).toBe('parentId');
                 });
@@ -239,8 +239,8 @@ define(
                     setTimeout(resolve, 100);
                 }).then(function () {
                     expect(Object.keys(exportedTree).length).toBe(2);
-                    expect(exportedTree.hasOwnProperty('openmct')).toBeTruthy();
+                    expect(Object.prototype.hasOwnProperty.call(exportedTree, "openmct")).toBeTruthy();
-                    expect(exportedTree.hasOwnProperty('rootId')).toBeTruthy();
+                    expect(Object.prototype.hasOwnProperty.call(exportedTree, "rootId")).toBeTruthy();
                 });
             });
 

platform/persistence/elastic/test/ElasticSearchProviderSpec.js

@@ -46,25 +46,34 @@ define([
                 spyOn(provider, 'cleanTerm').and.returnValue('cleanedTerm');
                 spyOn(provider, 'fuzzyMatchUnquotedTerms').and.returnValue('fuzzy');
                 spyOn(provider, 'parseResponse').and.returnValue('parsedResponse');
-                $http.and.returnValue(Promise.resolve({}));
+                $http.and.returnValue(Promise.resolve({
+                    data: {
+                        hits: {
+                            hits: []
+                        }
+                    }
+                }));
             });
 
             it('cleans terms and adds fuzzyness', function () {
-                provider.query('hello', 10);
+                return provider.query('hello', 10)
-                expect(provider.cleanTerm).toHaveBeenCalledWith('hello');
+                    .then(() => {
-                expect(provider.fuzzyMatchUnquotedTerms)
+                        expect(provider.cleanTerm).toHaveBeenCalledWith('hello');
-                    .toHaveBeenCalledWith('cleanedTerm');
+                        expect(provider.fuzzyMatchUnquotedTerms)
+                            .toHaveBeenCalledWith('cleanedTerm');
+                    });
             });
 
             it('calls through to $http', function () {
-                provider.query('hello', 10);
+                return provider.query('hello', 10).then(() => {
-                expect($http).toHaveBeenCalledWith({
+                    expect($http).toHaveBeenCalledWith({
-                    method: 'GET',
+                        method: 'GET',
-                    params: {
+                        params: {
-                        q: 'fuzzy',
+                            q: 'fuzzy',
-                        size: 10
+                            size: 10
-                    },
+                        },
-                    url: 'http://localhost:9200/_search/'
+                        url: 'http://localhost:9200/_search/'
+                    });
                 });
             });
 

platform/search/src/services/BareBonesSearchWorker.js

@@ -20,8 +20,6 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
-/*global self*/
-
 /**
  * Module defining BareBonesSearchWorker. Created by deeptailor on 10/03/2019.
  */

platform/search/src/services/GenericSearchProvider.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2020, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -19,7 +19,6 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-/*global setTimeout*/
 
 /**
  * Module defining GenericSearchProvider. Created by shale on 07/16/2015.

platform/search/src/services/GenericSearchWorker.js

@@ -20,8 +20,6 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
-/*global self*/
-
 /**
  * Module defining GenericSearchWorker. Created by shale on 07/21/2015.
  */

platform/search/test/services/GenericSearchWorkerSpec.js

@@ -20,8 +20,6 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
-/*global require*/
-
 /**
  *  SearchSpec. Created by shale on 07/31/2015.
  */

platform/search/test/services/SearchAggregatorSpec.js

@@ -27,7 +27,7 @@ define([
     "../../src/services/SearchAggregator"
 ], function (SearchAggregator) {
 
-    describe("SearchAggregator", function () {
+    xdescribe("SearchAggregator", function () {
         var $q,
             objectService,
             providers,
@@ -91,18 +91,19 @@ define([
         });
 
         it('filters results with a function', function () {
-            var modelResults = {
+            const modelResults = {
-                    hits: [
+                hits: [
-                        {model: {thing: 1}},
+                    {model: {thing: 1}},
-                        {model: {thing: 2}},
+                    {model: {thing: 2}},
-                        {model: {thing: 3}}
+                    {model: {thing: 3}}
-                    ],
+                ],
-                    total: 3
+                total: 3
-                },
+            };
-                filterFunc = function (model) {
+            let filtered = aggregator.applyFilter(modelResults, filterFunc);
-                    return model.thing < 2;
+
-                },
+            function filterFunc(model) {
-                filtered = aggregator.applyFilter(modelResults, filterFunc);
+                return model.thing < 2;
+            }
 
             expect(filtered.hits).toEqual([
                 {model: {thing: 1}}

platform/telemetry/src/TelemetryCapability.js

@@ -33,14 +33,11 @@ define(
         _
     ) {
 
-        var ZERO = function () {
+        const EMPTY_SERIES = {
-                return 0;
+            getPointCount: () => 0,
-            },
+            getDomainValue: () => 0,
-            EMPTY_SERIES = {
+            getRangeValue: () => 0
-                getPointCount: ZERO,
+        };
-                getDomainValue: ZERO,
-                getRangeValue: ZERO
-            };
 
         /**
          * Provides metadata about telemetry associated with a

src/BundleRegistry.js

@@ -28,7 +28,7 @@ define(function () {
     }
 
     BundleRegistry.prototype.register = function (path, definition) {
-        if (this.knownBundles.hasOwnProperty(path)) {
+        if (Object.prototype.hasOwnProperty.call(this.knownBundles, path)) {
             throw new Error('Cannot register bundle with duplicate path', path);
         }
 

src/MCT.js

@@ -444,6 +444,7 @@ define([
 
     MCT.prototype.destroy = function () {
         this.emit('destroy');
+        this.router.destroy();
     };
 
     MCT.prototype.plugins = plugins;

src/MCTSpec.js

@@ -32,10 +32,6 @@ define([
         var mockListener;
         var oldBundles;
 
-        beforeAll(() => {
-            testUtils.resetApplicationState();
-        });
-
         beforeEach(function () {
             mockPlugin = jasmine.createSpy('plugin');
             mockPlugin2 = jasmine.createSpy('plugin2');
@@ -56,7 +52,8 @@ define([
                     legacyRegistry.delete(bundle);
                 }
             });
-            testUtils.resetApplicationState(openmct);
+
+            return testUtils.resetApplicationState(openmct);
         });
 
         it("exposes plugins", function () {

src/adapter/policies/AdaptedViewPolicy.js

@@ -29,7 +29,7 @@ define([], function () {
         view,
         legacyObject
     ) {
-        if (view.hasOwnProperty('provider')) {
+        if (Object.prototype.hasOwnProperty.call(view, 'provider')) {
             var domainObject = legacyObject.useCapability('adapter');
 
             return view.provider.canView(domainObject);

src/adapter/runs/TypeDeprecationChecker.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open openmct, Copyright (c) 2014-2018, United States Government
+ * Open openmct, Copyright (c) 2014-2020, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -20,7 +20,6 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
-/* global console */
 define([
 
 ], function (
@@ -28,7 +27,7 @@ define([
 ) {
 
     function checkForDeprecatedFunctionality(typeDef) {
-        if (typeDef.hasOwnProperty('telemetry')) {
+        if (Object.prototype.hasOwnProperty.call(typeDef, 'telemetry')) {
             console.warn(
                 'DEPRECATION WARNING: Telemetry data on type '
                 + 'registrations will be deprecated in a future version, '

src/adapter/services/LegacyObjectAPIInterceptor.js

@@ -72,21 +72,25 @@ define([
     ObjectServiceProvider.prototype.create = async function (object) {
         let model = utils.toOldFormat(object);
 
-        return this.getPersistenceService().createObject(
+        let result = await this.getPersistenceService().createObject(
             this.getSpace(utils.makeKeyString(object.identifier)),
             object.identifier.key,
             model
         );
+
+        return result;
     };
 
     ObjectServiceProvider.prototype.update = async function (object) {
         let model = utils.toOldFormat(object);
 
-        return this.getPersistenceService().updateObject(
+        let result = await this.getPersistenceService().updateObject(
             this.getSpace(utils.makeKeyString(object.identifier)),
             object.identifier.key,
             model
         );
+
+        return result;
     };
 
     /**

src/adapter/views/installLegacyViews.js

@@ -21,7 +21,7 @@ define([
         });
 
         let inspectorTypes = openmct.$injector.get('types[]')
-            .filter((t) => t.hasOwnProperty('inspector'));
+            .filter((t) => Object.prototype.hasOwnProperty.call(t, 'inspector'));
 
         inspectorTypes.forEach(function (typeDefinition) {
             openmct.inspectorViews.addProvider(new TypeInspectorViewProvider(typeDefinition, openmct, convertToLegacyObject));

src/api/notifications/NotificationAPI.js

@@ -299,7 +299,7 @@ export default class NotificationAPI extends EventEmitter {
             this._dismiss(notification);
         };
 
-        if (notificationModel.hasOwnProperty('progressPerc')) {
+        if (Object.prototype.hasOwnProperty.call(notificationModel, 'progressPerc')) {
             notification.progress = (progressPerc, progressText) => {
                 notification.model.progressPerc = progressPerc;
                 notification.model.progressText = progressText;

src/api/objects/object-utils.js

@@ -32,8 +32,8 @@ define([
      */
     function isIdentifier(thing) {
         return typeof thing === 'object'
-            && thing.hasOwnProperty('key')
+            && Object.prototype.hasOwnProperty.call(thing, 'key')
-            && thing.hasOwnProperty('namespace');
+            && Object.prototype.hasOwnProperty.call(thing, 'namespace');
     }
 
     /**

src/api/telemetry/TelemetryAPI.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2020, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -19,7 +19,7 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-/*global console*/
+
 define([
     './TelemetryMetadataManager',
     './TelemetryValueFormatter',
@@ -247,15 +247,15 @@ define([
      * @private
      */
     TelemetryAPI.prototype.standardizeRequestOptions = function (options) {
-        if (!options.hasOwnProperty('start')) {
+        if (!Object.prototype.hasOwnProperty.call(options, 'start')) {
             options.start = this.openmct.time.bounds().start;
         }
 
-        if (!options.hasOwnProperty('end')) {
+        if (!Object.prototype.hasOwnProperty.call(options, 'end')) {
             options.end = this.openmct.time.bounds().end;
         }
 
-        if (!options.hasOwnProperty('domain')) {
+        if (!Object.prototype.hasOwnProperty.call(options, 'domain')) {
             options.domain = this.openmct.time.timeSystem().key;
         }
     };
@@ -386,7 +386,7 @@ define([
         }).reduce(function (a, b) {
             var results = {};
             Object.keys(a).forEach(function (key) {
-                if (b.hasOwnProperty(key)) {
+                if (Object.prototype.hasOwnProperty.call(b, key)) {
                     results[key] = a[key];
                 }
             });

src/api/telemetry/TelemetryMetadataManager.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2020, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -19,7 +19,6 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-/*global console*/
 
 define([
     'lodash'
@@ -31,26 +30,26 @@ define([
         valueMetadata.source = valueMetadata.source || valueMetadata.key;
         valueMetadata.hints = valueMetadata.hints || {};
 
-        if (valueMetadata.hints.hasOwnProperty('x')) {
+        if (Object.prototype.hasOwnProperty.call(valueMetadata.hints, 'x')) {
             console.warn(
                 'DEPRECATION WARNING: `x` hints should be replaced with '
                 + '`domain` hints moving forward.  '
                 + 'https://github.com/nasa/openmct/issues/1546'
             );
-            if (!valueMetadata.hints.hasOwnProperty('domain')) {
+            if (!Object.prototype.hasOwnProperty.call(valueMetadata.hints, 'domain')) {
                 valueMetadata.hints.domain = valueMetadata.hints.x;
             }
 
             delete valueMetadata.hints.x;
         }
 
-        if (valueMetadata.hints.hasOwnProperty('y')) {
+        if (Object.prototype.hasOwnProperty.call(valueMetadata.hints, 'y')) {
             console.warn(
                 'DEPRECATION WARNING: `y` hints should be replaced with '
                 + '`range` hints moving forward.  '
                 + 'https://github.com/nasa/openmct/issues/1546'
             );
-            if (!valueMetadata.hints.hasOwnProperty('range')) {
+            if (!Object.prototype.hasOwnProperty.call(valueMetadata.hints, 'range')) {
                 valueMetadata.hints.range = valueMetadata.hints.y;
             }
 
@@ -62,16 +61,16 @@ define([
                 valueMetadata.values = valueMetadata.enumerations.map(e => e.value);
             }
 
-            if (!valueMetadata.hasOwnProperty('max')) {
+            if (!Object.prototype.hasOwnProperty.call(valueMetadata, 'max')) {
                 valueMetadata.max = Math.max(valueMetadata.values) + 1;
             }
 
-            if (!valueMetadata.hasOwnProperty('min')) {
+            if (!Object.prototype.hasOwnProperty.call(valueMetadata, 'min')) {
                 valueMetadata.min = Math.min(valueMetadata.values) - 1;
             }
         }
 
-        if (!valueMetadata.hints.hasOwnProperty('priority')) {
+        if (!Object.prototype.hasOwnProperty.call(valueMetadata.hints, 'priority')) {
             valueMetadata.hints.priority = index;
         }
 
@@ -114,8 +113,8 @@ define([
         hints
     ) {
         function hasHint(hint) {
-            /*jshint validthis: true */
+            // eslint-disable-next-line no-invalid-this
-            return this.hints.hasOwnProperty(hint);
+            return Object.prototype.hasOwnProperty.call(this.hints, hint);
         }
 
         function hasHints(metadata) {

src/api/telemetry/TelemetryValueFormatter.js

@@ -63,7 +63,7 @@ define([
                 byString: {}
             });
             this.formatter.format = function (value) {
-                if (this.enumerations.byValue.hasOwnProperty(value)) {
+                if (Object.prototype.hasOwnProperty.call(this.enumerations.byValue, value)) {
                     return this.enumerations.byValue[value];
                 }
 
@@ -71,7 +71,7 @@ define([
             }.bind(this);
             this.formatter.parse = function (string) {
                 if (typeof string === "string") {
-                    if (this.enumerations.byString.hasOwnProperty(string)) {
+                    if (Object.prototype.hasOwnProperty.call(this.enumerations.byString, string)) {
                         return this.enumerations.byString[string];
                     }
                 }

src/api/types/TypeRegistry.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2020, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -19,7 +19,6 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-/*global console*/
 
 define(['./Type'], function (Type) {
     /**
@@ -63,7 +62,7 @@ define(['./Type'], function (Type) {
      * @private
      */
     TypeRegistry.prototype.standardizeType = function (typeDef) {
-        if (typeDef.hasOwnProperty('label')) {
+        if (Object.prototype.hasOwnProperty.call(typeDef, 'label')) {
             console.warn(
                 'DEPRECATION WARNING typeDef: ' + typeDef.label + '.  '
                 + '`label` is deprecated in type definitions.  Please use '

src/plugins/LADTable/pluginSpec.js

@@ -94,7 +94,7 @@ describe("The LAD Table", () => {
     });
 
     afterEach(() => {
-        resetApplicationState(openmct);
+        return resetApplicationState(openmct);
     });
 
     it("should provide a table view only for lad table objects", () => {
@@ -284,7 +284,7 @@ describe("The LAD Table Set", () => {
     });
 
     afterEach(() => {
-        resetApplicationState(openmct);
+        return resetApplicationState(openmct);
     });
 
     it("should provide a lad table set view only for lad table set objects", () => {

src/plugins/URLIndicatorPlugin/URLIndicatorSpec.js

@@ -35,7 +35,7 @@ define(
     ) {
         var defaultAjaxFunction = $.ajax;
 
-        xdescribe("The URLIndicator", function () {
+        describe("The URLIndicator", function () {
             var openmct;
             var indicatorElement;
             var pluginOptions;

src/plugins/URLTimeSettingsSynchronizer/URLTimeSettingsSynchronizer.js

@@ -66,7 +66,7 @@ export default class URLTimeSettingsSynchronizer {
         TIME_EVENTS.forEach(event => {
             this.openmct.time.off(event, this.setUrlFromTimeApi);
         });
-        this.openmct.time.on('bounds', this.updateBounds);
+        this.openmct.time.off('bounds', this.updateBounds);
     }
 
     updateTimeSettings() {

src/plugins/URLTimeSettingsSynchronizer/pluginSpec.js

@@ -27,7 +27,6 @@ import {
 describe("The URLTimeSettingsSynchronizer", () => {
     let openmct;
     let testClock;
-    beforeAll(() => resetApplicationState());
 
     beforeEach((done) => {
         openmct = createOpenMct();