Commit 04131663 authored by Nick Thomas's avatar Nick Thomas
Browse files

Merge branch 'fix-repo-settings-file-upload-error' into 'master'

Fix bug causing repository mirror settings UI to break

Closes #55134

See merge request gitlab-org/gitlab-ce!23712
parents 4b74da30 6b466e38
export default (buttonSelector, fileSelector) => {
const btn = document.querySelector(buttonSelector);
const fileInput = document.querySelector(fileSelector);
if (!btn || !fileInput) return;
const form = btn.closest('form');
btn.addEventListener('click', () => {
......
---
title: Fix bug causing repository mirror settings UI to break
merge_request: 23712
author:
type: fixed
......@@ -9,28 +9,56 @@ describe('File upload', () => {
<span class="js-filename"></span>
</form>
`);
});
describe('when there is a matching button and input', () => {
beforeEach(() => {
fileUpload('.js-button', '.js-input');
});
it('clicks file input after clicking button', () => {
const btn = document.querySelector('.js-button');
const input = document.querySelector('.js-input');
spyOn(input, 'click');
btn.click();
expect(input.click).toHaveBeenCalled();
});
it('updates file name text', () => {
const input = document.querySelector('.js-input');
fileUpload('.js-button', '.js-input');
input.value = 'path/to/file/index.js';
input.dispatchEvent(new CustomEvent('change'));
expect(document.querySelector('.js-filename').textContent).toEqual('index.js');
});
});
it('clicks file input after clicking button', () => {
const btn = document.querySelector('.js-button');
it('fails gracefully when there is no matching button', () => {
const input = document.querySelector('.js-input');
const btn = document.querySelector('.js-button');
fileUpload('.js-not-button', '.js-input');
spyOn(input, 'click');
btn.click();
expect(input.click).toHaveBeenCalled();
expect(input.click).not.toHaveBeenCalled();
});
it('updates file name text', () => {
it('fails gracefully when there is no matching input', () => {
const input = document.querySelector('.js-input');
const btn = document.querySelector('.js-button');
fileUpload('.js-button', '.js-not-input');
input.value = 'path/to/file/index.js';
spyOn(input, 'click');
input.dispatchEvent(new CustomEvent('change'));
btn.click();
expect(document.querySelector('.js-filename').textContent).toEqual('index.js');
expect(input.click).not.toHaveBeenCalled();
});
});
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment