Skip to content

refactor: continue moving test in yml and fix puppeteer #74

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 29, 2024
Merged

refactor: continue moving test in yml and fix puppeteer #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
169 changes: 0 additions & 169 deletions packages/dynamock/test/integrations.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,63 +34,6 @@ describe('integrations.js', () => {
})
})

describe('validation fixture', () => {
test.each([
// request path / method
[{ path: '/', method: 'head' }, { body: '' }, true],
[{ path: '/', method: 'HEAD' }, { body: '' }, true],
[{ path: '/', method: 'delete' }, { body: '' }, true],
[{ path: '/', method: 'put' }, { body: '' }, true],
[{ path: '/', method: 'post' }, { body: '' }, true],
[{ path: '/', method: 'get' }, { body: '' }, true],
[{ path: '/', method: 'options' }, { body: '' }, true],
[{ path: '/', method: 'patch' }, { body: '' }, true],

// request body
[{ method: 'get', path: '/', body: '' }, { body: '' }, true],
[{ method: 'get', path: '/', body: {} }, { body: '' }, true],
[{ method: 'get', path: '/', body: 1 }, { body: '' }, true],
[{ method: 'get', path: '/', body: [] }, { body: '' }, true],

// request headers
[{ method: 'get', path: '/', headers: {} }, { body: '' }, true],
[{ method: 'get', path: '/', headers: null }, { body: '' }, false],
[{ method: 'get', path: '/', headers: { a: 'b' } }, { body: '' }, true],
[{ method: 'get', path: '/', headers: [] }, { body: '' }, true],
[{ method: 'get', path: '/', headers: [1] }, { body: '' }, false],
[{ method: 'get', path: '/', headers: ['not-in-configuration'] }, { body: '' }, false],

// request options path
[{ path: '/', method: 'get', options: { path: { allowRegex: true } } }, { body: '' }, true],
[{ path: '/', method: 'get', options: { path: { strict: true } } }, { body: '' }, false],

// request options method
[{ path: '/', method: 'get', options: { method: { allowRegex: true } } }, { body: '' }, true],
[{ path: '/', method: 'get', options: { method: { strict: true } } }, { body: '' }, false],

// request options headers
[{ path: '/', method: 'get', options: { headers: { strict: true, allowRegex: true } } }, { body: '' }, false],
[{ path: '/', method: 'get', options: { headers: { strict: true, allowRegex: false } } }, { body: '' }, true],
[{ path: '/', method: 'get', options: { headers: { strict: false, allowRegex: false } } }, { body: '' }, true],
[{ path: '/', method: 'get', options: { headers: { strict: true } } }, { body: '' }, true],
[{ path: '/', method: 'get', options: { headers: { strict: false, allowRegex: true } } }, { body: '' }, true],
[{ path: '/', method: 'get', options: { headers: { allowRegex: true } } }, { body: '' }, true],
])('validate request="%o" response="%o" isValid=%s', async (req, resp, isValid) => {
await request
.post('/___fixtures')
.send({ request: req, response: resp })
.expect(isValid ? 201 : 400)

// Same error in bulk
if (!isValid) {
await request
.post('/___fixtures/bulk')
.send([{ request: { method: 'get', path: '/' } }, { request: req, response: resp }])
.expect(400)
}
})
})

describe('create and delete fixtures', () => {
// Special case:
// We need the same supertest/server port in order to reproduce the sha1 of a fixture
Expand Down Expand Up @@ -153,103 +96,6 @@ describe('integrations.js', () => {
})
})

describe('conflicts fixtures', () => {
test.each([
// Conflicts
[null, { method: 'get', path: '/products' }, { method: 'get', path: '/products' }, true],
[
null,
{ method: 'get', path: '/products', headers: {}, cookies: {}, query: {} },
{ method: 'get', path: '/products' },
true,
],
[
null,
{ method: 'get', path: '/products', headers: { a: 'a' }, cookies: { a: 'a' } },
{ method: 'get', path: '/products', cookies: { a: 'a' }, headers: { a: 'a' } },
true,
],
[
null,
{ method: 'get', path: '/products', headers: [], cookies: [], query: [] },
{ method: 'get', path: '/products' },
true,
],
[
null,
{
method: 'get',
path: '/products',
headers: { a: 'a', b: 'b' },
cookies: { a: 'a', b: 'b' },
query: { a: 'a', b: 'b' },
},
{
method: 'get',
path: '/products',
headers: { b: 'b', a: 'a' },
cookies: { a: 'a', b: 'b' },
query: { a: 'a', b: 'b' },
},
true,
],
// No conflicts
[null, { method: 'get', path: '/products' }, { method: 'post', path: '/products' }, false],
[null, { method: 'post', path: '/products' }, { method: 'get', path: '/products' }, false],
[null, { method: 'get', path: '/products' }, { method: 'get', path: '/categories' }, false],
[null, { method: 'get', path: '/categories' }, { method: 'get', path: '/products' }, false],
])(
'conflict situation config="%o" requestA="%o" requestB="%o" shouldConflict=%s',
async (configuration, requestA, requestB, shouldConflict) => {
if (configuration) {
await request
.put('/___config')
.send({
headers: configuration,
})
.expect(200)
}

// Check if combining fixtures in a single request also failed
await request
.post('/___fixtures/bulk')
.send(
[requestA, requestB].map((request) => ({
request: request,
response: {
body: {},
},
})),
)
.expect(shouldConflict ? 409 : 201)

if (!shouldConflict) {
await request.delete('/___fixtures')
}

await request
.post('/___fixtures')
.send({
request: requestA,
response: {
body: {},
},
})
.expect(201)

await request
.post('/___fixtures')
.send({
request: requestB,
response: {
body: {},
},
})
.expect(shouldConflict ? 409 : 201)
},
)
})

