ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alejan...@apache.org
Subject git commit: AMBARI-7766. Admin View: IE10 issues when sorting a new user, and toggling visibility of View (alejandro)
Date Thu, 16 Oct 2014 20:02:24 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 0a4408162 -> f873b147a


AMBARI-7766. Admin View: IE10 issues when sorting a new user, and toggling visibility of View
(alejandro)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f873b147
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f873b147
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f873b147

Branch: refs/heads/trunk
Commit: f873b147a431c539e52a74670e0d0cc16ed307e6
Parents: 0a44081
Author: Alejandro Fernandez <afernandez@hortonworks.com>
Authored: Mon Oct 13 14:12:32 2014 -0700
Committer: Alejandro Fernandez <afernandez@hortonworks.com>
Committed: Thu Oct 16 13:01:17 2014 -0700

----------------------------------------------------------------------
 .../resources/ui/admin-web/app/scripts/app.js   | 13 ++++++
 .../ui/admin-web/test/unit/common/app_test.js   | 42 ++++++++++++++++++++
 .../unit/controllers/CreateViewInstanceCtrl.js  |  4 +-
 .../test/unit/controllers/mainCtrl_test.js      |  4 +-
 4 files changed, 59 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/f873b147/ambari-admin/src/main/resources/ui/admin-web/app/scripts/app.js
----------------------------------------------------------------------
diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/app.js b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/app.js
index e949527..f1a48f6 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/app.js
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/app.js
@@ -58,6 +58,19 @@ angular.module('ambariAdminConsole', [
     }
   }]);
 
+  $provide.factory('TimestampHttpInterceptor', [function($q) {
+    return {
+      request: function(config) {
+        if (config && config.method === 'GET' && config.url.indexOf('html')
=== -1) {
+          config.url += config.url.indexOf('?') < 0 ? '?' : '&';
+          config.url += '_=' + new Date().getTime();
+         }
+         return config || $q.when(config);
+      }
+   };
+  }]);
+  $httpProvider.interceptors.push('TimestampHttpInterceptor');
+
   $provide.decorator('ngFormDirective', ['$delegate', function($delegate) {
     var ngForm = $delegate[0], controller = ngForm.controller;
     ngForm.controller = ['$scope', '$element', '$attrs', '$injector', function(scope, element,
attrs, $injector) {

http://git-wip-us.apache.org/repos/asf/ambari/blob/f873b147/ambari-admin/src/main/resources/ui/admin-web/test/unit/common/app_test.js
----------------------------------------------------------------------
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
new file mode 100644
index 0000000..184acdf
--- /dev/null
+++ b/ambari-admin/src/main/resources/ui/admin-web/test/unit/common/app_test.js
@@ -0,0 +1,42 @@
+/**
+ * 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('#App', function () {
+
+  describe('HTTP', function () {
+    var $httpBackend, $http;
+    
+    beforeEach(module('ambariAdminConsole', function($provide){
+
+    }));
+    afterEach(function() {
+      $httpBackend.verifyNoOutstandingExpectation();
+      $httpBackend.verifyNoOutstandingRequest();
+    });
+    beforeEach(inject(function (_$httpBackend_, _$http_, $rootScope) {
+      $http = _$http_;
+      $httpBackend = _$httpBackend_;
+    }));
+
+    it('should add "_" as timestamp to all GET requests', function () {
+      $httpBackend.expectGET(/\/api\/v1\/testresource\?_=\d+/).respond(200);
+      $http.get('/api/v1/testresource');
+      $httpBackend.flush();
+    });
+  });
+});

http://git-wip-us.apache.org/repos/asf/ambari/blob/f873b147/ambari-admin/src/main/resources/ui/admin-web/test/unit/controllers/CreateViewInstanceCtrl.js
----------------------------------------------------------------------
diff --git a/ambari-admin/src/main/resources/ui/admin-web/test/unit/controllers/CreateViewInstanceCtrl.js
b/ambari-admin/src/main/resources/ui/admin-web/test/unit/controllers/CreateViewInstanceCtrl.js
index c5a7d67..69ebf66 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/test/unit/controllers/CreateViewInstanceCtrl.js
+++ b/ambari-admin/src/main/resources/ui/admin-web/test/unit/controllers/CreateViewInstanceCtrl.js
@@ -33,10 +33,10 @@ describe('#CreateViewInstanceCtrl', function () {
     spyOn(View, 'createInstance').andReturn($q.defer().promise);
 
     $httpBackend = _$httpBackend_;
-    $httpBackend.whenGET('/api/v1/views/TestView?versions/ViewVersionInfo/status=DEPLOYED').respond(200,
{
+    $httpBackend.whenGET(/\/api\/v1\/views\/TestView\?.+/).respond(200, {
       "versions": [{"ViewVersionInfo": {}}]
     });
-    $httpBackend.whenGET('/api/v1/views/TestView/versions/1.0.0').respond(200, {
+    $httpBackend.whenGET(/\/api\/v1\/views\/TestView\/versions\/1\.0\.0/).respond(200, {
       "ViewVersionInfo": {}
     });
     scope = $rootScope.$new();

http://git-wip-us.apache.org/repos/asf/ambari/blob/f873b147/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
index 23afcb6..5117a3f 100644
--- 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
@@ -35,8 +35,8 @@ describe('#Auth', function () {
       deferred.resolve('c1');
       $window = _$window_;
       $httpBackend = _$httpBackend_;
-      $httpBackend.whenGET('/api/v1/logout').respond(200,{message: "successfully logged out"});
-      $httpBackend.whenGET('/api/v1/views?fields=versions%2Finstances%2FViewInstanceInfo&versions%2FViewVersionInfo%2Fsystem=false&versions%2Finstances%2FViewInstanceInfo%2Fvisible=true')
+      $httpBackend.whenGET(/\/api\/v1\/logout\?_=\d+/).respond(200,{message: "successfully
logged out"});
+      $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": [


Mime
View raw message