[ambari] 02/02: AMBARI-25066 Update AngularJS version to 1.7.5 due to known vulnerabilities(tests)

[atkach]

This is an automated email from the ASF dual-hosted git repository.

atkach pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git

commit d069e15a5f6b76362e7c2657617c9c2270e69a9a
Author: Andrii Tkach <atk...@apache.org>
AuthorDate: Mon Dec 24 15:17:12 2018 +0200

    AMBARI-25066 Update AngularJS version to 1.7.5 due to known 
vulnerabilities(tests)
---
 .../src/main/resources/ui/admin-web/test/unit/common/app_test.js      | 4 ++--
 .../ui/admin-web/test/unit/controllers/ClusterInformationCtrl_test.js | 3 ++-
 .../resources/ui/admin-web/test/unit/directives/comboSearch_test.js   | 4 ++--
 .../resources/ui/admin-web/test/unit/directives/editablelist_test.js  | 2 +-
 .../main/resources/ui/admin-web/test/unit/services/Utility_test.js    | 3 ++-
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git 
a/ambari-admin/src/main/resources/ui/admin-web/test/unit/common/app_test.js 
b/ambari-admin/src/main/resources/ui/admin-web/test/unit/common/app_test.js
index 184acdf..a5382fd 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/test/unit/common/app_test.js
+++ b/ambari-admin/src/main/resources/ui/admin-web/test/unit/common/app_test.js
@@ -21,8 +21,8 @@ describe('#App', function () {
   describe('HTTP', function () {
     var $httpBackend, $http;
     
-    beforeEach(module('ambariAdminConsole', function($provide){
-
+    beforeEach(module('ambariAdminConsole', function($provide, $routeProvider){
+      $routeProvider.otherwise(function(){return false;});
     }));
     afterEach(function() {
       $httpBackend.verifyNoOutstandingExpectation();
diff --git 
a/ambari-admin/src/main/resources/ui/admin-web/test/unit/controllers/ClusterInformationCtrl_test.js
 
b/ambari-admin/src/main/resources/ui/admin-web/test/unit/controllers/ClusterInformationCtrl_test.js
index 3467720..649dadf 100644
--- 
a/ambari-admin/src/main/resources/ui/admin-web/test/unit/controllers/ClusterInformationCtrl_test.js
+++ 
b/ambari-admin/src/main/resources/ui/admin-web/test/unit/controllers/ClusterInformationCtrl_test.js
@@ -21,8 +21,9 @@ describe('ClusterInformationCtrl', function() {
 
   var ctrl, $scope, Cluster, deferred, ConfirmationModal;
 
-  beforeEach(inject(function($controller, $rootScope, _Cluster_, _$q_, 
_ConfirmationModal_){
+  beforeEach(inject(function($controller, $rootScope, _Cluster_, _$q_, 
_ConfirmationModal_, _$httpBackend_){
     // The injector unwraps the underscores (_) from around the parameter 
names when matching
+    
_$httpBackend_.expectGET('views/clusters/clusterInformation.html').respond(200);
     Cluster = _Cluster_;
     ConfirmationModal = _ConfirmationModal_;
     deferred = _$q_.defer();
diff --git 
a/ambari-admin/src/main/resources/ui/admin-web/test/unit/directives/comboSearch_test.js
 
b/ambari-admin/src/main/resources/ui/admin-web/test/unit/directives/comboSearch_test.js
index 7bc0158..efadec6 100644
--- 
a/ambari-admin/src/main/resources/ui/admin-web/test/unit/directives/comboSearch_test.js
+++ 
b/ambari-admin/src/main/resources/ui/admin-web/test/unit/directives/comboSearch_test.js
@@ -22,9 +22,9 @@ describe('#comboSearch', function () {
   beforeEach(module('ambariAdminConsole'));
   beforeEach(module('views/directives/comboSearch.html'));
 
-  beforeEach(inject(function($rootScope, $compile) {
+  beforeEach(inject(function($rootScope, $compile, _$httpBackend_) {
     scope = $rootScope.$new();
-
+    
_$httpBackend_.expectGET('views/clusters/clusterInformation.html').respond(200);
     var preCompiledElement = '<combo-search suggestions="filters" 
filter-change="filterItems" placeholder="Search"></combo-search>';
 
     scope.filters = [
diff --git 
a/ambari-admin/src/main/resources/ui/admin-web/test/unit/directives/editablelist_test.js
 
b/ambari-admin/src/main/resources/ui/admin-web/test/unit/directives/editablelist_test.js
index 483fde1..e556300 100644
--- 
a/ambari-admin/src/main/resources/ui/admin-web/test/unit/directives/editablelist_test.js
+++ 
b/ambari-admin/src/main/resources/ui/admin-web/test/unit/directives/editablelist_test.js
@@ -29,7 +29,7 @@ describe('#Editablelist directive', function () {
       $location = _$location_;
       $modal = _$modal_;
       $httpBackend = _$httpBackend_;
-
+      
$httpBackend.expectGET('views/clusters/clusterInformation.html').respond(200);
       
$httpBackend.whenGET(/\/api\/v1\/users\?Users\/user_name\.matches\(\.\*\.\*\)&from=0&page_size=20&_=\d+/).respond(200,
 {
         items: [
           {
diff --git 
a/ambari-admin/src/main/resources/ui/admin-web/test/unit/services/Utility_test.js
 
b/ambari-admin/src/main/resources/ui/admin-web/test/unit/services/Utility_test.js
index 5a35516..f1403fe 100644
--- 
a/ambari-admin/src/main/resources/ui/admin-web/test/unit/services/Utility_test.js
+++ 
b/ambari-admin/src/main/resources/ui/admin-web/test/unit/services/Utility_test.js
@@ -24,7 +24,7 @@ describe('Utility Service', function () {
     };
 
   beforeEach(function () {
-    module('ambariAdminConsole', function ($provide) {
+    module('ambariAdminConsole', function ($provide, $routeProvider) {
       $provide.value('$window', {
         localStorage: {
           getItem: function() {return '{}';},
@@ -32,6 +32,7 @@ describe('Utility Service', function () {
         },
         location: {}
       });
+      $routeProvider.otherwise(function(){return false;});
     });
     inject(function (_Utility_, _$httpBackend_, $rootScope, $controller, 
_Cluster_, _$q_) {
       Utility = _Utility_;