diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-01 15:06:05 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-01 15:06:05 +0000 |
commit | 05f4b2fb34dbb051b2ce5ddbc801ec42998c019c (patch) | |
tree | 0fd7a153f3ed7d00d40e428c08ab81ae3d863afe /spec/frontend/jobs | |
parent | 9e27f0d920cc3891fa7644c5cc0bc280c519fb20 (diff) | |
download | gitlab-ce-05f4b2fb34dbb051b2ce5ddbc801ec42998c019c.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/frontend/jobs')
-rw-r--r-- | spec/frontend/jobs/store/mutations_spec.js | 1 | ||||
-rw-r--r-- | spec/frontend/jobs/store/utils_spec.js | 93 |
2 files changed, 86 insertions, 8 deletions
diff --git a/spec/frontend/jobs/store/mutations_spec.js b/spec/frontend/jobs/store/mutations_spec.js index 8e5ab4b229a..6576f3d1ff2 100644 --- a/spec/frontend/jobs/store/mutations_spec.js +++ b/spec/frontend/jobs/store/mutations_spec.js @@ -73,6 +73,7 @@ describe('Jobs Store Mutations', () => { html, size: 511846, complete: true, + lines: [], }); expect(stateCopy.trace).toEqual(html); diff --git a/spec/frontend/jobs/store/utils_spec.js b/spec/frontend/jobs/store/utils_spec.js index 18f9026b487..9890e01460e 100644 --- a/spec/frontend/jobs/store/utils_spec.js +++ b/spec/frontend/jobs/store/utils_spec.js @@ -6,6 +6,7 @@ import { addDurationToHeader, isCollapsibleSection, findOffsetAndRemove, + getIncrementalLineNumber, } from '~/jobs/store/utils'; import { utilsMockData, @@ -292,11 +293,91 @@ describe('Jobs Store Utils', () => { }); }); + describe('getIncrementalLineNumber', () => { + describe('when last line is 0', () => { + it('returns 1', () => { + const log = [ + { + content: [], + lineNumber: 0, + }, + ]; + + expect(getIncrementalLineNumber(log)).toEqual(1); + }); + }); + + describe('with unnested line', () => { + it('returns the lineNumber of the last item in the array', () => { + const log = [ + { + content: [], + lineNumber: 10, + }, + { + content: [], + lineNumber: 101, + }, + ]; + + expect(getIncrementalLineNumber(log)).toEqual(102); + }); + }); + + describe('when last line is the header section', () => { + it('returns the lineNumber of the last item in the array', () => { + const log = [ + { + content: [], + lineNumber: 10, + }, + { + isHeader: true, + line: { + lineNumber: 101, + content: [], + }, + lines: [], + }, + ]; + + expect(getIncrementalLineNumber(log)).toEqual(102); + }); + }); + + describe('when last line is a nested line', () => { + it('returns the lineNumber of the last item in the nested array', () => { + const log = [ + { + content: [], + lineNumber: 10, + }, + { + isHeader: true, + line: { + lineNumber: 101, + content: [], + }, + lines: [ + { + lineNumber: 102, + content: [], + }, + { lineNumber: 103, content: [] }, + ], + }, + ]; + + expect(getIncrementalLineNumber(log)).toEqual(104); + }); + }); + }); + describe('updateIncrementalTrace', () => { describe('without repeated section', () => { it('concats and parses both arrays', () => { const oldLog = logLinesParser(originalTrace); - const result = updateIncrementalTrace(originalTrace, oldLog, regularIncremental); + const result = updateIncrementalTrace(regularIncremental, oldLog); expect(result).toEqual([ { @@ -324,7 +405,7 @@ describe('Jobs Store Utils', () => { describe('with regular line repeated offset', () => { it('updates the last line and formats with the incremental part', () => { const oldLog = logLinesParser(originalTrace); - const result = updateIncrementalTrace(originalTrace, oldLog, regularIncrementalRepeated); + const result = updateIncrementalTrace(regularIncrementalRepeated, oldLog); expect(result).toEqual([ { @@ -343,7 +424,7 @@ describe('Jobs Store Utils', () => { describe('with header line repeated', () => { it('updates the header line and formats with the incremental part', () => { const oldLog = logLinesParser(headerTrace); - const result = updateIncrementalTrace(headerTrace, oldLog, headerTraceIncremental); + const result = updateIncrementalTrace(headerTraceIncremental, oldLog); expect(result).toEqual([ { @@ -369,11 +450,7 @@ describe('Jobs Store Utils', () => { describe('with collapsible line repeated', () => { it('updates the collapsible line and formats with the incremental part', () => { const oldLog = logLinesParser(collapsibleTrace); - const result = updateIncrementalTrace( - collapsibleTrace, - oldLog, - collapsibleTraceIncremental, - ); + const result = updateIncrementalTrace(collapsibleTraceIncremental, oldLog); expect(result).toEqual([ { |