Add latest changes from gitlab-org/gitlab@master

3 files changed, 266 insertions, 1 deletions

diff --git a/spec/frontend/jobs/components/job_log_controllers_spec.js b/spec/frontend/jobs/components/job_log_controllers_spec.js
index cd3ee734466..cc97d111c06 100644
--- a/spec/frontend/jobs/components/job_log_controllers_spec.js
+++ b/spec/frontend/jobs/components/job_log_controllers_spec.js
@@ -1,6 +1,11 @@
+import { GlSearchBoxByClick } from '@gitlab/ui';
 import { mount } from '@vue/test-utils';
 import { nextTick } from 'vue';
 import JobLogControllers from '~/jobs/components/job_log_controllers.vue';
+import HelpPopover from '~/vue_shared/components/help_popover.vue';
+import { mockJobLog } from '../mock_data';
+
+const mockToastShow = jest.fn();
 
 describe('Job log controllers', () => {
   let wrapper;
@@ -19,14 +24,30 @@ describe('Job log controllers', () => {
     isScrollBottomDisabled: false,
     isScrollingDown: true,
     isJobLogSizeVisible: true,
+    jobLog: mockJobLog,
   };
 
-  const createWrapper = (props) => {
+  const createWrapper = (props, jobLogSearch = false) => {
     wrapper = mount(JobLogControllers, {
       propsData: {
         ...defaultProps,
         ...props,
       },
+      provide: {
+        glFeatures: {
+          jobLogSearch,
+        },
+      },
+      data() {
+        return {
+          searchTerm: '82',
+        };
+      },
+      mocks: {
+        $toast: {
+          show: mockToastShow,
+        },
+      },
     });
   };
 
@@ -35,6 +56,8 @@ describe('Job log controllers', () => {
   const findRawLinkController = () => wrapper.find('[data-testid="job-raw-link-controller"]');
   const findScrollTop = () => wrapper.find('[data-testid="job-controller-scroll-top"]');
   const findScrollBottom = () => wrapper.find('[data-testid="job-controller-scroll-bottom"]');
+  const findJobLogSearch = () => wrapper.findComponent(GlSearchBoxByClick);
+  const findSearchHelp = () => wrapper.findComponent(HelpPopover);
 
   describe('Truncate information', () => {
     describe('with isJobLogSizeVisible', () => {
@@ -179,4 +202,40 @@ describe('Job log controllers', () => {
       });
     });
   });
+
+  describe('Job log search', () => {
+    describe('with feature flag off', () => {
+      it('does not display job log search', () => {
+        createWrapper();
+
+        expect(findJobLogSearch().exists()).toBe(false);
+        expect(findSearchHelp().exists()).toBe(false);
+      });
+    });
+
+    describe('with feature flag on', () => {
+      beforeEach(() => {
+        createWrapper({}, { jobLogSearch: true });
+      });
+
+      it('displays job log search', () => {
+        expect(findJobLogSearch().exists()).toBe(true);
+        expect(findSearchHelp().exists()).toBe(true);
+      });
+
+      it('emits search results', () => {
+        const expectedSearchResults = [[[mockJobLog[6].lines[1], mockJobLog[6].lines[2]]]];
+
+        findJobLogSearch().vm.$emit('submit');
+
+        expect(wrapper.emitted('searchResults')).toEqual(expectedSearchResults);
+      });
+
+      it('clears search results', () => {
+        findJobLogSearch().vm.$emit('clear');
+
+        expect(wrapper.emitted('searchResults')).toEqual([[[]]]);
+      });
+    });
+  });
 });
diff --git a/spec/frontend/jobs/components/log/line_spec.js b/spec/frontend/jobs/components/log/line_spec.js
index d184696cd1f..bf80d90e299 100644
--- a/spec/frontend/jobs/components/log/line_spec.js
+++ b/spec/frontend/jobs/components/log/line_spec.js
@@ -179,4 +179,46 @@ describe('Job Log Line', () => {
       expect(findLink().exists()).toBe(false);
     });
   });
+
+  describe('job log search', () => {
+    const mockSearchResults = [
+      {
+        offset: 1533,
+        content: [{ text: '$ echo "82.71"', style: 'term-fg-l-green term-bold' }],
+        section: 'step-script',
+        lineNumber: 20,
+      },
+      { offset: 1560, content: [{ text: '82.71' }], section: 'step-script', lineNumber: 21 },
+    ];
+
+    it('applies highlight class to search result elements', () => {
+      createComponent({
+        line: {
+          offset: 1560,
+          content: [{ text: '82.71' }],
+          section: 'step-script',
+          lineNumber: 21,
+        },
+        path: '/root/ci-project/-/jobs/1089',
+        searchResults: mockSearchResults,
+      });
+
+      expect(wrapper.classes()).toContain('gl-bg-gray-500');
+    });
+
+    it('does not apply highlight class to search result elements', () => {
+      createComponent({
+        line: {
+          offset: 1560,
+          content: [{ text: 'docker' }],
+          section: 'step-script',
+          lineNumber: 29,
+        },
+        path: '/root/ci-project/-/jobs/1089',
+        searchResults: mockSearchResults,
+      });
+
+      expect(wrapper.classes()).not.toContain('gl-bg-gray-500');
+    });
+  });
 });
