Skip to content

Commit 81d1654

Browse files
committed
fix tests
1 parent cb6cee0 commit 81d1654

File tree

2 files changed

+21
-8
lines changed

2 files changed

+21
-8
lines changed

components/gitpod-db/src/utils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export function filter(
88
obj: { [key: string]: any },
99
predicate: (key: string, value: any) => boolean,
1010
): { [key: string]: any } {
11-
const result = Object.create(null);
11+
const result = Object.create({}); // typeorm doesn't like Object.create(null)
1212
for (const [key, value] of Object.entries(obj)) {
1313
if (predicate(key, value)) {
1414
result[key] = value;

components/server/src/user/env-var-service.spec.db.ts

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,11 @@ describe("EnvVarService", async () => {
142142
const resp1 = await es.listUserEnvVars(member.id, member.id);
143143
expect(resp1.length).to.equal(0);
144144

145-
await es.addUserEnvVar(member.id, member.id, { name: "var1", value: "foo", repositoryPattern: "*/*" });
145+
const added1 = await es.addUserEnvVar(member.id, member.id, {
146+
name: "var1",
147+
value: "foo",
148+
repositoryPattern: "*/*",
149+
});
146150

147151
const resp2 = await es.listUserEnvVars(member.id, member.id);
148152
expect(resp2.length).to.equal(1);
@@ -152,14 +156,23 @@ describe("EnvVarService", async () => {
152156
es.addUserEnvVar(member.id, member.id, { name: "var1", value: "foo2", repositoryPattern: "*/*" }),
153157
);
154158

155-
await es.updateUserEnvVar(member.id, member.id, { name: "var1", value: "foo2", repositoryPattern: "*/*" });
159+
await es.updateUserEnvVar(member.id, member.id, {
160+
...added1,
161+
name: "var1",
162+
value: "foo2",
163+
repositoryPattern: "*/*",
164+
});
156165

157166
const resp3 = await es.listUserEnvVars(member.id, member.id);
158167
expect(resp3.length).to.equal(1);
159168

160169
await expectError(
161-
ErrorCodes.BAD_REQUEST,
162-
es.updateUserEnvVar(member.id, member.id, { name: "var2", value: "foo2", repositoryPattern: "*/*" }),
170+
ErrorCodes.NOT_FOUND,
171+
es.updateUserEnvVar(member.id, member.id, {
172+
name: "var2",
173+
value: "foo2",
174+
repositoryPattern: "*/*",
175+
}),
163176
);
164177

165178
await expectError(ErrorCodes.NOT_FOUND, es.listUserEnvVars(stranger.id, member.id));
@@ -197,15 +210,15 @@ describe("EnvVarService", async () => {
197210
});
198211

199212
it("should let owners create, update, delete and get project env vars", async () => {
200-
await es.addProjectEnvVar(owner.id, project.id, { name: "FOO", value: "BAR", censored: false });
213+
const added1 = await es.addProjectEnvVar(owner.id, project.id, { name: "FOO", value: "BAR", censored: false });
201214
await expectError(
202215
ErrorCodes.BAD_REQUEST,
203216
es.addProjectEnvVar(owner.id, project.id, { name: "FOO", value: "BAR2", censored: false }),
204217
);
205218

206-
await es.updateProjectEnvVar(owner.id, project.id, { name: "FOO", value: "BAR2", censored: false });
219+
await es.updateProjectEnvVar(owner.id, project.id, { ...added1, name: "FOO", value: "BAR2", censored: false });
207220
await expectError(
208-
ErrorCodes.BAD_REQUEST,
221+
ErrorCodes.NOT_FOUND,
209222
es.updateProjectEnvVar(owner.id, project.id, { name: "FOO2", value: "BAR", censored: false }),
210223
);
211224

0 commit comments

Comments
 (0)