This is an automated email from the ASF dual-hosted git repository.
ababiichuk pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new 8c150b4 AMBARI-24280 Fix ambari-admin UI unit tests. (ababiichuk)
8c150b4 is described below
commit 8c150b4f2348b2fe371d80fd7606c6220698ccd0
Author: aBabiichuk <ababiic...@hortonworks.com>
AuthorDate: Thu Jul 12 18:55:23 2018 +0300
AMBARI-24280 Fix ambari-admin UI unit tests. (ababiichuk)
---
ambari-admin/pom.xml | 2 --
.../src/main/resources/ui/admin-web/package.json | 9 +++---
.../test/unit/controllers/AppCtrl_test.js | 17 +++++-----
.../controllers/ClusterInformationCtrl_test.js | 6 ++--
.../stackVersions/StackversionsListCtrl_test.js | 2 +-
.../test/unit/directives/comboSearch_test.js | 2 +-
.../test/unit/directives/editablelist_test.js | 37 +++++++++++++++++-----
.../test/unit/services/AddRepositoryModal_test.js | 2 +-
.../test/unit/services/PermissionSaver_test.js | 8 ++---
.../test/unit/services/UnsavedDialog__test.js | 2 +-
.../admin-web/test/unit/services/Utility_test.js | 8 ++---
11 files changed, 57 insertions(+), 38 deletions(-)
diff --git a/ambari-admin/pom.xml b/ambari-admin/pom.xml
index 281280a..22795b7 100644
--- a/ambari-admin/pom.xml
+++ b/ambari-admin/pom.xml
@@ -136,7 +136,6 @@
<commandlineArgs>${args.shell}
${basedir}${dirsep}set-ambari-version.${fileextension.shell}
${ambariVersion}</commandlineArgs>
</configuration>
</execution>
- <!-- @TODO: uncomment below execution for triggering ambar-admin UI
unit tests from maven test phase.(AMBARI-7600)
<execution>
<id>unit test</id>
<phase>test</phase>
@@ -152,7 +151,6 @@
</arguments>
</configuration>
</execution>
- -->
</executions>
</plugin>
<plugin>
diff --git a/ambari-admin/src/main/resources/ui/admin-web/package.json
b/ambari-admin/src/main/resources/ui/admin-web/package.json
index ac903c5..0048037 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/package.json
+++ b/ambari-admin/src/main/resources/ui/admin-web/package.json
@@ -19,11 +19,12 @@
"gulp-uglify": "0.2.1",
"gulp-useref": "0.4.2",
"http-server": "0.6.1",
- "karma": "0.12.16",
+ "jasmine-core": "^3.1.0",
+ "karma": "^2.0.4",
"karma-chrome-launcher": "0.1.4",
- "karma-jasmine": "0.1.5",
- "karma-ng-html2js-preprocessor": "^0.1.0",
- "karma-phantomjs-launcher": "0.1",
+ "karma-jasmine": "^1.1.2",
+ "karma-ng-html2js-preprocessor": "^1.0.0",
+ "karma-phantomjs-launcher": "^1.0.4",
"phantomjs": "^2.1.7",
"protractor": "1.0.0"
},
diff --git
a/ambari-admin/src/main/resources/ui/admin-web/test/unit/controllers/AppCtrl_test.js
b/ambari-admin/src/main/resources/ui/admin-web/test/unit/controllers/AppCtrl_test.js
index 1bbe47a..1897269 100644
---
a/ambari-admin/src/main/resources/ui/admin-web/test/unit/controllers/AppCtrl_test.js
+++
b/ambari-admin/src/main/resources/ui/admin-web/test/unit/controllers/AppCtrl_test.js
@@ -47,7 +47,7 @@ describe('#AppCtrl', function () {
inject(function (_$httpBackend_, $rootScope, $controller, _$window_,
_Cluster_, _$q_) {
clusterService = _Cluster_;
deferred = _$q_.defer();
- spyOn(clusterService, 'getStatus').andReturn(deferred.promise);
+ spyOn(clusterService, 'getStatus').and.returnValue(deferred.promise);
deferred.resolve({
Clusters: {
provisioning_state: 'INIT'
@@ -132,7 +132,7 @@ describe('#AppCtrl', function () {
describe('signout', function () {
- beforeEach(function () {
+ beforeEach(function (done) {
$httpBackend.whenGET(/\/api\/v1\/logout\?_=\d+/).respond(200,{
message: "successfully logged out"
});
@@ -145,20 +145,19 @@ describe('#AppCtrl', function () {
}
]
});
- });
-
- it('should reset window.location and ambari localstorage', function () {
scope.signOut();
+ $httpBackend.flush();
+ done();
+ });
- runs(function() {
- chai.expect($window.location.pathname).to.equal('/');
- });
+ it('should reset window.location and ambari localstorage', function (done)
{
+ chai.expect($window.location.pathname).to.equal('/');
+ done();
var data = JSON.parse(localStorage.ambari);
chai.expect(data.app.authenticated).to.equal(undefined);
chai.expect(data.app.loginName).to.equal(undefined);
chai.expect(data.app.user).to.equal(undefined);
- $httpBackend.flush();
});
});
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 2972e7f..3467720 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
@@ -32,9 +32,9 @@ describe('ClusterInformationCtrl', function() {
$scope: $scope
});
- spyOn(Cluster, 'getBlueprint').andReturn(deferred.promise);
- spyOn(Cluster, 'editName').andReturn(deferred.promise);
- spyOn(ConfirmationModal, 'show').andReturn(deferred.promise);
+ spyOn(Cluster, 'getBlueprint').and.returnValue(deferred.promise);
+ spyOn(Cluster, 'editName').and.returnValue(deferred.promise);
+ spyOn(ConfirmationModal, 'show').and.returnValue(deferred.promise);
}));
describe('#getBlueprint', function() {
diff --git
a/ambari-admin/src/main/resources/ui/admin-web/test/unit/controllers/stackVersions/StackversionsListCtrl_test.js
b/ambari-admin/src/main/resources/ui/admin-web/test/unit/controllers/stackVersions/StackversionsListCtrl_test.js
index e6f2cc1..aaddcc9 100644
---
a/ambari-admin/src/main/resources/ui/admin-web/test/unit/controllers/stackVersions/StackversionsListCtrl_test.js
+++
b/ambari-admin/src/main/resources/ui/admin-web/test/unit/controllers/stackVersions/StackversionsListCtrl_test.js
@@ -38,7 +38,7 @@ describe('#Cluster', function () {
beforeEach(inject(function(_Stack_) {
Stack = _Stack_;
- spyOn(Stack, 'allRepos').andReturn({
+ spyOn(Stack, 'allRepos').and.returnValue({
then: function (callback) {
repos = callback({
items: [{}, {}]
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 59b74be..7bc0158 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
@@ -164,7 +164,7 @@ describe('#comboSearch', function () {
describe('#updateFilters', function() {
it('filter function from parent scope should be called', function () {
var isoScope = element.isolateScope();
- spyOn(isoScope, 'extractFilters').andReturn([{}]);
+ spyOn(isoScope, 'extractFilters').and.returnValue([{}]);
isoScope.updateFilters([{}]);
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 4b94582..483fde1 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
@@ -19,17 +19,38 @@
describe('#Editablelist directive', function () {
describe('Editing', function () {
- var scope, element;
- var $location, $modal;
+ var scope, element, isoScope;
+ var $location, $modal, $httpBackend;
beforeEach(module('ambariAdminConsole'));
beforeEach(module('views/directives/editableList.html'));
- beforeEach(inject(function($rootScope, $compile, _$location_, _$modal_) {
+ beforeEach(inject(function($rootScope, $compile, _$location_, _$modal_,
_$httpBackend_) {
$location = _$location_;
$modal = _$modal_;
+ $httpBackend = _$httpBackend_;
- spyOn($modal, 'open').andReturn({
+
$httpBackend.whenGET(/\/api\/v1\/users\?Users\/user_name\.matches\(\.\*\.\*\)&from=0&page_size=20&_=\d+/).respond(200,
{
+ items: [
+ {
+ Users: {
+ user_name: 'user1'
+ }
+ },
+ {
+ Users: {
+ user_name: 'user2'
+ }
+ },
+ {
+ Users: {
+ user_name: 'user3'
+ }
+ }
+ ]
+ });
+
+ spyOn($modal, 'open').and.returnValue({
result:{
then: function() {
}
@@ -48,6 +69,10 @@ describe('#Editablelist directive', function () {
element = $compile(element)(scope);
scope.$digest();
+
+ isoScope = element.isolateScope();
+
+ $httpBackend.flush();
}));
afterEach(function() {
@@ -56,7 +81,6 @@ describe('#Editablelist directive', function () {
it('Updates permissions after save', function () {
- var isoScope = element.isolateScope();
isoScope.items.push('user3');
expect(scope.permissionsEdit.TestPermission.USER).toEqual(['user1',
'user2']);
@@ -68,17 +92,14 @@ describe('#Editablelist directive', function () {
});
it('Show dialog window if user trying to leave page without save',
function() {
- var isoScope = element.isolateScope();
isoScope.items.push('user3');
isoScope.editMode = true;
- expect(isoScope.editMode).toBe(true);
scope.$broadcast('$locationChangeStart', 'some#url');
expect($modal.open).toHaveBeenCalled();
});
it('Saves current user in editing window if user click "save"', function()
{
- var isoScope = element.isolateScope();
isoScope.editMode = true;
isoScope.input = 'user3';
isoScope.save();
diff --git
a/ambari-admin/src/main/resources/ui/admin-web/test/unit/services/AddRepositoryModal_test.js
b/ambari-admin/src/main/resources/ui/admin-web/test/unit/services/AddRepositoryModal_test.js
index 73239b5..9002b17 100644
---
a/ambari-admin/src/main/resources/ui/admin-web/test/unit/services/AddRepositoryModal_test.js
+++
b/ambari-admin/src/main/resources/ui/admin-web/test/unit/services/AddRepositoryModal_test.js
@@ -26,7 +26,7 @@ describe('AddRepositoryModal Service', function () {
AddRepositoryModal = _AddRepositoryModal_;
$modal = _$modal_;
- spyOn($modal, 'open').andReturn({
+ spyOn($modal, 'open').and.returnValue({
result: {
then: function() {
}
diff --git
a/ambari-admin/src/main/resources/ui/admin-web/test/unit/services/PermissionSaver_test.js
b/ambari-admin/src/main/resources/ui/admin-web/test/unit/services/PermissionSaver_test.js
index 6a409e4..dfe8872 100644
---
a/ambari-admin/src/main/resources/ui/admin-web/test/unit/services/PermissionSaver_test.js
+++
b/ambari-admin/src/main/resources/ui/admin-web/test/unit/services/PermissionSaver_test.js
@@ -151,12 +151,12 @@ describe('PermissionSaver Service', function () {
describe(item.title, function () {
beforeEach(function () {
- spyOn($Cluster, 'updatePrivileges').andCallFake(angular.noop);
+ spyOn($Cluster, 'updatePrivileges').and.callFake(angular.noop);
PermissionSaver.saveClusterPermissions(item.permissions, params);
});
it('updatePrivileges call', function () {
-
expect($Cluster.updatePrivileges.callCount).toEqual(item.updatePrivilegesCallCount);
+
expect($Cluster.updatePrivileges.calls.count()).toEqual(item.updatePrivilegesCallCount);
});
if (item.updatePrivilegesCallCount) {
@@ -247,12 +247,12 @@ describe('PermissionSaver Service', function () {
];
beforeEach(function () {
- spyOn($View, 'updatePrivileges').andCallFake(angular.noop);
+ spyOn($View, 'updatePrivileges').and.callFake(angular.noop);
PermissionSaver.saveViewPermissions(permissions, params);
});
it('should update privileges', function () {
- expect($View.updatePrivileges.callCount).toEqual(1);
+ expect($View.updatePrivileges.calls.count()).toEqual(1);
});
it('updatePrivileges arguments', function () {
diff --git
a/ambari-admin/src/main/resources/ui/admin-web/test/unit/services/UnsavedDialog__test.js
b/ambari-admin/src/main/resources/ui/admin-web/test/unit/services/UnsavedDialog__test.js
index dfd777a..c907638 100644
---
a/ambari-admin/src/main/resources/ui/admin-web/test/unit/services/UnsavedDialog__test.js
+++
b/ambari-admin/src/main/resources/ui/admin-web/test/unit/services/UnsavedDialog__test.js
@@ -26,7 +26,7 @@ describe('UnsavedDialog Service', function () {
UnsavedDialog = _UnsavedDialog_;
$modal = _$modal_;
- spyOn($modal, 'open').andReturn({
+ spyOn($modal, 'open').and.returnValue({
result: {
then: function() {
}
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 7f67de4..5a35516 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
@@ -37,7 +37,7 @@ describe('Utility Service', function () {
Utility = _Utility_;
httpBackend = _$httpBackend_;
deferred = _$q_.defer();
- spyOn(_Cluster_, 'getStatus').andReturn(deferred.promise);
+ spyOn(_Cluster_, 'getStatus').and.returnValue(deferred.promise);
deferred.resolve({
Clusters: {
provisioning_state: 'INIT'
@@ -81,7 +81,7 @@ describe('Utility Service', function () {
});
it('should pass the received value', function () {
- expect(mock.callback.mostRecentCall.args[0].data).toEqual(obj);
+ expect(mock.callback.calls.mostRecent().args[0].data).toEqual(obj);
});
});
@@ -144,11 +144,11 @@ describe('Utility Service', function () {
});
it('success callback', function () {
-
expect(mock.successCallback.callCount).toEqual(item.successCallbackCallCount);
+
expect(mock.successCallback.calls.count()).toEqual(item.successCallbackCallCount);
});
it('error callback', function () {
-
expect(mock.errorCallback.callCount).toEqual(item.errorCallbackCallCount);
+
expect(mock.errorCallback.calls.count()).toEqual(item.errorCallbackCallCount);
});
});
