Re-enable project auth cache, add UI integration test

fabianofranz · Feb 26, 2015 · a93e065 · a93e065
1 parent 56c9dc5
commit a93e065
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/assets/app/views/projects.html b/assets/app/views/projects.html
@@ -2,7 +2,7 @@
   <div>
     <h1 style="margin-top: 10px;">Projects</h1>
     <div class="tile tile-click" ng-click="tileClickHandler($event)" style="margin-bottom: 10px;" ng-repeat="project in projects">
-      <h2><a class="tile-target" href="/project/{{project.metadata.name}}">{{project.displayName || project.metadata.name}}</a></h2>
+      <h2 class="project"><a class="tile-target" href="/project/{{project.metadata.name}}">{{project.displayName || project.metadata.name}}</a></h2>
       <div class="muted" style="margin-top: -5px;" ng-if="project | annotation : 'description'">{{project | annotation : 'description'}}</div>
     </div>
     <div ng-if="emptyMessage && (projects | hashSize) == 0">{{emptyMessage}}</div>

diff --git a/assets/test/e2e/test.js b/assets/test/e2e/test.js
@@ -74,6 +74,12 @@ describe('', function() {
       commonTeardown();
     });
 
+    it('should be able to list the test project', function() {
+      browser.get('/');
+
+      expect(element(by.cssContainingText("h2.project","test")).isPresent()).toBe(true);
+    });
+
     it('should have access to the test project', function() {
       browser.get('/project/test');
 

diff --git a/pkg/assets/bindata.go b/pkg/assets/bindata.go
@@ -56300,7 +56300,7 @@ var _views_projects_html = []byte(`<div class="container">
 <div>
 <h1 style="margin-top: 10px">Projects</h1>
 <div class="tile tile-click" ng-click="tileClickHandler($event)" style="margin-bottom: 10px" ng-repeat="project in projects">
-<h2><a class="tile-target" href="/project/{{project.metadata.name}}">{{project.displayName || project.metadata.name}}</a></h2>
+<h2 class="project"><a class="tile-target" href="/project/{{project.metadata.name}}">{{project.displayName || project.metadata.name}}</a></h2>
 <div class="muted" style="margin-top: -5px" ng-if="project | annotation : 'description'">{{project | annotation : 'description'}}</div>
 </div>
 <div ng-if="emptyMessage && (projects | hashSize) == 0">{{emptyMessage}}</div>

diff --git a/pkg/cmd/server/start.go b/pkg/cmd/server/start.go
@@ -101,6 +101,7 @@ func (cfg Config) startMaster() error {
 	openshiftConfig.RunDeploymentConfigController()
 	openshiftConfig.RunDeploymentConfigChangeController()
 	openshiftConfig.RunDeploymentImageChangeTriggerController()
+	openshiftConfig.RunProjectAuthorizationCache()
 
 	return nil
 }