Skip to content

Commit 272b0f9

Browse files
committed
fix camel settings test
1 parent 7652b38 commit 272b0f9

File tree

4 files changed

+11
-9
lines changed

4 files changed

+11
-9
lines changed

src/ui-test/resources/vscode-settings.json

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,5 @@
1414
"window.title": "${dirty}${activeEditorLong}${separator}${rootPath}${separator}${appName}",
1515
"redhat.telemetry.enabled": false,
1616
"terminal.integrated.sendKeybindingsToShell": true,
17-
"git.autoRepositoryDetection": false,
18-
"camel.debugAdapter.KubernetesRunParameters": [
19-
"--cluster-type=minikube",
20-
"--build-property=quarkus.kubernetes.image-pull-policy=Never"
21-
]
17+
"git.autoRepositoryDetection": false
2218
}

src/ui-test/tests/camel.settings.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ describe('Camel User Settings', function () {
132132

133133
it('Should add another parameter', async function () {
134134
this.timeout(20000);
135-
const arraySetting = await (await new Workbench().openSettings()).findSetting('Extra Launch Parameter', 'Camel', 'Debug Adapter') as ArraySetting;
135+
const arraySetting = await (await new Workbench().openSettings()).findSettingByID("camel.debugAdapter.ExtraLaunchParameter") as ArraySetting;
136136
const add1 = await arraySetting.add();
137137
await add1.setValue(newParameter);
138138
await add1.ok();
@@ -156,7 +156,7 @@ describe('Camel User Settings', function () {
156156

157157
it('Should remove parameter', async function () {
158158
this.timeout(15000);
159-
const arraySetting = await (await new Workbench().openSettings()).findSetting('Extra Launch Parameter', 'Camel', 'Debug Adapter') as ArraySetting;
159+
const arraySetting = await (await new Workbench().openSettings()).findSettingByID("camel.debugAdapter.ExtraLaunchParameter") as ArraySetting;
160160
const toRemove = await arraySetting.getItem(newParameter);
161161
await toRemove?.remove();
162162
await waitUntilItemNotExists(newParameter, arraySetting);

src/ui-test/tests/deploy.kubernetes.run.test.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,20 @@ import {
2727
SideBarView,
2828
VSBrowser,
2929
} from 'vscode-uitests-tooling';
30-
import { killTerminal, waitUntilTerminalHasText } from '../utils';
30+
import { killTerminal, setUserSettingsDirectly, waitUntilTerminalHasText } from '../utils';
3131
import { execSync } from 'child_process';
3232

3333
describe('Camel standalone file deployment using Camel JBang Kubernetes Run', function () {
3434
this.timeout(800_000);
3535

3636
let editorView: EditorView;
3737
const RESOURCES_PATH: string = resolve('src', 'ui-test', 'resources');
38+
const KUBERNETES_SETTINGS_ID: string = 'camel.debugAdapter.KubernetesRunParameters';
39+
40+
before(async function () {
41+
// set necessary for a local deployment to Minikube
42+
setUserSettingsDirectly(KUBERNETES_SETTINGS_ID, ["--cluster-type=minikube", "--build-property=quarkus.kubernetes.image-pull-policy=Never"]);
43+
});
3844

3945
before(async function () {
4046
await VSBrowser.instance.openResources(RESOURCES_PATH);

src/ui-test/utils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -539,7 +539,7 @@ export function readUserSetting(id: string): string | null {
539539
* @param id ID of setting.
540540
* @param value Value of setting.
541541
*/
542-
export function setUserSettingsDirectly(id: string, value: string): void {
542+
export function setUserSettingsDirectly(id: string, value: string | string[]): void {
543543
const settingsPath = path.resolve(storageFolder, 'settings', 'User', 'settings.json');
544544
const settings = JSON.parse(fs.readFileSync(settingsPath, 'utf-8'));
545545
settings[id] = value;

0 commit comments

Comments
 (0)