Skip to content

Commit be7647d

Browse files
committed
fix 8
1 parent b28a142 commit be7647d

File tree

5 files changed

+5
-15
lines changed

5 files changed

+5
-15
lines changed

.circleci/e2e/test.app.sh

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
#!/bin/bash
22
set -e
33

4-
# Moved to config.yml
5-
# yarn --cwd tests/e2e install
6-
74
# Create folder before tests run to prevent permissions issues
85
mkdir -p tests/e2e/remote
96

@@ -12,11 +9,6 @@ docker-compose -f tests/e2e/rte.docker-compose.yml build
129
docker-compose -f tests/e2e/rte.docker-compose.yml up --force-recreate -d -V
1310
./tests/e2e/wait-for-redis.sh localhost 12000
1411

15-
# Run tests with the split files
16-
if [ -z "$TEST_FILES" ]; then
17-
echo "No TEST_FILES specified, running all tests..."
18-
RI_SOCKETS_CORS=true yarn --cwd tests/e2e dotenv -e .ci.env yarn --cwd tests/e2e test:ci
19-
else
20-
echo "Running split tests: $TEST_FILES"
21-
RI_SOCKETS_CORS=true yarn --cwd tests/e2e dotenv -e .ci.env yarn --cwd tests/e2e test:ci --testFiles="$TEST_FILES"
22-
fi
12+
# Run tests
13+
RI_SOCKETS_CORS=true \
14+
yarn --cwd tests/e2e dotenv -e .ci.env yarn --cwd tests/e2e test:ci

tests/e2e/.ci.env

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
COMMON_URL=http://localhost:5541
21
API_URL=http://127.0.0.1:5541/api
32
OSS_SENTINEL_PASSWORD=password
43
RI_APP_FOLDER_NAME=.redis-for-vscode-stage

tests/e2e/settings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
"workbench.editor.enablePreview": true,
44
"git.autoRepositoryDetection": false,
55
"terminal.integrated.sendKeybindingsToShell": true
6-
}
6+
}

tests/e2e/src/helpers/Conf.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import { Chance } from 'chance'
55
const chance = new Chance()
66

77
export class Config {
8-
static commonUrl = process.env.COMMON_URL || 'http://localhost:8080'
98
static apiUrl = process.env.API_URL || 'http://127.0.0.1:5541/api'
109
static vscodeVersion = process.env.VSCODE_VERSION || '1.87.2'
1110
static extensionName =

tests/e2e/src/vscode.runner.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ import { VScodeScripts } from './helpers/scripts/vscodeScripts'
5858

5959
// Run tests
6060
await exTester.runTests(
61-
[
61+
process.env.TEST_FILES || [
6262
path.join(__dirname, '..', 'dist', 'tests', 'setup.js'),
6363
path.join(__dirname, '..', 'dist', 'tests', '**', '*.js'),
6464
],

0 commit comments

Comments
 (0)