fix open browser call if url creation is halted/cancelled (#702)

Author: mohitsuman

src/openshift/component.ts

@@ -175,22 +175,26 @@ export class Component extends OpenShiftItem {
         if (!component) return null;
         const app: OpenShiftObject = component.getParent();
         const namespace: string = app.getParent().getName();
-        const routeCheck = await Component.odo.execute(Command.getRouteHostName(namespace, component.getName()));
-        let value = 'Create';
-        if (routeCheck.stdout.trim() === '') {
-            value = await vscode.window.showInformationMessage(`No URL for Component '${component.getName()}' in Application '${app.getName()}'. Do you want to create a URL and open it?`, 'Create', 'Cancel');
+        if (await Component.checkRouteCreated(namespace, component)) {
+            const value = await vscode.window.showInformationMessage(`No URL for Component '${component.getName()}' in Application '${app.getName()}'. Do you want to create a URL and open it?`, 'Create', 'Cancel');
             if (value === 'Create') {
                 await vscode.commands.executeCommand('openshift.url.create', component);
             }
         }
-        if (value === 'Create') {
+
+        if (! await Component.checkRouteCreated(namespace, component)) {
             const hostName = await Component.odo.execute(Command.getRouteHostName(namespace, component.getName()));
             const checkTls = await Component.odo.execute(Command.getRouteTls(namespace, component.getName()));
             const tls = checkTls.stdout.trim().length === 0  ? "http://" : "https://";
             return opn(`${tls}${hostName.stdout}`);
         }
     }
 
+    static async checkRouteCreated(namespace: string, component: OpenShiftObject): Promise<boolean> {
+        const routeCheck = await Component.odo.execute(Command.getRouteHostName(namespace, component.getName()));
+        return routeCheck.stdout.trim() === '';
+    }
+
     static async createFromLocal(context: OpenShiftObject): Promise<string> {
         let application: OpenShiftObject = context;
         if (!application) application = await Component.getOpenshiftData(context);

test/openshift/component.test.ts

@@ -741,19 +741,21 @@ suite('OpenShift/Component', () => {
         });
 
         test('gets url for component and opens it in browser', async () => {
-            execStub.onFirstCall().resolves({error: undefined, stdout: 'url', stderr: ''});
-            execStub.onSecondCall().resolves({error: undefined, stdout: 'url', stderr: ''});
-            execStub.onThirdCall().resolves({error: undefined, stdout: 'tlsEnabled', stderr: ''});
+            execStub.onCall(0).resolves({error: undefined, stdout: 'url', stderr: ''});
+            execStub.onCall(1).resolves({error: undefined, stdout: 'url', stderr: ''});
+            execStub.onCall(2).resolves({error: undefined, stdout: 'url', stderr: ''});
+            execStub.onCall(3).resolves({error: undefined, stdout: 'tlsEnabled', stderr: ''});
             await Component.openUrl(null);
             expect(opnStub).calledOnceWith('https://url');
         });
 
-        test('request to create url for component if it does not exist, creates it if confirmed by user and opens in in browser.' , async () => {
+        test('request to create url for component if it does not exist, creates the route if confirmed by user and opens it in browser.' , async () => {
             sandbox.stub(vscode.window, 'showInformationMessage').resolves('Create');
             sandbox.stub(vscode.commands, 'executeCommand').resolves();
-            execStub.onFirstCall().resolves({error: undefined, stdout: '', stderr: ''});
-            execStub.onSecondCall().resolves({error: undefined, stdout: 'url', stderr: ''});
-            execStub.onThirdCall().resolves({error: undefined, stdout: 'tlsEnabled', stderr: ''});
+            execStub.onCall(0).resolves({error: undefined, stdout: '', stderr: ''});
+            execStub.onCall(1).resolves({error: undefined, stdout: 'url', stderr: ''});
+            execStub.onCall(2).resolves({error: undefined, stdout: 'url', stderr: ''});
+            execStub.onCall(3).resolves({error: undefined, stdout: 'tlsEnabled', stderr: ''});
             await Component.openUrl(null);
             expect(opnStub).calledOnceWith('https://url');
         });