Minor code refactoring

5 years ago · 5ccc18948a
parent dabb153039
commit 5ccc18948a
39 changed files with 170 additions and 240 deletions
--- a/.eslintrc.js
+++ b/.eslintrc.js
@ -4,14 +4,13 @@

 module.exports = {
    env: {
-        node: false,
+        node: true,
        browser: true,
        es6: true,
-        jquery: true,
-        qunit: true,
    },
    parserOptions: {
-        sourceType: 'script',
+        sourceType: 'module',
+        ecmaVersion: 2018,
    },
    plugins: ['eslint-plugin-header'],
    extends: ['eslint:recommended', 'prettier'],
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@ -1,27 +1,22 @@
 {
    "python.pythonPath": ".env/bin/python",
    "eslint.enable": true,
-    "eslint.validate": [
+    "eslint.probe": [
        "javascript",
        "typescript",
-        "typescriptreact",
+        "typescriptreact"
    ],
+    "eslint.onIgnoredFiles": "warn",
    "eslint.workingDirectories": [
        {
-            "directory":  "./cvat-core",
-            "changeProcessCWD": true
+            "directory": "${cwd}",
        },
        {
-            "directory":  "./cvat-canvas",
-            "changeProcessCWD": true
+            "pattern":  "cvat-*"
        },
        {
-            "directory":  "./cvat-ui",
-            "changeProcessCWD": true
-        },
-        {
-            "directory":  ".",
-            "changeProcessCWD": true
+            "directory": "tests",
+            "!cwd": true
        }
    ],
    "python.linting.pylintEnabled": true,
--- a/cvat-core/.eslintrc.js
+++ b/cvat-core/.eslintrc.js
@ -4,12 +4,9 @@

 module.exports = {
    env: {
-        amd: true,
-        node: false,
+        node: true,
        browser: true,
        es6: true,
-        jquery: true,
-        qunit: true,
        'jest/globals': true,
    },
    parserOptions: {
@ -17,7 +14,7 @@ module.exports = {
        sourceType: 'module',
        ecmaVersion: 2018,
    },
-    plugins: ['security', 'jest', 'no-unsanitized', 'no-unsafe-innerhtml'],
+    plugins: ['security', 'jest', 'no-unsafe-innerhtml'],
    extends: ['eslint:recommended', 'plugin:security/recommended', 'plugin:no-unsanitized/DOM', 'airbnb-base'],
    rules: {
        'no-await-in-loop': [0],
--- a/cvat-core/package-lock.json
+++ b/cvat-core/package-lock.json
@ -2822,6 +2822,10 @@
    },
    "cvat-data": {
      "version": "file:../cvat-data",
+      "requires": {
+        "async-mutex": "^0.2.4",
+        "jszip": "3.5.0"
+      },
      "dependencies": {
        "@babel/cli": {
          "version": "7.6.4",
@ -3932,9 +3936,19 @@
          "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ=="
        },
        "async-mutex": {
-          "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/async-mutex/-/async-mutex-0.1.4.tgz",
-          "integrity": "sha512-zVWTmAnxxHaeB2B1te84oecI8zTDJ/8G49aVBblRX6be0oq6pAybNcUSxwfgVOmOjSCvN4aYZAqwtyNI8e1YGw=="
+          "version": "0.2.4",
+          "resolved": "https://registry.npmjs.org/async-mutex/-/async-mutex-0.2.4.tgz",
+          "integrity": "sha512-fcQKOXUKMQc57JlmjBCHtkKNrfGpHyR7vu18RfuLfeTAf4hK9PgOadPR5cDrBQ682zasrLUhJFe7EKAHJOduDg==",
+          "requires": {
+            "tslib": "^2.0.0"
+          },
+          "dependencies": {
+            "tslib": {
+              "version": "2.0.3",
+              "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.3.tgz",
+              "integrity": "sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ=="
+            }
+          }
        },
        "atob": {
          "version": "2.1.2",
@ -5068,11 +5082,6 @@
            "event-emitter": "~0.3.5"
          }
        },
-        "es6-promise": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.0.2.tgz",
-          "integrity": "sha1-AQ1YWEI6XxGJeWZfRkhqlcbuK7Y="
-        },
        "es6-set": {
          "version": "0.1.5",
          "resolved": "https://registry.npmjs.org/es6-set/-/es6-set-0.1.5.tgz",
@ -6781,22 +6790,14 @@
          "integrity": "sha1-T9kss04OnbPInIYi7PUfm5eMbLk="
        },
        "jszip": {
-          "version": "3.1.5",
-          "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.1.5.tgz",
-          "integrity": "sha512-5W8NUaFRFRqTOL7ZDDrx5qWHJyBXy6velVudIzQUSoqAAYqzSh2Z7/m0Rf1QbmQJccegD0r+YZxBjzqoBiEeJQ==",
+          "version": "3.5.0",
+          "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.5.0.tgz",
+          "integrity": "sha512-WRtu7TPCmYePR1nazfrtuF216cIVon/3GWOvHS9QR5bIwSbnxtdpma6un3jyGGNhHsKCSzn5Ypk+EkDRvTGiFA==",
          "requires": {
-            "core-js": "~2.3.0",
-            "es6-promise": "~3.0.2",
-            "lie": "~3.1.0",
+            "lie": "~3.3.0",
            "pako": "~1.0.2",
-            "readable-stream": "~2.0.6"
-          },
-          "dependencies": {
-            "core-js": {
-              "version": "2.3.0",
-              "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.3.0.tgz",
-              "integrity": "sha1-+rg/uwstjchfpjbEudNMdUIMbWU="
-            }
+            "readable-stream": "~2.3.6",
+            "set-immediate-shim": "~1.0.1"
          }
        },
        "kind-of": {
@ -6822,9 +6823,9 @@
          }
        },
        "lie": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/lie/-/lie-3.1.1.tgz",
-          "integrity": "sha1-mkNrLMd0bKWd56QfpGmz77dr2H4=",
+          "version": "3.3.0",
+          "resolved": "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz",
+          "integrity": "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==",
          "requires": {
            "immediate": "~3.0.5"
          }
@ -7699,9 +7700,9 @@
          "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI="
        },
        "process-nextick-args": {
-          "version": "1.0.7",
-          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
-          "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M="
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+          "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
        },
        "progress": {
          "version": "2.0.3",
@ -7891,15 +7892,16 @@
          }
        },
        "readable-stream": {
-          "version": "2.0.6",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz",
-          "integrity": "sha1-j5A0HmilPMySh4jaz80Rs265t44=",
+          "version": "2.3.7",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
          "requires": {
            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.1",
+            "inherits": "~2.0.3",
            "isarray": "~1.0.0",
-            "process-nextick-args": "~1.0.6",
-            "string_decoder": "~0.10.x",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
            "util-deprecate": "~1.0.1"
          }
        },
@ -8243,6 +8245,11 @@
          "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
          "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
        },
+        "set-immediate-shim": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz",
+          "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E="
+        },
        "set-value": {
          "version": "2.0.1",
          "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
@ -8620,9 +8627,12 @@
          }
        },
        "string_decoder": {
-          "version": "0.10.31",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ="
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+          "requires": {
+            "safe-buffer": "~5.1.0"
+          }
        },
        "strip-ansi": {
          "version": "3.0.1",
--- a/tests/cypress/integration/actions_tasks_objects/case_10_polygon_shape_track_label_points.js
+++ b/tests/cypress/integration/actions_tasks_objects/case_10_polygon_shape_track_label_points.js
@ -1,12 +1,10 @@
-/*
- * Copyright (C) 2020 Intel Corporation
- *
- * SPDX-License-Identifier: MIT
- */
+// Copyright (C) 2020 Intel Corporation
+//
+// SPDX-License-Identifier: MIT

 /// <reference types="cypress" />

-import { taskName, labelName } from '../../support/const';
+import { taskName } from '../../support/const';

 context('Actions on polygon', () => {
    const caseId = '10';
--- a/tests/cypress/integration/actions_tasks_objects/case_11_polylines_shape_track_label_points.js
+++ b/tests/cypress/integration/actions_tasks_objects/case_11_polylines_shape_track_label_points.js
@ -1,13 +1,10 @@
-/* eslint-disable no-undef */
-/*
- * Copyright (C) 2020 Intel Corporation
- *
- * SPDX-License-Identifier: MIT
- */
+// Copyright (C) 2020 Intel Corporation
+//
+// SPDX-License-Identifier: MIT

 /// <reference types="cypress" />

-import { taskName, labelName } from '../../support/const';
+import { taskName } from '../../support/const';

 context('Actions on polylines', () => {
    const caseId = '11';
--- a/tests/cypress/integration/actions_tasks_objects/case_12_points_shape_track_label.js
+++ b/tests/cypress/integration/actions_tasks_objects/case_12_points_shape_track_label.js
@ -1,12 +1,10 @@
-/*
- * Copyright (C) 2020 Intel Corporation
- *
- * SPDX-License-Identifier: MIT
- */
+// Copyright (C) 2020 Intel Corporation
+//
+// SPDX-License-Identifier: MIT

 /// <reference types="cypress" />

-import { taskName, labelName } from '../../support/const';
+import { taskName } from '../../support/const';

 context('Actions on points', () => {
    const caseId = '12';
--- a/tests/cypress/integration/actions_tasks_objects/case_3_task_start_stop_step_frame.js
+++ b/tests/cypress/integration/actions_tasks_objects/case_3_task_start_stop_step_frame.js
@ -1,8 +1,6 @@
-/*
- * Copyright (C) 2020 Intel Corporation
- *
- * SPDX-License-Identifier: MIT
- */
+// Copyright (C) 2020 Intel Corporation
+//
+// SPDX-License-Identifier: MIT

 /// <reference types="cypress" />

--- a/tests/cypress/integration/actions_tasks_objects/case_5_image_rotate.js
+++ b/tests/cypress/integration/actions_tasks_objects/case_5_image_rotate.js
@ -1,8 +1,6 @@
-/*
- * Copyright (C) 2020 Intel Corporation
- *
- * SPDX-License-Identifier: MIT
- */
+// Copyright (C) 2020 Intel Corporation
+//
+// SPDX-License-Identifier: MIT

 /// <reference types="cypress" />

--- a/tests/cypress/integration/actions_tasks_objects/case_6_image_scale_fit.js
+++ b/tests/cypress/integration/actions_tasks_objects/case_6_image_scale_fit.js
@ -1,8 +1,6 @@
-/*
- * Copyright (C) 2020 Intel Corporation
- *
- * SPDX-License-Identifier: MIT
- */
+// Copyright (C) 2020 Intel Corporation
+//
+// SPDX-License-Identifier: MIT

 /// <reference types="cypress" />

--- a/tests/cypress/integration/actions_tasks_objects/case_7_image_scale_roi.js
+++ b/tests/cypress/integration/actions_tasks_objects/case_7_image_scale_roi.js
@ -1,8 +1,6 @@
-/*
- * Copyright (C) 2020 Intel Corporation
- *
- * SPDX-License-Identifier: MIT
- */
+// Copyright (C) 2020 Intel Corporation
+//
+// SPDX-License-Identifier: MIT

 /// <reference types="cypress" />

--- a/tests/cypress/integration/actions_tasks_objects/case_8_rectangle_shape_track_label.js
+++ b/tests/cypress/integration/actions_tasks_objects/case_8_rectangle_shape_track_label.js
@ -1,12 +1,10 @@
-/*
- * Copyright (C) 2020 Intel Corporation
- *
- * SPDX-License-Identifier: MIT
- */
+// Copyright (C) 2020 Intel Corporation
+//
+// SPDX-License-Identifier: MIT

 /// <reference types="cypress" />

-import { taskName, labelName } from '../../support/const';
+import { taskName } from '../../support/const';

 context('Actions on rectangle', () => {
    const caseId = '8';
--- a/tests/cypress/integration/actions_tasks_objects/case_9_cuboid_shape_track_label.js
+++ b/tests/cypress/integration/actions_tasks_objects/case_9_cuboid_shape_track_label.js
@ -1,12 +1,10 @@
-/*
- * Copyright (C) 2020 Intel Corporation
- *
- * SPDX-License-Identifier: MIT
- */
+// Copyright (C) 2020 Intel Corporation
+//
+// SPDX-License-Identifier: MIT

 /// <reference types="cypress" />

-import { taskName, labelName } from '../../support/const';
+import { taskName } from '../../support/const';

 context('Actions on Cuboid', () => {
    const caseId = '9';
--- a/tests/cypress/integration/actions_tasks_objects/issue_1216_Check_if_UI_not_fails_with_shape_dragging_over_sidebar.js
+++ b/tests/cypress/integration/actions_tasks_objects/issue_1216_Check_if_UI_not_fails_with_shape_dragging_over_sidebar.js
@ -1,8 +1,6 @@
-/*
- * Copyright (C) 2020 Intel Corporation
- *
- * SPDX-License-Identifier: MIT
- */
+// Copyright (C) 2020 Intel Corporation
+//
+// SPDX-License-Identifier: MIT

 /// <reference types="cypress" />

--- a/tests/cypress/integration/actions_tasks_objects/issue_1368_points_track_invisible_next_frame.js
+++ b/tests/cypress/integration/actions_tasks_objects/issue_1368_points_track_invisible_next_frame.js
@ -1,8 +1,6 @@
-/*
- * Copyright (C) 2020 Intel Corporation
- *
- * SPDX-License-Identifier: MIT
- */
+// Copyright (C) 2020 Intel Corporation
+//
+// SPDX-License-Identifier: MIT

 /// <reference types="cypress" />

--- a/tests/cypress/integration/actions_tasks_objects/issue_1391_delete_point.js
+++ b/tests/cypress/integration/actions_tasks_objects/issue_1391_delete_point.js
@ -1,8 +1,6 @@
-/*
- * Copyright (C) 2020 Intel Corporation
- *
- * SPDX-License-Identifier: MIT
- */
+// Copyright (C) 2020 Intel Corporation
+//
+// SPDX-License-Identifier: MIT

 /// <reference types="cypress" />

--- a/tests/cypress/integration/actions_tasks_objects/issue_1429_check_new_label.js
+++ b/tests/cypress/integration/actions_tasks_objects/issue_1429_check_new_label.js
@ -1,8 +1,6 @@
-/*
- * Copyright (C) 2020 Intel Corporation
- *
- * SPDX-License-Identifier: MIT
- */
+// Copyright (C) 2020 Intel Corporation
+//
+// SPDX-License-Identifier: MIT

 /// <reference types="cypress" />

--- a/tests/cypress/integration/actions_tasks_objects/issue_1433_hide_functionality.js
+++ b/tests/cypress/integration/actions_tasks_objects/issue_1433_hide_functionality.js
@ -1,8 +1,6 @@
-/*
- * Copyright (C) 2020 Intel Corporation
- *
- * SPDX-License-Identifier: MIT
- */
+// Copyright (C) 2020 Intel Corporation
+//
+// SPDX-License-Identifier: MIT

 /// <reference types="cypress" />

--- a/tests/cypress/integration/actions_tasks_objects/issue_1438_cancel_multiple_paste_ui_not_lock.js
+++ b/tests/cypress/integration/actions_tasks_objects/issue_1438_cancel_multiple_paste_ui_not_lock.js
@ -1,8 +1,6 @@
-/*
- * Copyright (C) 2020 Intel Corporation
- *
- * SPDX-License-Identifier: MIT
- */
+// Copyright (C) 2020 Intel Corporation
+//
+// SPDX-License-Identifier: MIT

 /// <reference types="cypress" />

--- a/tests/cypress/integration/actions_tasks_objects/issue_1439_blocked_object_info.js
+++ b/tests/cypress/integration/actions_tasks_objects/issue_1439_blocked_object_info.js
@ -1,8 +1,6 @@
-/*
- * Copyright (C) 2020 Intel Corporation
- *
- * SPDX-License-Identifier: MIT
- */
+// Copyright (C) 2020 Intel Corporation
+//
+// SPDX-License-Identifier: MIT

 /// <reference types="cypress" />

--- a/tests/cypress/integration/actions_tasks_objects/issue_1444_filter_property_shape.js
+++ b/tests/cypress/integration/actions_tasks_objects/issue_1444_filter_property_shape.js
@ -1,8 +1,6 @@
-/*
- * Copyright (C) 2020 Intel Corporation
- *
- * SPDX-License-Identifier: MIT
- */
+// Copyright (C) 2020 Intel Corporation
+//
+// SPDX-License-Identifier: MIT

 /// <reference types="cypress" />

--- a/tests/cypress/integration/actions_tasks_objects/issue_1498_message_ui_raw_labels_wrong.js
+++ b/tests/cypress/integration/actions_tasks_objects/issue_1498_message_ui_raw_labels_wrong.js
@ -1,8 +1,6 @@
-/*
- * Copyright (C) 2020 Intel Corporation
- *
- * SPDX-License-Identifier: MIT
- */
+// Copyright (C) 2020 Intel Corporation
+//
+// SPDX-License-Identifier: MIT

 /// <reference types="cypress" />

--- a/tests/cypress/integration/actions_tasks_objects/issue_1540_add_remove_tag.js
+++ b/tests/cypress/integration/actions_tasks_objects/issue_1540_add_remove_tag.js
@ -1,8 +1,6 @@
-/*
- * Copyright (C) 2020 Intel Corporation
- *
- * SPDX-License-Identifier: MIT
- */
+// Copyright (C) 2020 Intel Corporation
+//
+// SPDX-License-Identifier: MIT

 /// <reference types="cypress" />

--- a/tests/cypress/integration/actions_tasks_objects/issue_1568_cuboid_dump_annotation.js
+++ b/tests/cypress/integration/actions_tasks_objects/issue_1568_cuboid_dump_annotation.js
@ -1,8 +1,6 @@
-/*
- * Copyright (C) 2020 Intel Corporation
- *
- * SPDX-License-Identifier: MIT
- */
+// Copyright (C) 2020 Intel Corporation
+//
+// SPDX-License-Identifier: MIT

 /// <reference types="cypress" />

--- a/tests/cypress/integration/actions_tasks_objects/issue_1785_propagation_latest_frame.js
+++ b/tests/cypress/integration/actions_tasks_objects/issue_1785_propagation_latest_frame.js
@ -1,8 +1,6 @@
-/*
- * Copyright (C) 2020 Intel Corporation
- *
- * SPDX-License-Identifier: MIT
- */
+// Copyright (C) 2020 Intel Corporation
+//
+// SPDX-License-Identifier: MIT

 /// <reference types="cypress" />

--- a/tests/cypress/integration/actions_tasks_objects/issue_1819_first_part_splitted_track_visible.js
+++ b/tests/cypress/integration/actions_tasks_objects/issue_1819_first_part_splitted_track_visible.js
@ -1,8 +1,6 @@
-/*
- * Copyright (C) 2020 Intel Corporation
- *
- * SPDX-License-Identifier: MIT
- */
+// Copyright (C) 2020 Intel Corporation
+//
+// SPDX-License-Identifier: MIT

 /// <reference types="cypress" />

--- a/tests/cypress/integration/actions_tasks_objects/issue_1825_tooltip_hidden_mouseout.js
+++ b/tests/cypress/integration/actions_tasks_objects/issue_1825_tooltip_hidden_mouseout.js
@ -1,8 +1,6 @@
-/*
- * Copyright (C) 2020 Intel Corporation
- *
- * SPDX-License-Identifier: MIT
- */
+// Copyright (C) 2020 Intel Corporation
+//
+// SPDX-License-Identifier: MIT

 /// <reference types="cypress" />

--- a/tests/cypress/integration/actions_tasks_objects/issue_1841_hidden_points_cuboids_grouping.js
+++ b/tests/cypress/integration/actions_tasks_objects/issue_1841_hidden_points_cuboids_grouping.js
@ -1,8 +1,6 @@
-/*
- * Copyright (C) 2020 Intel Corporation
- *
- * SPDX-License-Identifier: MIT
- */
+// Copyright (C) 2020 Intel Corporation
+//
+// SPDX-License-Identifier: MIT

 /// <reference types="cypress" />

--- a/tests/cypress/integration/actions_tasks_objects/issue_1870_cursor_not_jump_to_end.js
+++ b/tests/cypress/integration/actions_tasks_objects/issue_1870_cursor_not_jump_to_end.js
@ -1,8 +1,6 @@
-/*
- * Copyright (C) 2020 Intel Corporation
- *
- * SPDX-License-Identifier: MIT
- */
+// Copyright (C) 2020 Intel Corporation
+//
+// SPDX-License-Identifier: MIT

 /// <reference types="cypress" />

--- a/tests/cypress/integration/actions_tasks_objects/issue_1882_polygon_interpolation.js
+++ b/tests/cypress/integration/actions_tasks_objects/issue_1882_polygon_interpolation.js
@ -1,8 +1,6 @@
-/*
- * Copyright (C) 2020 Intel Corporation
- *
- * SPDX-License-Identifier: MIT
- */
+// Copyright (C) 2020 Intel Corporation
+//
+// SPDX-License-Identifier: MIT

 /// <reference types="cypress" />

--- a/tests/cypress/integration/actions_tasks_objects/issue_1886_point_coordinates_not_duplicated.js
+++ b/tests/cypress/integration/actions_tasks_objects/issue_1886_point_coordinates_not_duplicated.js
@ -1,8 +1,6 @@
-/*
- * Copyright (C) 2020 Intel Corporation
- *
- * SPDX-License-Identifier: MIT
- */
+// Copyright (C) 2020 Intel Corporation
+//
+// SPDX-License-Identifier: MIT

 /// <reference types="cypress" />

--- a/tests/cypress/integration/actions_tasks_objects/issue_1919_check_text_attr.js
+++ b/tests/cypress/integration/actions_tasks_objects/issue_1919_check_text_attr.js
@ -1,8 +1,6 @@
-/*
- * Copyright (C) 2020 Intel Corporation
- *
- * SPDX-License-Identifier: MIT
- */
+// Copyright (C) 2020 Intel Corporation
+//
+// SPDX-License-Identifier: MIT

 /// <reference types="cypress" />

--- a/tests/cypress/integration/actions_tasks_objects/issue_1944_loading_screen_switch_job.js
+++ b/tests/cypress/integration/actions_tasks_objects/issue_1944_loading_screen_switch_job.js
@ -1,8 +1,6 @@
-/*
- * Copyright (C) 2020 Intel Corporation
- *
- * SPDX-License-Identifier: MIT
- */
+// Copyright (C) 2020 Intel Corporation
+//
+// SPDX-License-Identifier: MIT

 /// <reference types="cypress" />

--- a/tests/cypress/integration/actions_tasks_objects/pr_1370_check_UI_fail_with_object_dragging_and_go_next_frame.js
+++ b/tests/cypress/integration/actions_tasks_objects/pr_1370_check_UI_fail_with_object_dragging_and_go_next_frame.js
@ -1,8 +1,6 @@
-/*
- * Copyright (C) 2020 Intel Corporation
- *
- * SPDX-License-Identifier: MIT
- */
+// Copyright (C) 2020 Intel Corporation
+//
+// SPDX-License-Identifier: MIT

 /// <reference types="cypress" />

--- a/tests/cypress/integration/actions_users/case_1_create_delete_task.js
+++ b/tests/cypress/integration/actions_users/case_1_create_delete_task.js
@ -1,8 +1,6 @@
-/*
- * Copyright (C) 2020 Intel Corporation
- *
- * SPDX-License-Identifier: MIT
- */
+// Copyright (C) 2020 Intel Corporation
+//
+// SPDX-License-Identifier: MIT

 /// <reference types="cypress" />

--- a/tests/cypress/integration/actions_users/case_4_assign_taks_job_users.js
+++ b/tests/cypress/integration/actions_users/case_4_assign_taks_job_users.js
@ -1,8 +1,6 @@
-/*
- * Copyright (C) 2020 Intel Corporation
- *
- * SPDX-License-Identifier: MIT
- */
+// Copyright (C) 2020 Intel Corporation
+//
+// SPDX-License-Identifier: MIT

 /// <reference types="cypress" />

--- a/tests/cypress/plugins/imageGenerator/addPlugin.js
+++ b/tests/cypress/plugins/imageGenerator/addPlugin.js
@ -1,8 +1,6 @@
-/*
- * Copyright (C) 2020 Intel Corporation
- *
- * SPDX-License-Identifier: MIT
- */
+// Copyright (C) 2020 Intel Corporation
+//
+// SPDX-License-Identifier: MIT

 exports.imageGenerator = imageGenerator;

@ -22,7 +20,7 @@ function imageGenerator(args) {
    const count = args.count;
    return new Promise((resolve, reject) => {
        for (let i = 1; i <= count; i++) {
-            const image = new jimp(width, height, color, function (err, image) {
+            new jimp(width, height, color, function (err, image) {
                if (err) reject(err);
                jimp.loadFont(jimp.FONT_SANS_64_BLACK, function (err, font) {
                    if (err) reject(err);
--- a/tests/cypress/plugins/imageGenerator/imageGeneratorCommand.js
+++ b/tests/cypress/plugins/imageGenerator/imageGeneratorCommand.js
@ -1,8 +1,6 @@
-/*
- * Copyright (C) 2020 Intel Corporation
- *
- * SPDX-License-Identifier: MIT
- */
+// Copyright (C) 2020 Intel Corporation
+//
+// SPDX-License-Identifier: MIT

 Cypress.Commands.add('imageGenerator', (directory, fileName, width, height, color, posX, posY, message, count) => {
    return cy.task('imageGenerator', {
--- a/tests/cypress/support/const.js
+++ b/tests/cypress/support/const.js
@ -1,8 +1,6 @@
-/*
- * Copyright (C) 2020 Intel Corporation
- *
- * SPDX-License-Identifier: MIT
- */
+// Copyright (C) 2020 Intel Corporation
+//
+// SPDX-License-Identifier: MIT

 /// <reference types="cypress" />