describe('CORS', () => {
test('allow all', async () => {
await request.put('/___config').send({ cors: '*' }).expect(200)
Expand Down Expand Up @@ -287,28 +133,13 @@ describe('integrations.js', () => {

describe('matching path', () => {
test.each([
['/a', null, '/a', true],
['*', null, '/a', true],
['*', null, '/a/b', true],
['/ a', null, '/ a', true],
['/ a', null, '/%20a', true],
['/%20a', null, '/ a', false],
['/%20a', null, '/%20a', false],
['/a', null, '/a/', false],
['/a/', null, '/a', false],
['/a/b', null, '/a/b', true],
['/a/b', null, '/a', false],
['/a/b', null, '/b', false],
['/a/b', null, '/a/', false],
['/a/b', null, '/b/', false],
['/%20a', { disableEncodeURI: true }, '/ a', true],
['/%20a', { disableEncodeURI: true }, '/%20a', true],
['//a/', { allowRegex: true }, '/a', true],
['//%20a/', { allowRegex: true }, '/ a', true],
['//a/', { allowRegex: true }, '/a/b', true],
['/^/a/', { allowRegex: true }, '/a/b', true],
['/^/a$/', { allowRegex: true }, '/a/b', false],
['/^(/(a|b))+$/', { allowRegex: true }, '/a/b', true],
])('matching path match="%s" options="%o" test="%s" result=%s', async (matchPath, options, path, shouldMatch) => {
const method = 'get'

Expand Down
22 changes: 18 additions & 4 deletions packages/puppeteer/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,15 +61,29 @@ function mapToCoreRequest(request: HTTPRequest): CoreRequest {
}

function mapToFixtureType(fixture: FixturePuppeteerType): FixtureType {
const parsedUrl = new URL(fixture.request.url)
const { url, ...request } = fixture.request
const url = fixture.request.url
let origin = ''
let path = ''

try {
const parsedUrl = new URL(url)
origin = parsedUrl.origin
path = parsedUrl.toString().replace(parsedUrl.origin, '')
} catch (error) {
if (url.endsWith('*')) {
const parsedUrl = new URL(url.slice(0, -1))
origin = parsedUrl.origin
path = '*'
}
}
const { url: remove, ...request } = fixture.request

return {
...fixture,
request: {
...request,
origin: parsedUrl.origin,
path: parsedUrl.toString().replace(parsedUrl.origin, ''),
origin,
path,
},
}
}
Expand Down
4 changes: 2 additions & 2 deletions packages/puppeteer/test/puppeteer.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { ActionEnum, getTestFiles, wrapError } from '@dynamock/test-cases'
import { getPuppeteerTestCases } from './config/getTestCases.js'

describe('puppeteer integration tests', () => {
const allTests = getTestFiles() //.filter(([filePath]) => filePath.endsWith('create-and-delete-bulk.yml'))
const allTests = getTestFiles().filter(([filePath]) => filePath.endsWith('.yml'))

beforeEach(() => page.goto('http://127.0.0.1:3000/index.html'))

Expand All @@ -27,7 +27,7 @@ describe('puppeteer integration tests', () => {
case ActionEnum.post_fixtures_bulk:
case ActionEnum.delete_fixture:
case ActionEnum.delete_all_fixtures: {
if (expectation.status === 400) {
if (expectation.status === 400 || expectation.status === 409) {
try {
await dynamock(page, action.data)
} catch (error: unknown) {
Expand Down
0 ...t-files/config/validation/put-invalid.yml → ...t-files/config/validation/invalid-put.yml
View file
Open in desktop
File renamed without changes.
38 changes: 38 additions & 0 deletions packages/test-cases/test-files/fixtures/conflict/conflict-all.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
- action:
name: post_fixture
data:
request:
path: /products
method: get
headers:
a: "a"
b: "b"
cookies:
c: "c"
d: "d"
query:
e: "e"
f: "f"
response:
status: 200
expectation:
status: 201
- action:
name: post_fixture
data:
request:
path: /products
method: get
headers:
a: "a"
b: "b"
cookies:
c: "c"
d: "d"
query:
e: "e"
f: "f"
response:
status: 200
expectation:
status: 409
26 changes: 26 additions & 0 deletions packages/test-cases/test-files/fixtures/conflict/conflict-cookies.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
- action:
name: post_fixture
data:
request:
path: /products
method: get
cookies:
a: "a"
b: "b"
response:
status: 200
expectation:
status: 201
- action:
name: post_fixture
data:
request:
path: /products
method: get
cookies:
a: "a"
b: "b"
response:
status: 200
expectation:
status: 409
26 changes: 26 additions & 0 deletions packages/test-cases/test-files/fixtures/conflict/conflict-headers.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
- action:
name: post_fixture
data:
request:
path: /products
method: get
headers:
a: "a"
b: "b"
response:
status: 200
expectation:
status: 201
- action:
name: post_fixture
data:
request:
path: /products
method: get
headers:
a: "a"
b: "b"
response:
status: 200
expectation:
status: 409
46 changes: 46 additions & 0 deletions packages/test-cases/test-files/fixtures/conflict/conflict-method-path.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
- action:
name: post_fixture
data:
request:
path: /products
method: get
response:
status: 200
expectation:
status: 201
- action:
name: post_fixture
data:
request:
path: /products
method: get
response:
status: 200
expectation:
status: 409
- action:
name: post_fixture
data:
request:
path: /products
method: get
headers: {}
cookies: {}
query: {}
response:
status: 200
expectation:
status: 409
- action:
name: post_fixture
data:
request:
path: /products
method: get
headers: []
cookies: []
query: []
response:
status: 200
expectation:
status: 409
Loading
Loading