Skip to content

Commit ade750e

Browse files
committed
fix
1 parent ce39fac commit ade750e

File tree

1 file changed

+19
-8
lines changed

1 file changed

+19
-8
lines changed

libs/backend-api7/e2e/support/global-setup.ts

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,11 @@ const setupAPI7 = async () => {
6060
});
6161
};
6262

63-
const initUser = async (username = 'admin', password = 'admin') => {
63+
const initUser = async (
64+
username = 'admin',
65+
password = 'admin',
66+
fisrtTime = true,
67+
) => {
6468
console.log('Log in');
6569
await httpClient.post(`/api/login`, {
6670
username: username,
@@ -70,9 +74,10 @@ const initUser = async (username = 'admin', password = 'admin') => {
7074
// If the version is lower than 3.2.15, the license should be activated first.
7175
if (
7276
semver.lt(
73-
'3.2.15',
7477
semver.coerce(process.env.BACKEND_API7_VERSION) ?? '0.0.0',
75-
)
78+
'3.2.15',
79+
) &&
80+
fisrtTime
7681
)
7782
await activateAPI7();
7883

@@ -95,9 +100,10 @@ const initUser = async (username = 'admin', password = 'admin') => {
95100
// be activated after changing the password.
96101
if (
97102
semver.gte(
98-
'3.2.15',
99103
semver.coerce(process.env.BACKEND_API7_VERSION) ?? '0.0.0',
100-
)
104+
'3.2.15',
105+
) &&
106+
fisrtTime
101107
)
102108
await activateAPI7();
103109
};
@@ -126,7 +132,7 @@ const generateToken = async () => {
126132
httpClient.sessionToken = '';
127133

128134
console.log('Log in to test user');
129-
await initUser('test', 'test');
135+
await initUser('test', 'test', false);
130136

131137
console.log('Generate token');
132138
const resp = await httpClient.post<{ value: { token: string } }>(
@@ -143,8 +149,13 @@ const generateToken = async () => {
143149

144150
export default async () => {
145151
if (process.env['SKIP_API7_SETUP'] !== 'true') await setupAPI7();
146-
await initUser();
147-
await generateToken();
152+
try {
153+
await initUser();
154+
await generateToken();
155+
} catch (err) {
156+
console.log(err);
157+
throw err;
158+
}
148159

149160
process.env.SERVER = 'https://localhost:7443';
150161
};

0 commit comments

Comments
 (0)