You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by nc...@apache.org on 2017/11/13 16:57:22 UTC
[05/51] [abbrv] ambari git commit: AMBARI-22352 Ambari 3.0: Implement
new design for Admin View. (atkach)
http://git-wip-us.apache.org/repos/asf/ambari/blob/b8f7369b/ambari-admin/src/main/resources/ui/admin-web/test/unit/controllers/mainCtrl_test.js
----------------------------------------------------------------------
diff --git a/ambari-admin/src/main/resources/ui/admin-web/test/unit/controllers/mainCtrl_test.js b/ambari-admin/src/main/resources/ui/admin-web/test/unit/controllers/mainCtrl_test.js
deleted file mode 100644
index f03dcb5..0000000
--- a/ambari-admin/src/main/resources/ui/admin-web/test/unit/controllers/mainCtrl_test.js
+++ /dev/null
@@ -1,215 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-describe('#MainCtrl', function () {
-
- var scope, ctrl, $httpBackend, $window, clusterService, deferred;
-
- beforeEach(function () {
- module('ambariAdminConsole', function ($provide) {
- $provide.value('$window', {
- location: {
- pathname: 'http://c6401.ambari.apache.org:8080/views/ADMIN_VIEW/2.0.0/INSTANCE/#/'
- },
- localStorage: {
- getItem: function () {
- return null;
- },
- setItem: angular.noop
- }
- });
- localStorage.ambari = JSON.stringify({
- app: {
- authenticated: true,
- loginName: 'admin',
- user: 'user'
- }
- });
- });
- inject(function (_$httpBackend_, $rootScope, $controller, _$window_, _Cluster_, _$q_) {
- clusterService = _Cluster_;
- deferred = _$q_.defer();
- spyOn(clusterService, 'getStatus').andReturn(deferred.promise);
- deferred.resolve({
- Clusters: {
- provisioning_state: 'INIT'
- }
- });
- $window = _$window_;
- $httpBackend = _$httpBackend_;
- $httpBackend.whenGET(/api\/v1\/services\/AMBARI\/components\/AMBARI_SERVER.+/).respond(200, {
- RootServiceComponents: {
- component_version: 2.2,
- properties: {
- 'user.inactivity.timeout.default': 20
- }
- }
- });
- $httpBackend.whenGET(/\/api\/v1\/views.+/).respond(200, {
- "href": "http://c6401.ambari.apache.org:8080/api/v1/views?fields=versions/instances/ViewInstanceInfo&versions/ViewVersionInfo/system=false&versions/instances/ViewInstanceInfo/visible=true",
- "items": [
- {
- "ViewInfo": {
- "view_name": "SLIDER"
- },
- "href": "http://c6401.ambari.apache.org:8080/api/v1/views/SLIDER",
- "versions": [
- {
- "ViewVersionInfo": {
- "system": false,
- "version": "1.0.0",
- "view_name": "SLIDER"
- },
- "href": "http://c6401.ambari.apache.org:8080/api/v1/views/SLIDER/versions/1.0.0",
- "instances": [
- {
- "ViewInstanceInfo": {
- "context_path": "/views/SLIDER/1.0.0/VisibleInstance",
- "description": "VisibleInstance",
- "icon64_path": null,
- "icon_path": null,
- "instance_data": {},
- "instance_name": "VisibleInstance",
- "label": "VisibleInstance",
- "properties": {
- "ambari.server.password": "123",
- "ambari.server.url": "123",
- "ambari.server.username": "123",
- "slider.user": null,
- "view.kerberos.principal": null,
- "view.kerberos.principal.keytab": null
- },
- "static": false,
- "version": "1.0.0",
- "view_name": "SLIDER",
- "visible": true
- },
- "href": "http://c6401.ambari.apache.org:8080/api/v1/views/SLIDER/versions/1.0.0/instances/VisibleInstance"
- }
- ]
- }
- ]
- }
- ]
- });
- $httpBackend.whenGET(/\/persist\/user-pref-.*/).respond(200, {
- data: {
- data: {
- addingNewRepository: true
- }
- }
- });
- scope = $rootScope.$new();
- scope.$apply();
- ctrl = $controller('MainCtrl', {
- $scope: scope
- });
- });
- });
-
- afterEach(function() {
- $httpBackend.verifyNoOutstandingExpectation();
- $httpBackend.verifyNoOutstandingRequest();
- });
-
- describe('signout', function () {
-
- beforeEach(function () {
- $httpBackend.whenGET(/\/api\/v1\/logout\?_=\d+/).respond(200,{
- message: "successfully logged out"
- });
- $httpBackend.whenGET(/\/api\/v1\/users\/admin\/authorizations.*/).respond(200, {
- items: [
- {
- AuthorizationInfo: {
- authorization_id: "AMBARI.RENAME_CLUSTER"
- }
- }
- ]
- });
- });
-
- it('should reset window.location and ambari localstorage', function () {
- scope.signOut();
-
- runs(function() {
- chai.expect($window.location.pathname).to.equal('/');
- });
-
- 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();
- });
-
- it('should get visible view instances and show them in top nav menu', function() {
- $httpBackend.flush();
-
- chai.expect(scope.viewInstances.length).to.equal(1);
- chai.expect(scope.viewInstances[0].instance_name).to.equal('VisibleInstance');
- });
- });
-
- describe('roles loading', function () {
-
- var mock = {
- callback: angular.noop
- },
- cases = [
- {
- canPersistData: true,
- items: [
- {
- AuthorizationInfo: {
- authorization_id: 'CLUSTER.MANAGE_USER_PERSISTED_DATA'
- }
- }
- ],
- title: 'user can persist data'
- },
- {
- canPersistData: false,
- items: [],
- title: 'user can\'t persist data'
- }
- ];
-
- angular.forEach(cases, function (item) {
-
- describe(item.title, function () {
-
- beforeEach(function () {
- $httpBackend.whenGET(/\/api\/v1\/users\/admin\/authorizations.*/).respond(200, {
- items: item.items
- });
- spyOn(mock, 'callback');
- scope.authDataLoad.promise.then(mock.callback);
- $httpBackend.flush();
- });
-
- it('authDataLoad should be resolved with the correct argument', function () {
- expect(mock.callback).toHaveBeenCalledWith(item.canPersistData);
- });
-
- });
-
- });
-
- });
-});
http://git-wip-us.apache.org/repos/asf/ambari/blob/b8f7369b/ambari-admin/src/main/resources/ui/admin-web/test/unit/services/Utility_test.js
----------------------------------------------------------------------
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 6b0b17f..d17747b 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
@@ -39,7 +39,7 @@ describe('Utility Service', function () {
});
scope = $rootScope.$new();
scope.$apply();
- ctrl = $controller('MainCtrl', {
+ ctrl = $controller('AppCtrl', {
$scope: scope
});
httpBackend.whenGET(/\/persist\/user-pref-.*/).respond(200, {});
@@ -54,6 +54,7 @@ describe('Utility Service', function () {
httpBackend.whenGET(/\/api\/v1\/views.+/).respond(200, {
items: []
});
+ httpBackend.whenGET("views/main.html").respond(200, {});
});
});