fix tests

Signed-off-by: Oleksii Kurinnyi <[email protected]>
eclipse-che · Sep 4, 2019 · b5b70fc · b5b70fc
1 parent 2ef0834
commit b5b70fc
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 15 deletions.
diff --git a/dashboard/src/app/navbar/recent-workspaces/recent-workspaces.controller.spec.ts b/dashboard/src/app/navbar/recent-workspaces/recent-workspaces.controller.spec.ts
@@ -15,6 +15,7 @@ import {CheAPIBuilder} from '../../../components/api/builder/che-api-builder.fac
 import {CheHttpBackend} from '../../../components/api/test/che-http-backend';
 import IdeSvc from '../../ide/ide.service';
 import {CheBranding} from '../../../components/branding/che-branding.factory';
+import { NavbarRecentWorkspacesController } from './recent-workspaces.controller';
 
 /**
  * Test of the NavbarRecentWorkspacesController
@@ -23,7 +24,7 @@ describe('NavbarRecentWorkspacesController', () => {
   /**
    * NavbarRecentWorkspacesController
    */
-  let navbarRecentWorkspacesController;
+  let navbarRecentWorkspacesController: NavbarRecentWorkspacesController;
 
   /**
    * API builder
@@ -82,8 +83,7 @@ describe('NavbarRecentWorkspacesController', () => {
     // setup backend
     cheBackend.setup();
 
-    // fetch workspaces
-    cheWorkspace.fetchWorkspaces();
+    navbarRecentWorkspacesController.$onInit();
 
     // flush command
     httpBackend.flush();

diff --git a/dashboard/src/app/workspaces/workspace-details/workspace-details.directive.spec.ts b/dashboard/src/app/workspaces/workspace-details/workspace-details.directive.spec.ts
@@ -161,6 +161,17 @@ describe(`WorkspaceDetailsController >`, () => {
           }
           subscriptions[workspaceId].push(action);
         };
+        this.unsubscribeOnWorkspaceChange = (workspaceId: string, action: Function): void => {
+          const actions = subscriptions[workspaceId];
+          if (actions === undefined) {
+            return;
+          }
+          const index = actions.indexOf(action);
+          if (index === -1) {
+            return;
+          }
+          actions.splice(index, 1);
+        };
         this.getWorkspaceById = (workspaceId: string): che.IWorkspace => {
           return workspace;
         };
@@ -286,7 +297,7 @@ describe(`WorkspaceDetailsController >`, () => {
   describe(`overflow panel >`, () => {
 
     function getOverlayPanelEl(): ng.IAugmentedJQuery {
-      return compiledDirective.find('.che-edit-mode-overlay');
+      return compiledDirective.find('che-edit-mode-overlay');
     }
     function getSaveButton(): ng.IAugmentedJQuery {
       return compiledDirective.find('.save-button button');
@@ -300,7 +311,7 @@ describe(`WorkspaceDetailsController >`, () => {
 
     it(`should be hidden initially >`, () => {
       compileDirective();
-      expect(getOverlayPanelEl().length).toEqual(0);
+      expect(getOverlayPanelEl().children().length).toEqual(0);
     });
 
     describe(`when config is changed >`, () => {
@@ -343,7 +354,7 @@ describe(`WorkspaceDetailsController >`, () => {
             });
 
             it(`the overlay panel should be hidden >`, () => {
-              expect(getOverlayPanelEl().length).toEqual(0);
+              expect(getOverlayPanelEl().children().length).toEqual(0);
             });
 
           });
@@ -360,7 +371,7 @@ describe(`WorkspaceDetailsController >`, () => {
             });
 
             it(`the overlay panel should be hidden >`, () => {
-              expect(getOverlayPanelEl().length).toEqual(0);
+              expect(getOverlayPanelEl().children().length).toEqual(0);
             });
 
           });
@@ -403,7 +414,7 @@ describe(`WorkspaceDetailsController >`, () => {
             });
 
             it(`the overlay panel should be hidden >`, () => {
-              expect(getOverlayPanelEl().length).toEqual(0);
+              expect(getOverlayPanelEl().children().length).toEqual(0);
             });
 
           });
@@ -446,7 +457,7 @@ describe(`WorkspaceDetailsController >`, () => {
             });
 
             it(`the overlay panel should be hidden >`, () => {
-              expect(getOverlayPanelEl().length).toEqual(0);
+              expect(getOverlayPanelEl().children().length).toEqual(0);
             });
 
           });
@@ -497,7 +508,7 @@ describe(`WorkspaceDetailsController >`, () => {
             });
 
             it(`the overlay panel should be hidden >`, () => {
-              expect(getOverlayPanelEl().length).toEqual(0);
+              expect(getOverlayPanelEl().children().length).toEqual(0);
             });
 
           });
@@ -514,7 +525,7 @@ describe(`WorkspaceDetailsController >`, () => {
             });
 
             it(`the overlay panel should be hidden >`, () => {
-              expect(getOverlayPanelEl().length).toEqual(0);
+              expect(getOverlayPanelEl().children().length).toEqual(0);
             });
 
           });
@@ -554,7 +565,7 @@ describe(`WorkspaceDetailsController >`, () => {
             });
 
             it(`the overlay panel should be hidden >`, () => {
-              expect(getOverlayPanelEl().length).toEqual(0);
+              expect(getOverlayPanelEl().children().length).toEqual(0);
             });
 
           });
@@ -571,7 +582,7 @@ describe(`WorkspaceDetailsController >`, () => {
             });
 
             it(`the overlay panel should be hidden >`, () => {
-              expect(getOverlayPanelEl().length).toEqual(0);
+              expect(getOverlayPanelEl().children().length).toEqual(0);
             });
 
           });
@@ -589,7 +600,7 @@ describe(`WorkspaceDetailsController >`, () => {
             .and
             .callFake(() => {
               return false;
-            }); 
+            });
           controller.workspacesService.isSupportedRecipeType = jasmine.createSpy('workspaceDetailsController.isSupportedRecipeType')
             .and
             .callFake(() => {
@@ -627,7 +638,7 @@ describe(`WorkspaceDetailsController >`, () => {
           });
 
           it(`the overlay panel should be hidden >`, () => {
-            expect(getOverlayPanelEl().length).toEqual(0);
+            expect(getOverlayPanelEl().children().length).toEqual(0);
           });
 
         });

diff --git a/dashboard/src/components/api/che-team.factory.ts b/dashboard/src/components/api/che-team.factory.ts
@@ -108,6 +108,8 @@ export class CheTeam implements che.api.ICheTeam {
     cheTeamEventsManager.addNewTeamHandler(() => {
       this.fetchTeams();
     });
+
+    this.fetchTeams(); // this resolves `cheNamespaceRegistry.fetchNamespaces()` as well
   }
 
   /**

diff --git a/dashboard/src/components/api/test/che-http-backend.ts b/dashboard/src/components/api/test/che-http-backend.ts
@@ -93,6 +93,10 @@ export class CheHttpBackend {
    * Setup all data that should be retrieved on calls
    */
   setup(): void {
+    this.$httpBackend.when('GET', '/api/oauth/').respond(200, []);
+    this.$httpBackend.when('GET', 'https://api.github.com/user/orgs').respond(200, {});
+    this.$httpBackend.when('GET', 'https://api.github.com/user').respond(200, {});
+
     this.$httpBackend.when('OPTIONS', '/api/').respond({});
     this.$httpBackend.when('GET', '/api/').respond(200, {rootResources: []});
 

diff --git a/dashboard/src/components/validator/unique-factory-name-validator.directive.ts b/dashboard/src/components/validator/unique-factory-name-validator.directive.ts
@@ -86,6 +86,8 @@ export class UniqueFactoryNameValidator implements ng.IDirective {
             } else {
               deferred.resolve(true);
             }
+          }).catch(() => {
+            // this fixes unit test for the directive
           });
         }
-Original file line number
+Diff line change
@@ Expand Up / @@ -108,6 +108,8 @@ export class CheTeam implements che.api.ICheTeam { @@
         cheTeamEventsManager.addNewTeamHandler(() => {
           this.fetchTeams();
         });
+        this.fetchTeams(); // this resolves `cheNamespaceRegistry.fetchNamespaces()` as well
       }
       /**
@@ Expand Down @@