diff --git a/src/ui-test/tests/env/set.camel.version.ts b/src/ui-test/tests/env/set.camel.version.ts index c136934fd..6e245fa9b 100644 --- a/src/ui-test/tests/env/set.camel.version.ts +++ b/src/ui-test/tests/env/set.camel.version.ts @@ -16,37 +16,16 @@ */ import { CATALOG_VERSION_ID, - RESOURCES, readUserSetting, setUserSettingsDirectly, - waitUntilExtensionIsActivated } from '../../utils/testUtils'; -import { - ActivityBar, - before, - VSBrowser, - WebDriver -} from 'vscode-uitests-tooling'; -import * as pjson from '../../../../package.json'; import { assert } from 'chai'; describe('Camel version', function () { - this.timeout(150000); + this.timeout(15000); const testDescription = process.env.CAMEL_VERSION ? `Set ${process.env.CAMEL_VERSION}` : 'Use default'; - let driver: WebDriver; - - before(async function () { - this.timeout(40000); - driver = VSBrowser.instance.driver; - await VSBrowser.instance.openResources(RESOURCES); - await VSBrowser.instance.waitForWorkbench(); - - await waitUntilExtensionIsActivated(driver, `${pjson.displayName}`); - await (await new ActivityBar().getViewControl('Explorer')).openView(); - }); - it(testDescription, async function () { // no env variable set or is empty if (process.env.CAMEL_VERSION == null || process.env.CAMEL_VERSION.length == 0) { @@ -54,7 +33,7 @@ describe('Camel version', function () { } // set version directly - await setUserSettingsDirectly(CATALOG_VERSION_ID, process.env.CAMEL_VERSION); + setUserSettingsDirectly(CATALOG_VERSION_ID, process.env.CAMEL_VERSION); // check if version was set assert.equal(readUserSetting(CATALOG_VERSION_ID), process.env.CAMEL_VERSION) diff --git a/src/ui-test/utils/testUtils.ts b/src/ui-test/utils/testUtils.ts index 65f330a8a..3e4f8e418 100644 --- a/src/ui-test/utils/testUtils.ts +++ b/src/ui-test/utils/testUtils.ts @@ -207,7 +207,7 @@ export function readUserSetting(id: string): string | null { * @param id ID of setting. * @param value Value of setting. */ -export async function setUserSettingsDirectly(id: string, value: string): Promise { +export function setUserSettingsDirectly(id: string, value: string): void { const settingsPath = path.resolve(storageFolder, 'settings', 'User', 'settings.json'); const settings = JSON.parse(fs.readFileSync(settingsPath, 'utf-8')); settings[id] = value;