From ac48f7c24110a7a1e0a0aa49fc7838ab03c28374 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 12 Apr 2023 21:18:30 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- spec/frontend/ide/components/activity_bar_spec.js | 4 ++-- spec/frontend/ide/components/commit_sidebar/form_spec.js | 2 +- spec/frontend/ide/components/commit_sidebar/list_spec.js | 2 +- spec/frontend/ide/components/ide_review_spec.js | 2 +- spec/frontend/ide/components/ide_spec.js | 2 +- spec/frontend/ide/components/repo_editor_spec.js | 14 +++++++------- .../ide/components/shared/commit_message_field_spec.js | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) (limited to 'spec/frontend/ide/components') diff --git a/spec/frontend/ide/components/activity_bar_spec.js b/spec/frontend/ide/components/activity_bar_spec.js index 49b39ea5ddc..95582aca8fd 100644 --- a/spec/frontend/ide/components/activity_bar_spec.js +++ b/spec/frontend/ide/components/activity_bar_spec.js @@ -50,13 +50,13 @@ describe('IDE ActivityBar component', () => { expect(button.classes('active')).toBe(true); }); - it.each(MODES_WITHOUT_EDIT)('is correctly set after clicking %s mode button', async (mode) => { + it.each(MODES_WITHOUT_EDIT)('is correctly set after clicking %s mode button', (mode) => { mountComponent(); testSettingActiveItem(mode); }); - it('is correctly set after clicking edit mode button', async () => { + it('is correctly set after clicking edit mode button', () => { // The default currentActivityView is leftSidebarViews.edit.name, // so for the 'edit' mode, we pass a different currentActivityView. mountComponent({ currentActivityView: leftSidebarViews.review.name }); diff --git a/spec/frontend/ide/components/commit_sidebar/form_spec.js b/spec/frontend/ide/components/commit_sidebar/form_spec.js index ba30073dff2..04dd81d9fda 100644 --- a/spec/frontend/ide/components/commit_sidebar/form_spec.js +++ b/spec/frontend/ide/components/commit_sidebar/form_spec.js @@ -89,7 +89,7 @@ describe('IDE commit form', () => { ${'when user cannot push'} | ${['test']} | ${{ pushCode: false }} | ${goToEditView} | ${findBeginCommitButtonData} | ${true} | ${MSG_CANNOT_PUSH_CODE} ${'when user cannot push'} | ${['test']} | ${{ pushCode: false }} | ${goToCommitView} | ${findCommitButtonData} | ${true} | ${MSG_CANNOT_PUSH_CODE} `('$desc', ({ stagedFiles, userPermissions, viewFn, buttonFn, disabled, tooltip }) => { - beforeEach(async () => { + beforeEach(() => { store.state.stagedFiles = stagedFiles; store.state.projects.abcproject.userPermissions = userPermissions; diff --git a/spec/frontend/ide/components/commit_sidebar/list_spec.js b/spec/frontend/ide/components/commit_sidebar/list_spec.js index 6b9ba939a87..c0b0cb0b732 100644 --- a/spec/frontend/ide/components/commit_sidebar/list_spec.js +++ b/spec/frontend/ide/components/commit_sidebar/list_spec.js @@ -20,7 +20,7 @@ describe('Multi-file editor commit sidebar list', () => { }); describe('with a list of files', () => { - beforeEach(async () => { + beforeEach(() => { const f = file('file name'); f.changed = true; wrapper = mountComponent({ fileList: [f] }); diff --git a/spec/frontend/ide/components/ide_review_spec.js b/spec/frontend/ide/components/ide_review_spec.js index e6fd018969f..7ae8cfac935 100644 --- a/spec/frontend/ide/components/ide_review_spec.js +++ b/spec/frontend/ide/components/ide_review_spec.js @@ -63,7 +63,7 @@ describe('IDE review mode', () => { await wrapper.vm.reactivate(); }); - it('updates viewer to "mrdiff"', async () => { + it('updates viewer to "mrdiff"', () => { expect(store.state.viewer).toBe('mrdiff'); }); }); diff --git a/spec/frontend/ide/components/ide_spec.js b/spec/frontend/ide/components/ide_spec.js index ad4484587d3..f2a684ab65e 100644 --- a/spec/frontend/ide/components/ide_spec.js +++ b/spec/frontend/ide/components/ide_spec.js @@ -64,7 +64,7 @@ describe('WebIDE', () => { }); }); - it('renders "New file" button in empty repo', async () => { + it('renders "New file" button in empty repo', () => { expect(wrapper.find('[title="New file"]').exists()).toBe(true); }); }); diff --git a/spec/frontend/ide/components/repo_editor_spec.js b/spec/frontend/ide/components/repo_editor_spec.js index 9253bfc7e71..6747ec97050 100644 --- a/spec/frontend/ide/components/repo_editor_spec.js +++ b/spec/frontend/ide/components/repo_editor_spec.js @@ -293,7 +293,7 @@ describe('RepoEditor', () => { }); describe('when file changes to non-markdown file', () => { - beforeEach(async () => { + beforeEach(() => { wrapper.setProps({ file: dummyFile.empty }); }); @@ -601,7 +601,7 @@ describe('RepoEditor', () => { const f = createRemoteFile('newFile'); Vue.set(vm.$store.state.entries, f.path, f); - jest.spyOn(service, 'getRawFileData').mockImplementation(async () => { + jest.spyOn(service, 'getRawFileData').mockImplementation(() => { expect(vm.file.loading).toBe(true); // switching from edit to diff mode usually triggers editor initialization @@ -609,7 +609,7 @@ describe('RepoEditor', () => { jest.runOnlyPendingTimers(); - return 'rawFileData123\n'; + return Promise.resolve('rawFileData123\n'); }); wrapper.setProps({ @@ -630,18 +630,18 @@ describe('RepoEditor', () => { jest .spyOn(service, 'getRawFileData') - .mockImplementation(async () => { + .mockImplementation(() => { // opening fileB while the content of fileA is still being fetched wrapper.setProps({ file: fileB, }); - return aContent; + return Promise.resolve(aContent); }) - .mockImplementationOnce(async () => { + .mockImplementationOnce(() => { // we delay returning fileB content // to make sure the editor doesn't initialize prematurely jest.advanceTimersByTime(30); - return bContent; + return Promise.resolve(bContent); }); wrapper.setProps({ diff --git a/spec/frontend/ide/components/shared/commit_message_field_spec.js b/spec/frontend/ide/components/shared/commit_message_field_spec.js index 186b1997497..ccf544b27b7 100644 --- a/spec/frontend/ide/components/shared/commit_message_field_spec.js +++ b/spec/frontend/ide/components/shared/commit_message_field_spec.js @@ -50,7 +50,7 @@ describe('CommitMessageField', () => { await nextTick(); }); - it('is added on textarea focus', async () => { + it('is added on textarea focus', () => { expect(wrapper.attributes('class')).toEqual( expect.stringContaining('gl-outline-none! gl-focus-ring-border-1-gray-900!'), ); -- cgit v1.2.3