Merge branch '221039-flaky-spec' into 'master'

Fix flaky spec in repo_editor_spec

Closes #221039

See merge request gitlab-org/gitlab!34804

spec/frontend/ide/components/repo_editor_spec.js

@@ -618,6 +618,11 @@ describe('RepoEditor', () => {
           });
         });
 
+      // Pasting an image does a lot of things like using the FileReader API,
+      // so, waitForPromises isn't very reliable (and causes a flaky spec)
+      // Read more about state.watch: https://vuex.vuejs.org/api/#watch
+      const waitForFileContentChange = () => watchState(s => s.entries['foo/bar.md'].content);
+
       beforeEach(() => {
         setFileName('bar.md');
 
@@ -637,13 +642,10 @@ describe('RepoEditor', () => {
         });
       });
 
-      // The following test is flaky
-      // see https://gitlab.com/gitlab-org/gitlab/-/issues/221039
-      // eslint-disable-next-line jest/no-disabled-tests
-      it.skip('adds an image entry to the same folder for a pasted image in a markdown file', () => {
+      it('adds an image entry to the same folder for a pasted image in a markdown file', () => {
         pasteImage();
 
-        return waitForPromises().then(() => {
+        return waitForFileContentChange().then(() => {
           expect(vm.$store.state.entries['foo/foo.png']).toMatchObject({
             path: 'foo/foo.png',
             type: 'blob',
@@ -657,10 +659,7 @@ describe('RepoEditor', () => {
       it("adds a markdown image tag to the file's contents", () => {
         pasteImage();
 
-        // Pasting an image does a lot of things like using the FileReader API,
-        // so, waitForPromises isn't very reliable (and causes a flaky spec)
-        // Read more about state.watch: https://vuex.vuejs.org/api/#watch
-        return watchState(s => s.entries['foo/bar.md'].content).then(() => {
+        return waitForFileContentChange().then(() => {
           expect(vm.file.content).toBe('hello world\n![foo.png](./foo.png)');
         });
       });