Skip to content

Commit 6538bbf

Browse files
author
georgiy.rusanov
committed
chore: try to fix test on ci
1 parent 913e879 commit 6538bbf

File tree

5 files changed

+312
-349
lines changed

5 files changed

+312
-349
lines changed

‎test/functions.test.ts

Lines changed: 85 additions & 97 deletions
Original file line numberDiff line numberDiff line change
@@ -61,32 +61,29 @@ describe('server/routes/functions', () => {
6161
},
6262
})
6363
expect(response.statusCode).toBe(200)
64-
expect(response.json()).toMatchInlineSnapshot(`
65-
{
66-
"args": [],
67-
"argument_types": "",
68-
"behavior": "VOLATILE",
69-
"complete_statement": "CREATE OR REPLACE FUNCTION public.test_function()
70-
RETURNS integer
71-
LANGUAGE plpgsql
72-
AS $function$BEGIN RETURN 42; END;$function$
73-
",
74-
"config_params": null,
75-
"definition": "BEGIN RETURN 42; END;",
76-
"id": expect.any(Number),
77-
"identity_argument_types": "",
78-
"is_set_returning_function": false,
79-
"language": "plpgsql",
80-
"name": "test_function",
81-
"return_type": "integer",
82-
"return_type_id": 23,
83-
"return_type_relation_id": null,
84-
"schema": "public",
85-
"security_definer": false,
86-
}
87-
`)
64+
const responseData = response.json()
65+
expect(responseData).toMatchObject({
66+
args: [],
67+
argument_types: '',
68+
behavior: 'VOLATILE',
69+
complete_statement: expect.stringContaining(
70+
'CREATE OR REPLACE FUNCTION public.test_function()'
71+
),
72+
config_params: null,
73+
definition: 'BEGIN RETURN 42; END;',
74+
id: expect.any(Number),
75+
identity_argument_types: '',
76+
is_set_returning_function: false,
77+
language: 'plpgsql',
78+
name: 'test_function',
79+
return_type: 'integer',
80+
return_type_id: 23,
81+
return_type_relation_id: null,
82+
schema: 'public',
83+
security_definer: false,
84+
})
8885

89-
const { id } = response.json()
86+
const { id } = responseData
9087