diff --git a/spec/frontend/jobs/mock_data.js b/spec/frontend/jobs/mock_data.js
index 4d7ea6a46bd..bf238b2e39a 100644
--- a/spec/frontend/jobs/mock_data.js
+++ b/spec/frontend/jobs/mock_data.js
@@ -1414,3 +1414,167 @@ export const unscheduleMutationResponse = {
     },
   },
 };
+
+export const mockJobLog = [
+  { offset: 0, content: [{ text: 'Running with gitlab-runner 15.0.0 (febb2a09)' }], lineNumber: 0 },
+  { offset: 54, content: [{ text: '  on colima-docker EwM9WzgD' }], lineNumber: 1 },
+  {
+    isClosed: false,
+    isHeader: true,
+    line: {
+      offset: 91,
+      content: [{ text: 'Resolving secrets', style: 'term-fg-l-cyan term-bold' }],
+      section: 'resolve-secrets',
+      section_header: true,
+      lineNumber: 2,
+      section_duration: '00:00',
+    },
+    lines: [],
+  },
+  {
+    isClosed: false,
+    isHeader: true,
+    line: {
+      offset: 218,
+      content: [{ text: 'Preparing the "docker" executor', style: 'term-fg-l-cyan term-bold' }],
+      section: 'prepare-executor',
+      section_header: true,
+      lineNumber: 4,
+      section_duration: '00:01',
+    },
+    lines: [
+      {
+        offset: 317,
+        content: [{ text: 'Using Docker executor with image ruby:2.7 ...' }],
+        section: 'prepare-executor',
+        lineNumber: 5,
+      },
+      {
+        offset: 372,
+        content: [{ text: 'Pulling docker image ruby:2.7 ...' }],
+        section: 'prepare-executor',
+        lineNumber: 6,
+      },
+      {
+        offset: 415,
+        content: [
+          {
+            text:
+              'Using docker image sha256:55106bf6ba7f452c38d01ea760affc6ceb67d4b60068ffadab98d1b7b007668c for ruby:2.7 with digest ruby@sha256:23d08a4bae1a12ee3fce017f83204fcf9a02243443e4a516e65e5ff73810a449 ...',
+          },
+        ],
+        section: 'prepare-executor',
+        lineNumber: 7,
+      },
+    ],
+  },
+  {
+    isClosed: false,
+    isHeader: true,
+    line: {
+      offset: 665,
+      content: [{ text: 'Preparing environment', style: 'term-fg-l-cyan term-bold' }],
+      section: 'prepare-script',
+      section_header: true,
+      lineNumber: 9,
+      section_duration: '00:01',
+    },
+    lines: [
+      {
+        offset: 752,
+        content: [
+          { text: 'Running on runner-ewm9wzgd-project-20-concurrent-0 via 8ea689ec6969...' },
+        ],
+        section: 'prepare-script',
+        lineNumber: 10,
+      },
+    ],
+  },
+  {
+    isClosed: false,
+    isHeader: true,
+    line: {
+      offset: 865,
+      content: [{ text: 'Getting source from Git repository', style: 'term-fg-l-cyan term-bold' }],
+      section: 'get-sources',
+      section_header: true,
+      lineNumber: 12,
+      section_duration: '00:01',
+    },
+    lines: [
+      {
+        offset: 962,
+        content: [
+          {
+            text: 'Fetching changes with git depth set to 20...',
+            style: 'term-fg-l-green term-bold',
+          },
+        ],
+        section: 'get-sources',
+        lineNumber: 13,
+      },
+      {
+        offset: 1019,
+        content: [
+          { text: 'Reinitialized existing Git repository in /builds/root/ci-project/.git/' },
+        ],
+        section: 'get-sources',
+        lineNumber: 14,
+      },
+      {
+        offset: 1090,
+        content: [{ text: 'Checking out e0f63d76 as main...', style: 'term-fg-l-green term-bold' }],
+        section: 'get-sources',
+        lineNumber: 15,
+      },
+      {
+        offset: 1136,
+        content: [{ text: 'Skipping Git submodules setup', style: 'term-fg-l-green term-bold' }],
+        section: 'get-sources',
+        lineNumber: 16,
+      },
+    ],
+  },
+  {
+    isClosed: false,
+    isHeader: true,
+    line: {
+      offset: 1217,
+      content: [
+        {
+          text: 'Executing "step_script" stage of the job script',
+          style: 'term-fg-l-cyan term-bold',
+        },
+      ],
+      section: 'step-script',
+      section_header: true,
+      lineNumber: 18,
+      section_duration: '00:00',
+    },
+    lines: [
+      {
+        offset: 1327,
+        content: [
+          {
+            text:
+              'Using docker image sha256:55106bf6ba7f452c38d01ea760affc6ceb67d4b60068ffadab98d1b7b007668c for ruby:2.7 with digest ruby@sha256:23d08a4bae1a12ee3fce017f83204fcf9a02243443e4a516e65e5ff73810a449 ...',
+          },
+        ],
+        section: 'step-script',
+        lineNumber: 19,
+      },
+      {
+        offset: 1533,
+        content: [{ text: '$ echo "82.71"', style: 'term-fg-l-green term-bold' }],
+        section: 'step-script',
+        lineNumber: 20,
+      },
+      { offset: 1560, content: [{ text: '82.71' }], section: 'step-script', lineNumber: 21 },
+    ],
+  },
+  {
+    offset: 1605,
+    content: [{ text: 'Job succeeded', style: 'term-fg-l-green term-bold' }],
+    lineNumber: 23,
+  },
+];