Increasing unit test for cluster.ts file (#1206)

Author: sudhirverma

src/openshift/cluster.ts

@@ -13,22 +13,13 @@ import { KubeConfigUtils } from '../util/kubeUtils';
 import { Filters } from "../util/filters";
 
 class CreateUrlItem implements QuickPickItem {
-
-	constructor() { }
-
 	get label(): string { return `$(plus) Provide new URL...`; }
-    get description(): string { return ''; }
-
 }
 
 class CreateUserItem implements QuickPickItem {
-
-	constructor() { }
-
 	get label(): string { return `$(plus) Add new user...`; }
-    get description(): string { return ''; }
-
 }
+
 export class Cluster extends OpenShiftItem {
     public static extensionContext: ExtensionContext;
     static async logout(): Promise<string> {
@@ -88,7 +79,7 @@ export class Cluster extends OpenShiftItem {
         if (!choice) return null;
         return Promise.resolve()
             .then(() => Cluster.odo.execute(Command.setOpenshiftContext(choice.label)))
-            .then(() => window.showInformationMessage(`Cluster context is changed to: ${choice.label}`));
+            .then(() => `Cluster context is changed to: ${choice.label}`);
     }
 
     static async getUrl(): Promise<string | null> {

test/unit/openshift/cluster.test.ts

@@ -16,7 +16,7 @@ import { CliExitData } from '../../../src/cli';
 import { TestItem } from './testOSItem';
 import { OpenShiftItem } from '../../../src/openshift/openshiftItem';
 import pq = require('proxyquire');
-import { getVscodeModule } from '../../../src/util/credentialManager';
+import { getVscodeModule, TokenStore } from '../../../src/util/credentialManager';
 
 const expect = chai.expect;
 chai.use(sinonChai);
@@ -44,6 +44,27 @@ suite('Openshift/Cluster', () => {
         stderr: error,
         stdout: 'output'
     };
+    const routeObj = `{
+        "apiVersion": "v1",
+        "items": [
+            {
+                "apiVersion": "route.openshift.io/v1",
+                "kind": "Route",
+                "spec": {
+                    "host": "console-openshift-console.apps-crc.testing",
+                    "port": {
+                        "targetPort": "https"
+                    },
+                    "wildcardPolicy": "None"
+                }
+            }
+        ],
+        "kind": "List",
+        "metadata": {
+            "resourceVersion": "",
+            "selfLink": ""
+        }
+    }`;
     const testUrl = 'https://162.165.64.43:8443';
     const testUser = 'user';
     const password = 'password';
@@ -83,13 +104,21 @@ suite('Openshift/Cluster', () => {
             expect(status).null;
         });
 
+        test('returns null if loginActions is not selected', async () => {
+            infoStub.resolves('Yes');
+            quickPickStub.onFirstCall().resolves(null);
+            const status = await Cluster.login();
+
+            expect(status).null;
+        });
+
         test('wraps incoming errors', async () => {
             quickPickStub.resolves('Credentials');
             quickPickStub.onSecondCall().resolves({description: "Current Context", label: testUrl});
             quickPickStub.onThirdCall().resolves({description: "Current Context", label: testUser});
             inputStub.resolves(password);
             commandStub.rejects(err);
-            let expectedErr;
+            let expectedErr: { message: any; };
             try {
                 await Cluster.login();
             } catch (error) {
@@ -125,6 +154,27 @@ suite('Openshift/Cluster', () => {
                 expect(result).equals(`Successfully logged in to '${testUrl}'`);
             });
 
+            test('returns null if cluster url is not provided', async () => {
+                infoStub.resolves('Yes');
+                quickPickStub.onFirstCall().resolves(null);
+                const result = await Cluster.credentialsLogin();
+                expect(result).null;
+            });
+
+            test('returns null if username is not provided', async () => {
+                infoStub.resolves('Yes');
+                quickPickStub.onSecondCall().resolves(null);
+                const result = await Cluster.credentialsLogin();
+                expect(result).null;
+            });
+
+            test("doesn't ask to save password if old and new passwords are the same", async () => {
+                infoStub.resolves('Yes');
+                sandbox.stub(TokenStore, 'getItem').resolves(password);
+                const result = await Cluster.credentialsLogin();
+                expect(result).equals(`Successfully logged in to '${testUrl}'`);
+            });
+
             test('exits if the user cancels url input box', async () => {
                 loginStub.resolves(false);
                 inputStub.onFirstCall().resolves(null);
@@ -163,7 +213,7 @@ suite('Openshift/Cluster', () => {
 
             test('errors if there is output on odo stderr', async () => {
                 execStub.resolves(errorData);
-                let expectedErr;
+                let expectedErr: { message: any; };
                 try {
                     await Cluster.credentialsLogin();
                 } catch (err) {
@@ -248,13 +298,12 @@ suite('Openshift/Cluster', () => {
 
             test('handles incoming errors the same way as credentials login', async () => {
                 execStub.rejects(err);
-                let expectedErr;
+                let expectedErr: { message: any; };
                 try {
                     await Cluster.tokenLogin();
                 } catch (error) {
                     expectedErr = error;
                 }
-                console.log(expectedErr.message);
                 expect(expectedErr.message).equals(`Failed to login to cluster '${testUrl}' with '${err.message}'!`);
             });
         });
@@ -294,7 +343,7 @@ suite('Openshift/Cluster', () => {
 
         test('handles errors from odo', async () => {
             execStub.rejects(error);
-            let expectedErr;
+            let expectedErr: any;
             try {
                 await Cluster.logout();
 
@@ -306,7 +355,7 @@ suite('Openshift/Cluster', () => {
 
         test('handles errors from odo stderr', async () => {
             execStub.resolves(errorData);
-            let expectedErr;
+            let expectedErr: any;
             try {
                 await Cluster.logout();
             } catch (err) {
@@ -322,7 +371,7 @@ suite('Openshift/Cluster', () => {
             quickPickStub.onSecondCall().resolves({description: "Current Context", label: testUrl});
             quickPickStub.onThirdCall().resolves({description: "Current Context", label: testUrl});
             inputStub.resolves(password);
-            let expectedErr;
+            let expectedErr: { message: any; };
             try {
                 await Cluster.logout();
             } catch (err) {
@@ -350,35 +399,70 @@ suite('Openshift/Cluster', () => {
         });
     });
 
+    suite('switchContext', () => {
+        const choice = {
+            label: 'minishift'
+        };
+        setup(() => {
+            execStub.onFirstCall().resolves();
+        });
+
+        test('changes cluster\'s context', async () => {
+            quickPickStub.onFirstCall().resolves(choice);
+            const result = await Cluster.switchContext();
+            expect(result).equals(`Cluster context is changed to: ${choice.label}`);
+        });
+
+        test('returns null if OpenShift context is not selected', async () => {
+            quickPickStub.onFirstCall().resolves(null);
+            const result = await Cluster.switchContext();
+            expect(result).null;
+        });
+    });
+
     suite('open console', () => {
         const openStub: sinon.SinonStub = sinon.stub();
-        let clusterMock;
+        let clusterMock: { openshiftConsole: { (arg0: TestItem): void; (): void; (): void; }; };
+        let cluster: TestItem;
+
         setup(() => {
             clusterMock = pq('../../../src/openshift/cluster', {
                 open: openStub
             }).Cluster;
+            cluster = new TestItem(null, 'http://localhost', ContextType.CLUSTER);
         });
 
         test('opens URL from cluster\'s tree item label if called from cluster\'s context menu', () => {
-            const cluster = new TestItem(null, 'http://localhost', ContextType.CLUSTER);
             clusterMock.openshiftConsole(cluster);
             openStub.calledOnceWith('http://localhost');
         });
 
         test('opens URL from first cluster label', () => {
-            const cluster = new TestItem(null, 'http://localhost', ContextType.CLUSTER);
             sandbox.stub(OdoImpl.prototype, 'getClusters').resolves([cluster]);
             clusterMock.openshiftConsole();
             openStub.calledOnceWith('http://localhost');
         });
 
         test('shows error message if node label is not URL', () => {
-            const cluster = new TestItem(null, 'localhost', ContextType.CLUSTER);
             sandbox.stub(OdoImpl.prototype, 'getClusters').resolves([cluster]);
             const errMsgStub = sandbox.stub(vscode.window, 'showErrorMessage');
             clusterMock.openshiftConsole();
             errMsgStub.calledOnceWith('localhost', undefined);
         });
 
+        test('opens cluster\'s URL from context menu', () => {
+            execStub.onFirstCall().resolves({
+                error: null,
+                stderr: error,
+                stdout: 'output'
+            });
+            execStub.onSecondCall().resolves({
+                error: null,
+                stderr: error,
+                stdout: routeObj
+            });
+            clusterMock.openshiftConsole(cluster);
+            openStub.calledOnceWith('http://localhost');
+        });
     });
 });