9188
const retrieveResponse = await app.inject({
9289
method: 'GET',
@@ -96,30 +93,27 @@ describe('server/routes/functions', () => {
9693
},
9794
})
9895
expect(retrieveResponse.statusCode).toBe(200)
99-
expect(retrieveResponse.json()).toMatchInlineSnapshot(`
100-
{
101-
"args": [],
102-
"argument_types": "",
103-
"behavior": "VOLATILE",
104-
"complete_statement": "CREATE OR REPLACE FUNCTION public.test_function()
105-
RETURNS integer
106-
LANGUAGE plpgsql
107-
AS $function$BEGIN RETURN 42; END;$function$
108-
",
109-
"config_params": null,
110-
"definition": "BEGIN RETURN 42; END;",
111-
"id": ${id},
112-
"identity_argument_types": "",
113-
"is_set_returning_function": false,
114-
"language": "plpgsql",
115-
"name": "test_function",
116-
"return_type": "integer",
117-
"return_type_id": 23,
118-
"return_type_relation_id": null,
119-
"schema": "public",
120-
"security_definer": false,
121-
}
122-
`)
96+
const retrieveData = retrieveResponse.json()
97+
expect(retrieveData).toMatchObject({
98+
args: [],
99+
argument_types: '',
100+
behavior: 'VOLATILE',
101+
complete_statement: expect.stringContaining(
102+
'CREATE OR REPLACE FUNCTION public.test_function()'
103+
),
104+
config_params: null,
105+
definition: 'BEGIN RETURN 42; END;',
106+
id: expect.any(Number),
107+
identity_argument_types: '',
108+
is_set_returning_function: false,
109+
language: 'plpgsql',
110+
name: 'test_function',
111+
return_type: 'integer',
112+
return_type_id: 23,
113+
return_type_relation_id: null,
114+
schema: 'public',
115+
security_definer: false,
116+
})
123117

124118
const updateResponse = await app.inject({
125119
method: 'PATCH',
@@ -136,30 +130,27 @@ describe('server/routes/functions', () => {
136130
},
137131
})
138132
expect(updateResponse.statusCode).toBe(200)
139-
expect(updateResponse.json()).toMatchInlineSnapshot(`
140-
{
141-
"args": [],
142-
"argument_types": "",
143-
"behavior": "VOLATILE",
144-
"complete_statement": "CREATE OR REPLACE FUNCTION public.test_function()
145-
RETURNS integer
146-
LANGUAGE plpgsql
147-
AS $function$BEGIN RETURN 50; END;$function$
148-
",
149-
"config_params": null,
150-
"definition": "BEGIN RETURN 50; END;",
151-
"id": ${id},
152-
"identity_argument_types": "",
153-
"is_set_returning_function": false,
154-
"language": "plpgsql",
155-
"name": "test_function",
156-
"return_type": "integer",
157-
"return_type_id": 23,
158-
"return_type_relation_id": null,
159-
"schema": "public",
160-
"security_definer": false,
161-
}
162-
`)
133+
const updateData = updateResponse.json()
134+
expect(updateData).toMatchObject({
135+
args: [],
136+
argument_types: '',
137+
behavior: 'VOLATILE',
138+
complete_statement: expect.stringContaining(
139+
'CREATE OR REPLACE FUNCTION public.test_function()'
140+
),
141+
config_params: null,
142+
definition: 'BEGIN RETURN 50; END;',
143+
id: expect.any(Number),
144+
identity_argument_types: '',
145+
is_set_returning_function: false,
146+
language: 'plpgsql',
147+
name: 'test_function',
148+
return_type: 'integer',
149+
return_type_id: 23,
150+
return_type_relation_id: null,
151+
schema: 'public',
152+
security_definer: false,
153+
})
163154

164155
const deleteResponse = await app.inject({
165156
method: 'DELETE',
@@ -169,30 +160,27 @@ describe('server/routes/functions', () => {
169160
},
170161
})
171162
expect(deleteResponse.statusCode).toBe(200)
172-
expect(deleteResponse.json()).toMatchInlineSnapshot(`
173-
{
174-
"args": [],
175-
"argument_types": "",
176-
"behavior": "VOLATILE",
177-
"complete_statement": "CREATE OR REPLACE FUNCTION public.test_function()
178-
RETURNS integer
179-
LANGUAGE plpgsql
180-
AS $function$BEGIN RETURN 50; END;$function$
181-
",
182-
"config_params": null,
183-
"definition": "BEGIN RETURN 50; END;",
184-
"id": ${id},
185-
"identity_argument_types": "",
186-
"is_set_returning_function": false,
187-
"language": "plpgsql",
188-
"name": "test_function",
189-
"return_type": "integer",
190-
"return_type_id": 23,
191-
"return_type_relation_id": null,
192-
"schema": "public",
193-
"security_definer": false,
194-
}
195-
`)
163+
const deleteData = deleteResponse.json()
164+
expect(deleteData).toMatchObject({
165+
args: [],
166+
argument_types: '',
167+
behavior: 'VOLATILE',
168+
complete_statement: expect.stringContaining(
169+
'CREATE OR REPLACE FUNCTION public.test_function()'
170+
),
171+
config_params: null,
172+
definition: 'BEGIN RETURN 50; END;',
173+
id: expect.any(Number),
174+
identity_argument_types: '',
175+
is_set_returning_function: false,
176+
language: 'plpgsql',
177+
name: 'test_function',
178+
return_type: 'integer',
179+
return_type_id: 23,
180+
return_type_relation_id: null,
181+
schema: 'public',
182+
security_definer: false,
183+
})
196184
})
197185

198186
test('should return 400 for invalid payload', async () => {

‎test/publications.test.ts

Lines changed: 68 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -62,26 +62,24 @@ describe('server/routes/publications', () => {
6262
},
6363
})
6464
expect(response.statusCode).toBe(200)
65-
expect(response.json()).toMatchInlineSnapshot(`
66-
{
67-
"id": expect.any(Number),
68-
"name": "test_publication",
69-
"owner": "postgres",
70-
"publish_delete": true,
71-
"publish_insert": true,
72-
"publish_truncate": false,
73-
"publish_update": true,
74-
"tables": [
75-
{
76-
"id": 16393,
77-
"name": "users",
78-
"schema": "public",
79-
},
80-
],
81-
}
82-
`)
83-
8465
const responseData = response.json()
66+
expect(responseData).toMatchObject({
67+
id: expect.any(Number),
68+
name: 'test_publication',
69+
owner: 'postgres',
70+
publish_delete: true,
71+
publish_insert: true,
72+
publish_truncate: false,
73+
publish_update: true,
74+
tables: [
75+
{
76+
id: expect.any(Number),
77+
name: 'users',
78+
schema: 'public',
79+
},
80+
],
81+
})
82+
8583
const { id } = responseData
8684

8785
const retrieveResponse = await app.inject({
@@ -92,24 +90,23 @@ describe('server/routes/publications', () => {
9290
},
9391
})
9492
expect(retrieveResponse.statusCode).toBe(200)
95-
expect(retrieveResponse.json()).toMatchInlineSnapshot(`
96-
{
97-
"id": ${id},
98-
"name": "test_publication",
99-
"owner": "postgres",
100-
"publish_delete": true,
101-
"publish_insert": true,
102-
"publish_truncate": false,
103-
"publish_update": true,
104-
"tables": [
105-
{
106-
"id": 16393,
107-
"name": "users",
108-
"schema": "public",
109-
},
110-
],
111-
}
112-
`)
93+
const retrieveData = retrieveResponse.json()
94+
expect(retrieveData).toMatchObject({
95+
id: expect.any(Number),
96+
name: 'test_publication',
97+
owner: 'postgres',
98+
publish_delete: true,
99+
publish_insert: true,
100+
publish_truncate: false,
101+
publish_update: true,
102+
tables: [
103+
{
104+
id: expect.any(Number),
105+
name: 'users',
106+
schema: 'public',
107+
},
108+
],
109+
})
113110

114111
const updateResponse = await app.inject({
115112
method: 'PATCH',
@@ -122,24 +119,23 @@ describe('server/routes/publications', () => {
122119
},
123120
})
124121
expect(updateResponse.statusCode).toBe(200)
125-
expect(updateResponse.json()).toMatchInlineSnapshot(`
126-
{
127-
"id": ${id},
128-
"name": "test_publication",
129-
"owner": "postgres",
130-
"publish_delete": false,
131-
"publish_insert": true,
132-
"publish_truncate": false,
133-
"publish_update": true,
134-
"tables": [
135-
{
136-
"id": 16393,
137-
"name": "users",
138-
"schema": "public",
139-
},
140-
],
141-
}
142-
`)
122+
const updateData = updateResponse.json()
123+
expect(updateData).toMatchObject({
124+
id: expect.any(Number),
125+
name: 'test_publication',
126+
owner: 'postgres',
127+
publish_delete: false,
128+
publish_insert: true,
129+
publish_truncate: false,
130+
publish_update: true,
131+
tables: [
132+
{
133+
id: expect.any(Number),
134+
name: 'users',
135+
schema: 'public',
136+
},
137+
],
138+
})
143139

144140
const deleteResponse = await app.inject({
145141
method: 'DELETE',
@@ -149,24 +145,23 @@ describe('server/routes/publications', () => {
149145
},
150146
})
151147
expect(deleteResponse.statusCode).toBe(200)
152-
expect(deleteResponse.json()).toMatchInlineSnapshot(`
153-
{
154-
"id": ${id},
155-
"name": "test_publication",
156-
"owner": "postgres",
157-
"publish_delete": false,
158-
"publish_insert": true,
159-
"publish_truncate": false,
160-
"publish_update": true,
161-
"tables": [
162-
{
163-
"id": 16393,
164-
"name": "users",
165-
"schema": "public",
166-
},
167-
],
168-
}
169-
`)
148+
const deleteData = deleteResponse.json()
149+
expect(deleteData).toMatchObject({
150+
id: expect.any(Number),
151+
name: 'test_publication',
152+
owner: 'postgres',
153+
publish_delete: false,
154+
publish_insert: true,
155+
publish_truncate: false,
156+
publish_update: true,
157+
tables: [
158+
{
159+
id: expect.any(Number),
160+
name: 'users',
161+
schema: 'public',
162+
},
163+
],
164+
})
170165
})
171166

172167
test('should return 400 for invalid payload', async () => {

0 commit comments

Comments
 (0)