ci: update env name

Author: mato533

.github/workflows/ci-lint.yml

@@ -11,12 +11,7 @@ env:
 jobs:
   lint:
     name: Lint
-    strategy:
-      fail-fast: false
-      matrix:
-        node-version: ['20']
-        os: ['ubuntu-latest']
-    runs-on: ${{ matrix.os }}
+    runs-on: 'ubuntu-latest'
     steps:
       - name: 👷 Checkout
         uses: actions/[email protected]
@@ -26,7 +21,7 @@ jobs:
       - name: 🛠️ Setup workspace
         uses: ./.github/workflows/actions/setup-workspace
         with:
-          node-version: ${{ matrix.node-version }}
+          node-version: '20'
 
       - name: 📃 Run the lint
         run: pnpm run style:fix

e2e/package.json

@@ -12,10 +12,10 @@
   "scripts": {
     "test:e2e": "run-s test:e2e:basic test:e2e:workspace",
     "test:e2e:basic": "run-s test:e2e:basic:*",
-    "test:e2e:basic:mocha": "cross-env VSCODE_WDIO_E2E_FRAMEWORK=mocha xvfb-maybe pnpm run wdio",
-    "test:e2e:basic:jasmine": "cross-env VSCODE_WDIO_E2E_FRAMEWORK=jasmine xvfb-maybe pnpm run wdio",
-    "test:e2e:basic:cucumber": "cross-env VSCODE_WDIO_E2E_FRAMEWORK=cucumber xvfb-maybe pnpm run wdio",
-    "test:e2e:workspace": "cross-env VSCODE_WDIO_E2E_FRAMEWORK=workspace xvfb-maybe pnpm run wdio",
+    "test:e2e:basic:mocha": "cross-env VSCODE_WDIO_E2E_SCENARIO=mocha xvfb-maybe pnpm run wdio",
+    "test:e2e:basic:jasmine": "cross-env VSCODE_WDIO_E2E_SCENARIO=jasmine xvfb-maybe pnpm run wdio",
+    "test:e2e:basic:cucumber": "cross-env VSCODE_WDIO_E2E_SCENARIO=cucumber xvfb-maybe pnpm run wdio",
+    "test:e2e:workspace": "cross-env VSCODE_WDIO_E2E_SCENARIO=workspace xvfb-maybe pnpm run wdio",
     "test:smoke": "run-s test:smoke:*",
     "test:smoke:update-config": "xvfb-maybe wdio run ./wdioSmoke.conf.ts",
     "wdio": "wdio run ./wdio.conf.ts"

e2e/tests/basic.spec.ts

@@ -15,7 +15,7 @@ import {
 
 import type { SideBarView, ViewControl, Workbench } from 'wdio-vscode-service'
 
-const targetFramework = (process.env.VSCODE_WDIO_E2E_FRAMEWORK || 'mocha') as 'mocha' | 'jasmine'
+const targetFramework = (process.env.VSCODE_WDIO_E2E_SCENARIO || 'mocha') as 'mocha' | 'jasmine'
 
 const expected = createExpected(targetFramework)
 

e2e/tests/basicCucumber.spec.ts

@@ -15,7 +15,7 @@ import {
 
 import type { SideBarView, ViewControl, Workbench } from 'wdio-vscode-service'
 
-const targetFramework = process.env.VSCODE_WDIO_E2E_FRAMEWORK || 'mocha'
+const targetFramework = process.env.VSCODE_WDIO_E2E_SCENARIO || 'mocha'
 
 const expected = createCucumberExpected()
 

e2e/wdio.conf.ts

@@ -9,7 +9,7 @@ import type { Frameworks } from '@wdio/types'
 type TestTargets = 'workspace' | 'mocha' | 'jasmine' | 'cucumber'
 
 const __dirname = path.dirname(url.fileURLToPath(import.meta.url))
-const target = (process.env.VSCODE_WDIO_E2E_FRAMEWORK || 'mocha') as TestTargets
+const target = (process.env.VSCODE_WDIO_E2E_SCENARIO || 'mocha') as TestTargets
 
 const minimumVersion = minVersion(pkg.engines.vscode)?.version || 'stable'
 
@@ -33,7 +33,15 @@ function defineSpecs(target: TestTargets) {
 const specs = defineSpecs(target)
 let screenshotCount = 0
 
-export function createBaseConfig(workspacePath: string): WebdriverIO.Config {
+export function createBaseConfig(workspacePath: string, userSettings = {}): WebdriverIO.Config {
+    const resolvedUserSettings = Object.assign(
+        {},
+        {
+            'webdriverio.logLevel': 'trace',
+        },
+        userSettings
+    )
+
     return {
         runner: 'local',
         tsConfigPath: './tsconfig.json',
@@ -47,9 +55,7 @@ export function createBaseConfig(workspacePath: string): WebdriverIO.Config {
                     // points to directory where extension package.json is located
                     extensionPath: path.resolve('../packages/vscode-webdriverio'),
                     // optional VS Code settings
-                    userSettings: {
-                        'webdriverio.logLevel': 'trace',
-                    },
+                    userSettings: resolvedUserSettings,
                     workspacePath: path.resolve(workspacePath),
                 },
                 'wdio:enforceWebDriverClassic': true,