diff options
author | Robert Speicher <rspeicher@gmail.com> | 2021-01-20 13:34:23 -0600 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2021-01-20 13:34:23 -0600 |
commit | 6438df3a1e0fb944485cebf07976160184697d72 (patch) | |
tree | 00b09bfd170e77ae9391b1a2f5a93ef6839f2597 /spec/frontend/behaviors | |
parent | 42bcd54d971da7ef2854b896a7b34f4ef8601067 (diff) | |
download | gitlab-ce-6438df3a1e0fb944485cebf07976160184697d72.tar.gz |
Add latest changes from gitlab-org/gitlab@13-8-stable-eev13.8.0-rc42
Diffstat (limited to 'spec/frontend/behaviors')
-rw-r--r-- | spec/frontend/behaviors/autosize_spec.js | 2 | ||||
-rw-r--r-- | spec/frontend/behaviors/bind_in_out_spec.js | 2 | ||||
-rw-r--r-- | spec/frontend/behaviors/copy_as_gfm_spec.js | 10 | ||||
-rw-r--r-- | spec/frontend/behaviors/gl_emoji_spec.js | 2 | ||||
-rw-r--r-- | spec/frontend/behaviors/load_startup_css_spec.js | 2 | ||||
-rw-r--r-- | spec/frontend/behaviors/markdown/paste_markdown_table_spec.js | 10 | ||||
-rw-r--r-- | spec/frontend/behaviors/quick_submit_spec.js | 2 | ||||
-rw-r--r-- | spec/frontend/behaviors/requires_input_spec.js | 24 | ||||
-rw-r--r-- | spec/frontend/behaviors/secret_values_spec.js | 22 | ||||
-rw-r--r-- | spec/frontend/behaviors/shortcuts/keybindings_spec.js | 2 | ||||
-rw-r--r-- | spec/frontend/behaviors/shortcuts/shortcuts_issuable_spec.js | 36 |
11 files changed, 51 insertions, 63 deletions
diff --git a/spec/frontend/behaviors/autosize_spec.js b/spec/frontend/behaviors/autosize_spec.js index 3444c7b4075..352bd8a0ed0 100644 --- a/spec/frontend/behaviors/autosize_spec.js +++ b/spec/frontend/behaviors/autosize_spec.js @@ -6,7 +6,7 @@ function load() { jest.mock('~/helpers/startup_css_helper', () => { return { - waitForCSSLoaded: jest.fn().mockImplementation(cb => cb.apply()), + waitForCSSLoaded: jest.fn().mockImplementation((cb) => cb.apply()), }; }); diff --git a/spec/frontend/behaviors/bind_in_out_spec.js b/spec/frontend/behaviors/bind_in_out_spec.js index 92a68ddd387..49425a9377e 100644 --- a/spec/frontend/behaviors/bind_in_out_spec.js +++ b/spec/frontend/behaviors/bind_in_out_spec.js @@ -1,5 +1,5 @@ +import ClassSpecHelper from 'helpers/class_spec_helper'; import BindInOut from '~/behaviors/bind_in_out'; -import ClassSpecHelper from '../helpers/class_spec_helper'; describe('BindInOut', () => { let testContext; diff --git a/spec/frontend/behaviors/copy_as_gfm_spec.js b/spec/frontend/behaviors/copy_as_gfm_spec.js index 46d4451c941..16ea4ba8624 100644 --- a/spec/frontend/behaviors/copy_as_gfm_spec.js +++ b/spec/frontend/behaviors/copy_as_gfm_spec.js @@ -57,7 +57,7 @@ describe('CopyAsGFM', () => { const fragment = document.createDocumentFragment(); const node = document.createElement('div'); node.innerHTML = html; - Array.from(node.childNodes).forEach(item => fragment.appendChild(item)); + Array.from(node.childNodes).forEach((item) => fragment.appendChild(item)); return fragment; }, }), @@ -80,7 +80,7 @@ describe('CopyAsGFM', () => { return clipboardData; }; - beforeAll(done => { + beforeAll((done) => { initCopyAsGFM(); // Fake call to nodeToGfm so the import of lazy bundle happened @@ -94,7 +94,7 @@ describe('CopyAsGFM', () => { beforeEach(() => jest.spyOn(clipboardData, 'setData')); describe('list handling', () => { - it('uses correct gfm for unordered lists', done => { + it('uses correct gfm for unordered lists', (done) => { const selection = stubSelection('<li>List Item1</li><li>List Item2</li>\n', 'UL'); window.getSelection = jest.fn(() => selection); @@ -108,7 +108,7 @@ describe('CopyAsGFM', () => { }); }); - it('uses correct gfm for ordered lists', done => { + it('uses correct gfm for ordered lists', (done) => { const selection = stubSelection('<li>List Item1</li><li>List Item2</li>\n', 'OL'); window.getSelection = jest.fn(() => selection); @@ -127,7 +127,7 @@ describe('CopyAsGFM', () => { describe('CopyAsGFM.quoted', () => { const sampleGFM = '* List 1\n* List 2\n\n`Some code`'; - it('adds quote char `> ` to each line', done => { + it('adds quote char `> ` to each line', (done) => { const expectedQuotedGFM = '> * List 1\n> * List 2\n> \n> `Some code`'; expect(CopyAsGFM.quoted(sampleGFM)).toEqual(expectedQuotedGFM); done(); diff --git a/spec/frontend/behaviors/gl_emoji_spec.js b/spec/frontend/behaviors/gl_emoji_spec.js index 46b4e5d3d5c..6e476d84501 100644 --- a/spec/frontend/behaviors/gl_emoji_spec.js +++ b/spec/frontend/behaviors/gl_emoji_spec.js @@ -1,5 +1,5 @@ import MockAdapter from 'axios-mock-adapter'; -import waitForPromises from 'jest/helpers/wait_for_promises'; +import waitForPromises from 'helpers/wait_for_promises'; import axios from '~/lib/utils/axios_utils'; import { initEmojiMap, EMOJI_VERSION } from '~/emoji'; import installGlEmojiElement from '~/behaviors/gl_emoji'; diff --git a/spec/frontend/behaviors/load_startup_css_spec.js b/spec/frontend/behaviors/load_startup_css_spec.js index 81222ac5aaa..59f49585645 100644 --- a/spec/frontend/behaviors/load_startup_css_spec.js +++ b/spec/frontend/behaviors/load_startup_css_spec.js @@ -7,7 +7,7 @@ describe('behaviors/load_startup_css', () => { const setupListeners = () => { document .querySelectorAll('link') - .forEach(x => x.addEventListener('load', () => loadListener(x))); + .forEach((x) => x.addEventListener('load', () => loadListener(x))); }; beforeEach(() => { diff --git a/spec/frontend/behaviors/markdown/paste_markdown_table_spec.js b/spec/frontend/behaviors/markdown/paste_markdown_table_spec.js index eab805382bd..7044618fd9e 100644 --- a/spec/frontend/behaviors/markdown/paste_markdown_table_spec.js +++ b/spec/frontend/behaviors/markdown/paste_markdown_table_spec.js @@ -8,7 +8,7 @@ describe('PasteMarkdownTable', () => { Object.defineProperty(event, 'dataTransfer', { value: { - getData: jest.fn().mockImplementation(type => { + getData: jest.fn().mockImplementation((type) => { if (type === 'text/html') { return '<table><tr><td>First</td><td>Second</td></tr></table>'; } @@ -48,7 +48,7 @@ describe('PasteMarkdownTable', () => { it('returns false when the number of rows are not consistent', () => { data.types = ['text/html', 'text/plain']; - data.getData = jest.fn().mockImplementation(mimeType => { + data.getData = jest.fn().mockImplementation((mimeType) => { if (mimeType === 'text/html') { return '<table><tr><td>def test<td></tr></table>'; } @@ -60,7 +60,7 @@ describe('PasteMarkdownTable', () => { it('returns false when the table copy comes from a diff', () => { data.types = ['text/html', 'text/plain']; - data.getData = jest.fn().mockImplementation(mimeType => { + data.getData = jest.fn().mockImplementation((mimeType) => { if (mimeType === 'text/html') { return '<table class="diff-wrap-lines"><tr><td>First</td><td>Second</td></tr></table>'; } @@ -74,7 +74,7 @@ describe('PasteMarkdownTable', () => { describe('convertToTableMarkdown', () => { it('returns a Markdown table', () => { data.types = ['text/html', 'text/plain']; - data.getData = jest.fn().mockImplementation(type => { + data.getData = jest.fn().mockImplementation((type) => { if (type === 'text/html') { return '<table><tr><td>First</td><td>Last</td><tr><td>John</td><td>Doe</td><tr><td>Jane</td><td>Doe</td></table>'; } else if (type === 'text/plain') { @@ -99,7 +99,7 @@ describe('PasteMarkdownTable', () => { it('returns a Markdown table with rows normalized', () => { data.types = ['text/html', 'text/plain']; - data.getData = jest.fn().mockImplementation(type => { + data.getData = jest.fn().mockImplementation((type) => { if (type === 'text/html') { return '<table><tr><td>First</td><td>Last</td><tr><td>John</td><td>Doe</td><tr><td>Jane</td><td>/td></table>'; } else if (type === 'text/plain') { diff --git a/spec/frontend/behaviors/quick_submit_spec.js b/spec/frontend/behaviors/quick_submit_spec.js index 2dc2bb198e8..d3d65892aff 100644 --- a/spec/frontend/behaviors/quick_submit_spec.js +++ b/spec/frontend/behaviors/quick_submit_spec.js @@ -17,7 +17,7 @@ describe('Quick Submit behavior', () => { submit: jest.fn(), }; - $('form').submit(e => { + $('form').submit((e) => { // Prevent a form submit from moving us off the testing page e.preventDefault(); // Explicitly call the spie to know this function get's not called diff --git a/spec/frontend/behaviors/requires_input_spec.js b/spec/frontend/behaviors/requires_input_spec.js index 617fe49b059..0f27f89d6dc 100644 --- a/spec/frontend/behaviors/requires_input_spec.js +++ b/spec/frontend/behaviors/requires_input_spec.js @@ -32,30 +32,18 @@ describe('requiresInput', () => { it('enables submit when all required fields receive input', () => { $('.js-requires-input').requiresInput(); - $('#required1') - .val('input1') - .change(); + $('#required1').val('input1').change(); expect(submitButton).toBeDisabled(); - $('#optional1') - .val('input1') - .change(); + $('#optional1').val('input1').change(); expect(submitButton).toBeDisabled(); - $('#required2') - .val('input2') - .change(); - $('#required3') - .val('input3') - .change(); - $('#required4') - .val('input4') - .change(); - $('#required5') - .val('1') - .change(); + $('#required2').val('input2').change(); + $('#required3').val('input3').change(); + $('#required4').val('input4').change(); + $('#required5').val('1').change(); expect($('.submit')).not.toBeDisabled(); }); diff --git a/spec/frontend/behaviors/secret_values_spec.js b/spec/frontend/behaviors/secret_values_spec.js index 5aaab093c0c..06155017dd1 100644 --- a/spec/frontend/behaviors/secret_values_spec.js +++ b/spec/frontend/behaviors/secret_values_spec.js @@ -18,7 +18,7 @@ function generateValueMarkup( function generateFixtureMarkup(secrets, isRevealed, valueClass, placeholderClass) { return ` <div class="js-secret-container"> - ${secrets.map(secret => generateValueMarkup(secret, valueClass, placeholderClass)).join('')} + ${secrets.map((secret) => generateValueMarkup(secret, valueClass, placeholderClass)).join('')} <button class="js-secret-value-reveal-button" data-secret-reveal-status="${isRevealed}" @@ -122,12 +122,12 @@ describe('setupSecretValues', () => { const placeholders = wrapper.querySelectorAll('.js-secret-value-placeholder'); expect(values.length).toEqual(3); - values.forEach(value => { + values.forEach((value) => { expect(value.classList.contains('hide')).toEqual(true); }); expect(placeholders.length).toEqual(3); - placeholders.forEach(placeholder => { + placeholders.forEach((placeholder) => { expect(placeholder.classList.contains('hide')).toEqual(false); }); }); @@ -141,24 +141,24 @@ describe('setupSecretValues', () => { revealButton.click(); expect(values.length).toEqual(3); - values.forEach(value => { + values.forEach((value) => { expect(value.classList.contains('hide')).toEqual(false); }); expect(placeholders.length).toEqual(3); - placeholders.forEach(placeholder => { + placeholders.forEach((placeholder) => { expect(placeholder.classList.contains('hide')).toEqual(true); }); revealButton.click(); expect(values.length).toEqual(3); - values.forEach(value => { + values.forEach((value) => { expect(value.classList.contains('hide')).toEqual(true); }); expect(placeholders.length).toEqual(3); - placeholders.forEach(placeholder => { + placeholders.forEach((placeholder) => { expect(placeholder.classList.contains('hide')).toEqual(false); }); }); @@ -181,24 +181,24 @@ describe('setupSecretValues', () => { revealButton.click(); expect(values.length).toEqual(4); - values.forEach(value => { + values.forEach((value) => { expect(value.classList.contains('hide')).toEqual(false); }); expect(placeholders.length).toEqual(4); - placeholders.forEach(placeholder => { + placeholders.forEach((placeholder) => { expect(placeholder.classList.contains('hide')).toEqual(true); }); revealButton.click(); expect(values.length).toEqual(4); - values.forEach(value => { + values.forEach((value) => { expect(value.classList.contains('hide')).toEqual(true); }); expect(placeholders.length).toEqual(4); - placeholders.forEach(placeholder => { + placeholders.forEach((placeholder) => { expect(placeholder.classList.contains('hide')).toEqual(false); }); }); diff --git a/spec/frontend/behaviors/shortcuts/keybindings_spec.js b/spec/frontend/behaviors/shortcuts/keybindings_spec.js index 23fea79f828..d05b3fbdce2 100644 --- a/spec/frontend/behaviors/shortcuts/keybindings_spec.js +++ b/spec/frontend/behaviors/shortcuts/keybindings_spec.js @@ -9,7 +9,7 @@ describe('~/behaviors/shortcuts/keybindings.js', () => { useLocalStorageSpy(); }); - const setupCustomizations = async customizationsAsString => { + const setupCustomizations = async (customizationsAsString) => { localStorage.clear(); if (customizationsAsString) { diff --git a/spec/frontend/behaviors/shortcuts/shortcuts_issuable_spec.js b/spec/frontend/behaviors/shortcuts/shortcuts_issuable_spec.js index 77dcc28dd48..94ba1615c89 100644 --- a/spec/frontend/behaviors/shortcuts/shortcuts_issuable_spec.js +++ b/spec/frontend/behaviors/shortcuts/shortcuts_issuable_spec.js @@ -15,7 +15,7 @@ describe('ShortcutsIssuable', () => { preloadFixtures(snippetShowFixtureName, mrShowFixtureName); - beforeAll(done => { + beforeAll((done) => { initCopyAsGFM(); // Fake call to nodeToGfm so the import of lazy bundle happened @@ -81,7 +81,7 @@ describe('ShortcutsIssuable', () => { stubSelection('<p>Selected text.</p>'); }); - it('leaves existing input intact', done => { + it('leaves existing input intact', (done) => { $(FORM_SELECTOR).val('This text was already here.'); expect($(FORM_SELECTOR).val()).toBe('This text was already here.'); @@ -96,7 +96,7 @@ describe('ShortcutsIssuable', () => { }); }); - it('triggers `input`', done => { + it('triggers `input`', (done) => { let triggered = false; $(FORM_SELECTOR).on('input', () => { triggered = true; @@ -110,7 +110,7 @@ describe('ShortcutsIssuable', () => { }); }); - it('triggers `focus`', done => { + it('triggers `focus`', (done) => { const spy = jest.spyOn(document.querySelector(FORM_SELECTOR), 'focus'); ShortcutsIssuable.replyWithSelectedText(true); @@ -122,7 +122,7 @@ describe('ShortcutsIssuable', () => { }); describe('with a one-line selection', () => { - it('quotes the selection', done => { + it('quotes the selection', (done) => { stubSelection('<p>This text has been selected.</p>'); ShortcutsIssuable.replyWithSelectedText(true); @@ -134,7 +134,7 @@ describe('ShortcutsIssuable', () => { }); describe('with a multi-line selection', () => { - it('quotes the selected lines as a group', done => { + it('quotes the selected lines as a group', (done) => { stubSelection( '<p>Selected line one.</p>\n<p>Selected line two.</p>\n<p>Selected line three.</p>', ); @@ -154,7 +154,7 @@ describe('ShortcutsIssuable', () => { stubSelection('<p>Selected text.</p>', true); }); - it('does not add anything to the input', done => { + it('does not add anything to the input', (done) => { ShortcutsIssuable.replyWithSelectedText(true); setImmediate(() => { @@ -163,7 +163,7 @@ describe('ShortcutsIssuable', () => { }); }); - it('triggers `focus`', done => { + it('triggers `focus`', (done) => { const spy = jest.spyOn(document.querySelector(FORM_SELECTOR), 'focus'); ShortcutsIssuable.replyWithSelectedText(true); @@ -179,7 +179,7 @@ describe('ShortcutsIssuable', () => { stubSelection('<div class="md">Selected text.</div><p>Invalid selected text.</p>', true); }); - it('only adds the valid part to the input', done => { + it('only adds the valid part to the input', (done) => { ShortcutsIssuable.replyWithSelectedText(true); setImmediate(() => { @@ -188,7 +188,7 @@ describe('ShortcutsIssuable', () => { }); }); - it('triggers `focus`', done => { + it('triggers `focus`', (done) => { const spy = jest.spyOn(document.querySelector(FORM_SELECTOR), 'focus'); ShortcutsIssuable.replyWithSelectedText(true); @@ -198,7 +198,7 @@ describe('ShortcutsIssuable', () => { }); }); - it('triggers `input`', done => { + it('triggers `input`', (done) => { let triggered = false; $(FORM_SELECTOR).on('input', () => { triggered = true; @@ -233,7 +233,7 @@ describe('ShortcutsIssuable', () => { }); }); - it('adds the quoted selection to the input', done => { + it('adds the quoted selection to the input', (done) => { ShortcutsIssuable.replyWithSelectedText(true); setImmediate(() => { @@ -242,7 +242,7 @@ describe('ShortcutsIssuable', () => { }); }); - it('triggers `focus`', done => { + it('triggers `focus`', (done) => { const spy = jest.spyOn(document.querySelector(FORM_SELECTOR), 'focus'); ShortcutsIssuable.replyWithSelectedText(true); @@ -252,7 +252,7 @@ describe('ShortcutsIssuable', () => { }); }); - it('triggers `input`', done => { + it('triggers `input`', (done) => { let triggered = false; $(FORM_SELECTOR).on('input', () => { triggered = true; @@ -287,7 +287,7 @@ describe('ShortcutsIssuable', () => { }); }); - it('does not add anything to the input', done => { + it('does not add anything to the input', (done) => { ShortcutsIssuable.replyWithSelectedText(true); setImmediate(() => { @@ -296,7 +296,7 @@ describe('ShortcutsIssuable', () => { }); }); - it('triggers `focus`', done => { + it('triggers `focus`', (done) => { const spy = jest.spyOn(document.querySelector(FORM_SELECTOR), 'focus'); ShortcutsIssuable.replyWithSelectedText(true); @@ -308,7 +308,7 @@ describe('ShortcutsIssuable', () => { }); describe('with a valid selection with no text content', () => { - it('returns the proper markdown', done => { + it('returns the proper markdown', (done) => { stubSelection('<img src="https://gitlab.com/logo.png" alt="logo" />'); ShortcutsIssuable.replyWithSelectedText(true); @@ -334,7 +334,7 @@ describe('ShortcutsIssuable', () => { '.sidebar-source-branch button', ); - [sidebarCollapsedBtn, sidebarExpandedBtn].forEach(btn => jest.spyOn(btn, 'click')); + [sidebarCollapsedBtn, sidebarExpandedBtn].forEach((btn) => jest.spyOn(btn, 'click')); }); afterEach(() => { |