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

Don't append a slash to file paths

Browse Source
This commit is contained in:
Jake McDermott
2021-03-25 17:40:56 -04:00
parent 499d80c4b0
commit a86196cfa3
2 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
awx/ui_next/src/screens/Inventory/shared/InventorySourceSubForms/SCMSubForm.jsx
View File

@@ -122,9 +122,6 @@ const SCMSubForm = ({ autoPopulateProject, i18n }) => {
onSelect={(event, value) => { onSelect={(event, value) => {
setIsOpen(false); setIsOpen(false);
value = value.trim(); value = value.trim();
if (!value.endsWith('/')) {
value += '/';
}
sourcePathHelpers.setValue(value); sourcePathHelpers.setValue(value);
}} }}
aria-label={i18n._(t`Select source path`)} aria-label={i18n._(t`Select source path`)}
@@ -132,10 +129,6 @@ const SCMSubForm = ({ autoPopulateProject, i18n }) => {
isCreatable isCreatable
onCreateOption={value => { onCreateOption={value => {
value.trim(); value.trim();
if (!value.endsWith('/')) {
value += '/';
}
setSourcePath([...sourcePath, value]); setSourcePath([...sourcePath, value]);
}} }}
> >

4
awx/ui_next/src/screens/Inventory/shared/InventorySourceSubForms/SCMSubForm.test.jsx
View File

@@ -98,7 +98,7 @@ describe('<SCMSubForm />', () => {
}); });
wrapper.update(); wrapper.update();
expect(wrapper.find('Select#source_path').prop('selections')).toEqual( expect(wrapper.find('Select#source_path').prop('selections')).toEqual(
'bar/' 'bar'
); );
await act(async () => { await act(async () => {
@@ -138,7 +138,7 @@ describe('<SCMSubForm />', () => {
customWrapper.find('Select').invoke('onSelect')({}, 'newPath'); customWrapper.find('Select').invoke('onSelect')({}, 'newPath');
}); });
customWrapper.update(); customWrapper.update();
expect(customWrapper.find('Select').prop('selections')).toBe('newPath/'); expect(customWrapper.find('Select').prop('selections')).toBe('newPath');
}); });
test('Update on project update should be disabled', async () => { test('Update on project update should be disabled', async () => {
const customInitialValues = { const customInitialValues = {