Skip to content

Commit b3c1a9f

Browse files
authored
Merge pull request RooCodeInc#1279 from RooVetGit/cte/decouple-integration-tests
Move integration tests into its own module
2 parents 2773208 + 1d3f538 commit b3c1a9f

19 files changed

+2551
-962
lines changed

.github/workflows/changeset-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
cache: 'npm'
3838

3939
- name: Install Dependencies
40-
run: npm run install:all
40+
run: npm run install:ci
4141

4242
# Check if there are any new changesets to process
4343
- name: Check for changesets

.github/workflows/code-qa.yml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
node-version: '18'
2121
cache: 'npm'
2222
- name: Install dependencies
23-
run: npm run install:all
23+
run: npm run install:ci
2424
- name: Compile
2525
run: npm run compile
2626
- name: Check types
@@ -39,7 +39,7 @@ jobs:
3939
node-version: '18'
4040
cache: 'npm'
4141
- name: Install dependencies
42-
run: npm run install:all
42+
run: npm run install:ci
4343
- name: Run knip checks
4444
run: npm run knip
4545

@@ -54,7 +54,7 @@ jobs:
5454
node-version: '18'
5555
cache: 'npm'
5656
- name: Install dependencies
57-
run: npm run install:all
57+
run: npm run install:ci
5858
- name: Run unit tests
5959
run: npx jest --silent
6060

@@ -69,7 +69,7 @@ jobs:
6969
node-version: '18'
7070
cache: 'npm'
7171
- name: Install dependencies
72-
run: npm run install:all
72+
run: npm run install:ci
7373
- name: Run unit tests
7474
working-directory: webview-ui
7575
run: npx jest --silent
@@ -108,9 +108,11 @@ jobs:
108108
with:
109109
node-version: '18'
110110
cache: 'npm'
111+
- name: Install dependencies
112+
run: npm run install:ci
111113
- name: Create env.integration file
114+
working-directory: e2e
112115
run: echo "OPENROUTER_API_KEY=${{ secrets.OPENROUTER_API_KEY }}" > .env.integration
113-
- name: Install dependencies
114-
run: npm run install:all
115116
- name: Run integration tests
116-
run: xvfb-run -a npm run test:integration
117+
working-directory: e2e
118+
run: xvfb-run -a npm run ci

.vscodeignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
.vscode/**
55
.vscode-test/**
66
out/**
7+
out-integration/**
8+
e2e/**
79
node_modules/**
810
src/**
911
.gitignore
@@ -25,7 +27,6 @@ demo.gif
2527
.roomodes
2628
cline_docs/**
2729
coverage/**
28-
out-integration/**
2930

3031
# Ignore all webview-ui files except the build directory (https://github.com/microsoft/vscode-webview-ui-toolkit-samples/blob/main/frameworks/hello-world-react-cra/.vscodeignore)
3132
webview-ui/src/**
File renamed without changes.

.vscode-test.mjs renamed to e2e/.vscode-test.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { defineConfig } from '@vscode/test-cli';
66

77
export default defineConfig({
88
label: 'integrationTest',
9-
files: 'out-integration/test/**/*.test.js',
9+
files: 'out/e2e/src/suite/**/*.test.js',
1010
workspaceFolder: '.',
1111
mocha: {
1212
ui: 'tdd',

src/test/VSCODE_INTEGRATION_TESTS.md renamed to e2e/VSCODE_INTEGRATION_TESTS.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ The integration tests use the `@vscode/test-electron` package to run tests in a
1111
### Directory Structure
1212

1313
```
14-
src/test/
15-
├── runTest.ts # Main test runner
14+
e2e/src/
15+
├── runTest.ts # Main test runner
1616
├── suite/
1717
│ ├── index.ts # Test suite configuration
1818
│ ├── modes.test.ts # Mode switching tests

0 commit comments

Comments
 (0)