btwedutech/hoppscotch
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity

chore: merge hoppscotch/main into release/2023.8.0

Browse Source
This commit is contained in:
Andrew Bastin
2023-08-08 12:18:01 +05:30
parent 81fbb22c51 c1efa381f0
commit 05f2d8817b
18 changed files with 445 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/hoppscotch-backend/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "hoppscotch-backend",
"version": "2023.4.7",
"version": "2023.4.8",
"description": "",
"author": "",
"private": true,

4
packages/hoppscotch-backend/src/team-environments/team-environments.service.spec.ts
View File

@@ -306,8 +306,8 @@ describe('TeamEnvironmentsService', () => {
);
mockPrisma.teamEnvironment.create.mockResolvedValueOnce({
...teamEnvironment,
id: 'newid',
...teamEnvironment,
});
const result = await teamEnvironmentsService.createDuplicateEnvironment(
@@ -337,8 +337,8 @@ describe('TeamEnvironmentsService', () => {
);
mockPrisma.teamEnvironment.create.mockResolvedValueOnce({
...teamEnvironment,
id: 'newid',
...teamEnvironment,
});
const result = await teamEnvironmentsService.createDuplicateEnvironment(