mirror/lowdefy
2
0
Fork 0
mirror of https://github.com/lowdefy/lowdefy.git synced 2025-02-17 14:30:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1137 from lowdefy/fix-throw-action

Browse Source 
fix(actions-core): Fix Throw action error message if params are not a…
This commit is contained in:
Sam 2022-03-01 11:51:21 +02:00 committed by GitHub
commit 020ace4ed9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 82 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/plugins/actions/actions-core/src/actions/Throw.js
View File

@ -27,8 +27,15 @@ class ThrowActionError extends Error {
}
function Throw({ methods: { getBlockId, getPageId }, params }) {
if (params.throw === false || type.isNone(params.throw)) {
return;
if (!type.isObject(params)) {
throw new Error(
`Throw action params should be an object. Received "${JSON.stringify(params)}".`
);
}
if (!type.isNone(params.throw) && !type.isBoolean(params.throw)) {
throw new Error(
`Throw action "throw" param should be an boolean. Received "${JSON.stringify(params.throw)}".`
);
}
if (params.throw === true) {
throw new ThrowActionError(params.message, {
@ -37,7 +44,6 @@ function Throw({ methods: { getBlockId, getPageId }, params }) {
pageId: getPageId(),
});
}
throw new Error(`Invalid Throw, check action params. Received "${JSON.stringify(params)}".`);
}
export default Throw;

80
packages/plugins/actions/actions-core/src/actions/Throw.test.js
View File

@ -100,14 +100,14 @@ test('Throw no params', async () => {
type: 'Throw',
},
error: {
error: new TypeError("Cannot read properties of undefined (reading 'throw')"),
error: new TypeError('Throw action params should be an object. Received "undefined".'),
index: 0,
type: 'Throw',
},
},
responses: {
throw: {
error: new TypeError("Cannot read properties of undefined (reading 'throw')"),
error: new TypeError('Throw action params should be an object. Received "undefined".'),
type: 'Throw',
index: 0,
},
@ -120,7 +120,7 @@ test('Throw no params', async () => {
Array [
Array [
Object {
"content": "Cannot read properties of undefined (reading 'throw')",
"content": "Throw action params should be an object. Received \\"undefined\\".",
"duration": 6,
"status": "error",
},
@ -129,7 +129,7 @@ test('Throw no params', async () => {
`);
});
test('Throw throw true no message or metaData', async () => {
test('Throw params.throw true, no message or metaData', async () => {
const rootBlock = {
id: 'block:root:root:0',
blockId: 'root',
@ -207,7 +207,7 @@ test('Throw throw true no message or metaData', async () => {
`);
});
test('Throw throw true message no metaData', async () => {
test('Throw params.throw true, message and no metaData', async () => {
const rootBlock = {
id: 'block:root:root:0',
blockId: 'root',
@ -285,7 +285,7 @@ test('Throw throw true message no metaData', async () => {
`);
});
test('Throw throw true message metaData string', async () => {
test('Throw params.throw true, message and metaData string', async () => {
const rootBlock = {
id: 'block:root:root:0',
blockId: 'root',
@ -371,7 +371,7 @@ test('Throw throw true message metaData string', async () => {
`);
});
test('Throw throw true message metaData object', async () => {
test('Throw params.throw true, message and metaData object', async () => {
const rootBlock = {
id: 'block:root:root:0',
blockId: 'root',
@ -457,7 +457,7 @@ test('Throw throw true message metaData object', async () => {
`);
});
test('Throw throw false', async () => {
test('Throw params.throw false', async () => {
const rootBlock = {
id: 'block:root:root:0',
blockId: 'root',
@ -513,7 +513,63 @@ test('Throw throw false', async () => {
expect(displayMessage.mock.calls).toMatchInlineSnapshot(`Array []`);
});
test('Throw throw invalid', async () => {
test('Throw params.throw null', async () => {
const rootBlock = {
id: 'block:root:root:0',
blockId: 'root',
meta: {
category: 'container',
},
areas: {
content: {
blocks: [
{
id: 'block:root:button:0',
blockId: 'button',
type: 'Button',
meta: {
category: 'display',
},
events: {
onClick: [
{
id: 'throw',
type: 'Throw',
params: { throw: null },
},
],
},
},
],
},
},
};
const context = await testContext({
lowdefy,
rootBlock,
});
const button = context._internal.RootBlocks.map['block:root:button:0'];
await button.triggerEvent({ name: 'onClick' });
expect(button.Events.events.onClick.history[0]).toEqual({
blockId: 'button',
bounced: false,
event: undefined,
eventName: 'onClick',
responses: {
throw: {
type: 'Throw',
response: undefined,
index: 0,
},
},
endTimestamp: { date: 0 },
startTimestamp: { date: 0 },
success: true,
});
expect(displayMessage.mock.calls).toMatchInlineSnapshot(`Array []`);
});
test('Throw params.throw should be a boolean.', async () => {
const rootBlock = {
id: 'block:root:root:0',
blockId: 'root',
@ -556,7 +612,7 @@ test('Throw throw invalid', async () => {
error: {
error: {
type: 'Throw',
error: new Error('Invalid Throw, check action params. Received "{"throw":"invalid"}".'),
error: new Error('Throw action "throw" param should be an boolean. Received ""invalid"".'),
index: 0,
},
action: {
@ -570,7 +626,7 @@ test('Throw throw invalid', async () => {
responses: {
throw: {
type: 'Throw',
error: new Error('Invalid Throw, check action params. Received "{"throw":"invalid"}".'),
error: new Error('Throw action "throw" param should be an boolean. Received ""invalid"".'),
index: 0,
},
},
@ -582,7 +638,7 @@ test('Throw throw invalid', async () => {
Array [
Array [
Object {
"content": "Invalid Throw, check action params. Received \\"{\\"throw\\":\\"invalid\\"}\\".",
"content": "Throw action \\"throw\\" param should be an boolean. Received \\"\\"invalid\\"\\".",
"duration": 6,
"status": "error",
},

2
packages/utils/ajv/jest.config.js
View File

@ -4,7 +4,7 @@ export default {
collectCoverageFrom: ['src/**/*.js'],
coverageDirectory: 'coverage',
coveragePathIgnorePatterns: ['<rootDir>/dist/', '<rootDir>/src/index.js'],
coverageReporters: [['lcov', { projectRoot: '../..' }], 'text', 'clover'],
coverageReporters: [['lcov', { projectRoot: '../../..' }], 'text', 'clover'],
errorOnDeprecated: true,
testEnvironment: 'node',
testPathIgnorePatterns: ['<rootDir>/dist/'],

2
packages/utils/block-utils/jest.config.js
View File

@ -4,7 +4,7 @@ export default {
collectCoverageFrom: ['src/**/*.{js,jsx}'],
coverageDirectory: 'coverage',
coveragePathIgnorePatterns: ['<rootDir>/dist/', '<rootDir>/test/', '<rootDir>/src/index.js'],
coverageReporters: [['lcov', { projectRoot: '../..' }], 'text', 'clover'],
coverageReporters: [['lcov', { projectRoot: '../../..' }], 'text', 'clover'],
errorOnDeprecated: true,
testEnvironment: 'jsdom',
testPathIgnorePatterns: ['<rootDir>/dist/'],

2
packages/utils/helpers/jest.config.js
View File

@ -4,7 +4,7 @@ export default {
collectCoverageFrom: ['src/**/*.js'],
coverageDirectory: 'coverage',
coveragePathIgnorePatterns: ['<rootDir>/dist/', '<rootDir>/src/index.js'],
coverageReporters: [['lcov', { projectRoot: '../..' }], 'text', 'clover'],
coverageReporters: [['lcov', { projectRoot: '../../..' }], 'text', 'clover'],
errorOnDeprecated: true,
testEnvironment: 'node',
testPathIgnorePatterns: ['<rootDir>/dist/'],

2
packages/utils/node-utils/jest.config.js
View File

@ -4,7 +4,7 @@ export default {
collectCoverageFrom: ['src/**/*.js'],
coverageDirectory: 'coverage',
coveragePathIgnorePatterns: ['<rootDir>/dist/', '<rootDir>/src/index.js'],
coverageReporters: [['lcov', { projectRoot: '../..' }], 'text', 'clover'],
coverageReporters: [['lcov', { projectRoot: '../../..' }], 'text', 'clover'],
errorOnDeprecated: true,
testEnvironment: 'node',
testPathIgnorePatterns: ['<rootDir>/dist/'],

2
packages/utils/nunjucks/jest.config.js
View File

@ -4,7 +4,7 @@ export default {
collectCoverageFrom: ['src/**/*.js'],
coverageDirectory: 'coverage',
coveragePathIgnorePatterns: ['<rootDir>/dist/'],
coverageReporters: [['lcov', { projectRoot: '../..' }], 'text', 'clover'],
coverageReporters: [['lcov', { projectRoot: '../../..' }], 'text', 'clover'],
errorOnDeprecated: true,
testEnvironment: 'node',
testPathIgnorePatterns: ['<rootDir>/dist/'],