Skip to content
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

Jump to bottom

Fix CI failure caused by #1394 #1406

Merged
merged 5 commits into from
Feb 18, 2023
Merged

Fix CI failure caused by #1394 #1406

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d024db8
Display type correctly for array if obj passed as an array
ilyasakin Jan 10, 2023
3a0f25d
Narrow the test case for `should throw an error if data is an array`
ilyasakin Jan 10, 2023
492bf70
Fix CI
ilyasakin Feb 17, 2023
e10a5ed
Merge branch 'master' into master
ilyasakin Feb 17, 2023
e26023e
Fix regex
ilyasakin Feb 17, 2023
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
2 changes: 1 addition & 1 deletion __tests__/server/validate-data.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ describe('validateData', () => {
})

test('should throw an error if data is an array', () => {
assert.throws(() => validateData([]), /Data must be an object. Found array./)
assert.throws(() => validateData([]), /Data must be an object. Found array/)
})

test("shouldn't throw an error", () => {
Expand Down
6 changes: 4 additions & 2 deletions src/server/router/validate-data.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,10 @@ module.exports = (obj) => {
Object.keys(obj).forEach(validateKey)
} else {
throw new Error(
`Data must be an object. Found ${Array.isArray(obj) ? 'array' : typeof obj}.` +
'See https://github.com/typicode/json-server for example.'
`Data must be an object. Found ${
Array.isArray(obj) ? 'array' : typeof obj
}
'See https://github.com/typicode/json-server for example.`
)
}
}