Move window.angular to helper

ManageIQ · Dec 4, 2018 · 3262950 · 3262950
1 parent d4ed588
commit 3262950
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/app/javascript/spec/helpers/angularHelper.js b/app/javascript/spec/helpers/angularHelper.js
@@ -0,0 +1 @@
+window.angular = require('angular');
diff --git a/app/javascript/spec/toolbar-actions/toolbar-actions-delete.spec.js b/app/javascript/spec/toolbar-actions/toolbar-actions-delete.spec.js
@@ -1,8 +1,8 @@
+require('../helpers/angularHelper.js');
 require('../helpers/addFlashHelper.js');
 require('../helpers/sprintfHelper.js');
 require('../helpers/miqAjaxButtonHelper.js');
-
-import 'angular-mocks';
+require('angular-mocks');
 import getGridChecks from '../../packs/toolbar-actions-common';
 import * as deleteActions from '../../toolbar-actions/delete';
 

diff --git a/app/javascript/spec/toolbar-actions/toolbar-actions-generic.spec.js b/app/javascript/spec/toolbar-actions/toolbar-actions-generic.spec.js
@@ -1,8 +1,8 @@
+require('../helpers/angularHelper.js');
 require('../helpers/APIHelper.js');
 require('../helpers/addFlashHelper.js');
 require('../helpers/sprintfHelper.js');
-
-import 'angular-mocks';
+require('angular-mocks');
 import getGridChecks from '../../packs/toolbar-actions-common';
 import { onCustomAction } from '../../toolbar-actions/custom-action';
 

diff --git a/config/jest.setup.js b/config/jest.setup.js
@@ -1,4 +1,3 @@
-window.angular = require('angular');
 window.Rx = require('rxjs');
 window.$ = require('jquery');
 window.__ = (x) => x;