diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-20 15:40:28 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-20 15:40:28 +0000 |
commit | b595cb0c1dec83de5bdee18284abe86614bed33b (patch) | |
tree | 8c3d4540f193c5ff98019352f554e921b3a41a72 /spec/frontend/jobs/store/utils_spec.js | |
parent | 2f9104a328fc8a4bddeaa4627b595166d24671d0 (diff) | |
download | gitlab-ce-b595cb0c1dec83de5bdee18284abe86614bed33b.tar.gz |
Add latest changes from gitlab-org/gitlab@15-2-stable-eev15.2.0-rc42
Diffstat (limited to 'spec/frontend/jobs/store/utils_spec.js')
-rw-r--r-- | spec/frontend/jobs/store/utils_spec.js | 111 |
1 files changed, 6 insertions, 105 deletions
diff --git a/spec/frontend/jobs/store/utils_spec.js b/spec/frontend/jobs/store/utils_spec.js index 92ac33c8792..9458c2184f5 100644 --- a/spec/frontend/jobs/store/utils_spec.js +++ b/spec/frontend/jobs/store/utils_spec.js @@ -1,6 +1,5 @@ import { logLinesParser, - logLinesParserLegacy, updateIncrementalJobLog, parseHeaderLine, parseLine, @@ -18,8 +17,6 @@ import { headerTraceIncremental, collapsibleTrace, collapsibleTraceIncremental, - multipleCollapsibleSectionsMockData, - backwardsCompatibilityTrace, } from '../components/log/mock_data'; describe('Jobs Store Utils', () => { @@ -178,11 +175,11 @@ describe('Jobs Store Utils', () => { expect(isCollapsibleSection()).toEqual(false); }); }); - describe('logLinesParserLegacy', () => { + describe('logLinesParser', () => { let result; beforeEach(() => { - result = logLinesParserLegacy(utilsMockData); + result = logLinesParser(utilsMockData); }); describe('regular line', () => { @@ -219,102 +216,6 @@ describe('Jobs Store Utils', () => { }); }); - describe('logLinesParser', () => { - let result; - - beforeEach(() => { - result = logLinesParser(utilsMockData); - }); - - describe('regular line', () => { - it('adds a lineNumber property with correct index', () => { - expect(result.parsedLines[0].lineNumber).toEqual(1); - expect(result.parsedLines[1].line.lineNumber).toEqual(2); - }); - }); - - describe('collapsible section', () => { - it('adds a `isClosed` property', () => { - expect(result.parsedLines[1].isClosed).toEqual(false); - }); - - it('adds a `isHeader` property', () => { - expect(result.parsedLines[1].isHeader).toEqual(true); - }); - - it('creates a lines array property with the content of the collapsible section', () => { - expect(result.parsedLines[1].lines.length).toEqual(2); - expect(result.parsedLines[1].lines[0].content).toEqual(utilsMockData[2].content); - expect(result.parsedLines[1].lines[1].content).toEqual(utilsMockData[3].content); - }); - }); - - describe('section duration', () => { - it('adds the section information to the header section', () => { - expect(result.parsedLines[1].line.section_duration).toEqual( - utilsMockData[4].section_duration, - ); - }); - - it('does not add section duration as a line', () => { - expect(result.parsedLines[1].lines.includes(utilsMockData[4])).toEqual(false); - }); - }); - - describe('multiple collapsible sections', () => { - beforeEach(() => { - result = logLinesParser(multipleCollapsibleSectionsMockData); - }); - - it('should contain a section inside another section', () => { - const innerSection = [ - { - isClosed: false, - isHeader: true, - line: { - content: [{ text: '1st collapsible section' }], - lineNumber: 6, - offset: 1006, - section: 'collapsible-1', - section_duration: '01:00', - section_header: true, - }, - lines: [ - { - content: [ - { - text: - 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam lorem dolor, congue ac condimentum vitae', - }, - ], - lineNumber: 7, - offset: 1007, - section: 'collapsible-1', - }, - ], - }, - ]; - - expect(result.parsedLines[1].lines).toEqual(expect.arrayContaining(innerSection)); - }); - }); - - describe('backwards compatibility', () => { - beforeEach(() => { - result = logLinesParser(backwardsCompatibilityTrace); - }); - - it('should return an object with a parsedLines prop', () => { - expect(result).toEqual( - expect.objectContaining({ - parsedLines: expect.any(Array), - }), - ); - expect(result.parsedLines).toHaveLength(1); - }); - }); - }); - describe('findOffsetAndRemove', () => { describe('when last item is header', () => { const existingLog = [ @@ -490,7 +391,7 @@ describe('Jobs Store Utils', () => { describe('updateIncrementalJobLog', () => { describe('without repeated section', () => { it('concats and parses both arrays', () => { - const oldLog = logLinesParserLegacy(originalTrace); + const oldLog = logLinesParser(originalTrace); const result = updateIncrementalJobLog(regularIncremental, oldLog); expect(result).toEqual([ @@ -518,7 +419,7 @@ describe('Jobs Store Utils', () => { describe('with regular line repeated offset', () => { it('updates the last line and formats with the incremental part', () => { - const oldLog = logLinesParserLegacy(originalTrace); + const oldLog = logLinesParser(originalTrace); const result = updateIncrementalJobLog(regularIncrementalRepeated, oldLog); expect(result).toEqual([ @@ -537,7 +438,7 @@ describe('Jobs Store Utils', () => { describe('with header line repeated', () => { it('updates the header line and formats with the incremental part', () => { - const oldLog = logLinesParserLegacy(headerTrace); + const oldLog = logLinesParser(headerTrace); const result = updateIncrementalJobLog(headerTraceIncremental, oldLog); expect(result).toEqual([ @@ -563,7 +464,7 @@ describe('Jobs Store Utils', () => { describe('with collapsible line repeated', () => { it('updates the collapsible line and formats with the incremental part', () => { - const oldLog = logLinesParserLegacy(collapsibleTrace); + const oldLog = logLinesParser(collapsibleTrace); const result = updateIncrementalJobLog(collapsibleTraceIncremental, oldLog); expect(result).toEqual([ |