External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-16 02:30:01 -03:30
Code Issues Packages Projects Releases Wiki Activity

fixes erroneously invalidating responses

Browse Source
This commit is contained in:
Alex Corey
2020-05-11 12:13:07 -04:00
parent 1ca3d1fe3b
commit 9360d3fabc
2 changed files with 71 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
awx/ui_next/src/screens/Template/Survey/SurveyQuestionForm.jsx
View File

@@ -68,12 +68,17 @@ function SurveyQuestionForm({
}) {
const defaultIsNotAvailable = choices => {
return defaultValue => {
if (!choices.includes(defaultValue)) {
return i18n._(
const answerChoices = new Set(choices);
const defaultAnswers = new Set(defaultValue);
let errorMessage;
const found = [...defaultAnswers].every(dA => answerChoices.has(dA));
if (!found) {
errorMessage = i18n._(
t`Default choice must be answered from the choices listed.`
);
}
return undefined;
return errorMessage;
};
};

63
awx/ui_next/src/screens/Template/Survey/SurveyQuestionForm.test.jsx
View File

@@ -225,4 +225,67 @@ describe('<SurveyQuestionForm />', () => {
wrapper.find('FormField#question-default input').prop('type')
).toEqual('number');
});
test('should not throw validation error', async () => {
let wrapper;
act(() => {
wrapper = mountWithContexts(
<SurveyQuestionForm
question={question}
handleSubmit={noop}
handleCancel={noop}
/>
);
});
await selectType(wrapper, 'multiselect');
await act(async () =>
wrapper.find('TextArea#question-options').prop('onChange')('a \n b', {
target: { value: 'a \n b', name: 'choices' },
})
);
await act(async () =>
wrapper.find('TextArea#question-default').prop('onChange')('b \n a', {
target: { value: 'b \n a', name: 'default' },
})
);
wrapper.find('FormField#question-default').prop('validate')('b \n a', {});
wrapper.update();
expect(
wrapper
.find('FormGroup[fieldId="question-default"]')
.prop('helperTextInvalid')
).toBe(undefined);
});
test('should throw validation error', async () => {
let wrapper;
act(() => {
wrapper = mountWithContexts(
<SurveyQuestionForm
question={question}
handleSubmit={noop}
handleCancel={noop}
/>
);
});
await selectType(wrapper, 'multiselect');
await act(async () =>
wrapper.find('TextArea#question-options').prop('onChange')('a \n b', {
target: { value: 'a \n b', name: 'choices' },
})
);
await act(async () =>
wrapper.find('TextArea#question-default').prop('onChange')('c', {
target: { value: 'c', name: 'default' },
})
);
wrapper.find('FormField#question-default').prop('validate')('c', {});
wrapper.update();
expect(
wrapper
.find('FormGroup[fieldId="question-default"]')
.prop('helperTextInvalid')
).toBe('Default choice must be answered from the choices listed.');
});
});