Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 1 addition & 2 deletions addon/utils/validation-errors.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,12 @@ export default function buildMessage(key, result) {
let returnsRaw = config['changeset-validations']?.rawOutput || false;
let messages = getMessages();

let description = messages.getDescriptionFor(key);

if (result.message) {
return result.message;
}

let { type, value, context = {} } = result;
let description = context?.description ?? messages.getDescriptionFor(key);

let message = get(messages, type);
if (returnsRaw) {
Expand Down
26 changes: 26 additions & 0 deletions tests/unit/utils/validation-errors-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -133,4 +133,30 @@ module('Unit | Utility | validation errors', function () {
assert.strictEqual(value, d, 'the passed value is returned');
config['changeset-validations'] = originalConfig; // reset the config
});

test('#buildMessage can return a provided description in raw data structure', function (assert) {
let originalConfig = config['changeset-validations']; // enable the feature
config['changeset-validations'] = { rawOutput: true };
let result = buildMessage('firstName', {
type: 'present',
value: 'testValue',
context: { foo: 'foo', description: 'Name' },
});
assert.notStrictEqual(
typeof result,
'string',
'the return value is an object'
);
let {
message,
type,
value,
context: { description },
} = result;
assert.ok(message, "{description} can't be blank");
assert.strictEqual(description, 'Name', 'description is returned');
assert.strictEqual(type, 'present', 'the type of the error is returned');
assert.strictEqual(value, 'testValue', 'the passed value is returned');
config['changeset-validations'] = originalConfig; // reset the config
});
});