Move activation unit test to separate suite and add as the first test

Signed-off-by: Denis Golovin [email protected]

Author: dgolovin

test/unit/activation.ts

@@ -0,0 +1,12 @@
+/*-----------------------------------------------------------------------------------------------
+ *  Copyright (c) Red Hat, Inc. All rights reserved.
+ *  Licensed under the MIT License. See LICENSE file in the project root for license information.
+ *-----------------------------------------------------------------------------------------------*/
+/* eslint-disable no-console */
+import * as vscode from 'vscode';
+
+suite('Extension activation', () => {
+    test('Extension is activated', async () => {
+        await vscode.commands.executeCommand('openshift.output');
+    });
+});

test/unit/extension.test.ts

@@ -56,8 +56,8 @@ suite('openshift toolkit Extension', () => {
     const appItem = new OpenShiftApplication(projectItem, 'app1');
     const fixtureFolder = path.join(__dirname, '..', '..', '..', 'test', 'fixtures').normalize();
     const comp2Uri = vscode.Uri.file(path.join(fixtureFolder, 'components', 'comp2'));
-    let activated;
-    setup(async () => {
+
+    setup(() => {
         sandbox = sinon.createSandbox();
         sandbox.stub(vscode.workspace, 'workspaceFolders').value([{
             uri: vscode.Uri.file(path.join(fixtureFolder, 'components', 'comp1')), index: 0, name: 'comp1'
@@ -87,10 +87,6 @@ suite('openshift toolkit Extension', () => {
             }
             return { error: undefined, stdout: '', stderr: ''};
         });
-        if (!activated) {
-            await vscode.commands.executeCommand('openshift.output');
-            activated = true;
-        }
         sandbox.stub(OdoImpl.prototype, '_getClusters').resolves([clusterItem]);
         sandbox.stub(OdoImpl.prototype, '_getProjects').resolves([projectItem]);
         sandbox.stub(OdoImpl.prototype, '_getApplications').resolves([appItem]);

test/unit/index.ts

@@ -18,6 +18,7 @@ const config: Mocha.MochaOptions = {
     timeout: 60000,
     color: true,
     // grep: 'loads components in workspace',
+    require: ['./helper.js'],
 };
 
 const mocha = new Mocha(config);
@@ -51,6 +52,9 @@ export async function run(): Promise<void> {
     const testFinder = createTestFinder(testsRoot);
     const testFiles:string[] = [];
 
+    // add activation test first
+    testFiles.push(...await testFinder('activation.js'));
+    // everything else after
     testFiles.push(...await testFinder('**/extension.test.js'));
     testFiles.push(...await testFinder('**/workspace.test.js'));
     testFiles.push(...await testFinder('k8s/*.test.js'));