Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
32fe88b9
Commit
32fe88b9
authored
Jun 29, 2020
by
Stan Hu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix spelling of collapsible
Also renames CollaspibleLogSection -> CollapsibleLogSection
parent
6772a21a
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
11 additions
and
11 deletions
+11
-11
app/assets/javascripts/jobs/components/log/collapsible_section.vue
...s/javascripts/jobs/components/log/collapsible_section.vue
+1
-1
app/assets/javascripts/jobs/components/log/log.vue
app/assets/javascripts/jobs/components/log/log.vue
+3
-3
app/assets/javascripts/jobs/store/actions.js
app/assets/javascripts/jobs/store/actions.js
+1
-1
app/assets/javascripts/jobs/store/utils.js
app/assets/javascripts/jobs/store/utils.js
+2
-2
spec/frontend/jobs/components/log/collapsible_section_spec.js
.../frontend/jobs/components/log/collapsible_section_spec.js
+2
-2
spec/frontend/jobs/store/utils_spec.js
spec/frontend/jobs/store/utils_spec.js
+2
-2
No files found.
app/assets/javascripts/jobs/components/log/collapsible_section.vue
View file @
32fe88b9
...
...
@@ -3,7 +3,7 @@ import LogLine from './line.vue';
import
LogLineHeader
from
'
./line_header.vue
'
;
export
default
{
name
:
'
Coll
pa
sibleLogSection
'
,
name
:
'
Coll
ap
sibleLogSection
'
,
components
:
{
LogLine
,
LogLineHeader
,
...
...
app/assets/javascripts/jobs/components/log/log.vue
View file @
32fe88b9
<
script
>
import
{
mapState
,
mapActions
}
from
'
vuex
'
;
import
Coll
pa
sibleLogSection
from
'
./collapsible_section.vue
'
;
import
Coll
ap
sibleLogSection
from
'
./collapsible_section.vue
'
;
import
LogLine
from
'
./line.vue
'
;
export
default
{
components
:
{
Coll
pa
sibleLogSection
,
Coll
ap
sibleLogSection
,
LogLine
,
},
computed
:
{
...
...
@@ -51,7 +51,7 @@ export default {
<
template
>
<code
class=
"job-log d-block"
data-qa-selector=
"job_log_content"
>
<template
v-for=
"(section, index) in trace"
>
<coll
pa
sible-log-section
<coll
ap
sible-log-section
v-if=
"section.isHeader"
:key=
"`collapsible-$
{index}`"
:section="section"
...
...
app/assets/javascripts/jobs/store/actions.js
View file @
32fe88b9
...
...
@@ -195,7 +195,7 @@ export const receiveTraceError = ({ dispatch }) => {
flash
(
__
(
'
An error occurred while fetching the job log.
'
));
};
/**
* When the user clicks a coll
pa
sible line in the job
* When the user clicks a coll
ap
sible line in the job
* log, we commit a mutation to update the state
*
* @param {Object} section
...
...
app/assets/javascripts/jobs/store/utils.js
View file @
32fe88b9
...
...
@@ -11,7 +11,7 @@ export const parseLine = (line = {}, lineNumber) => ({
/**
* When a line has `section_header` set to true, we create a new
* structure to allow to nest the lines that belong to the
* coll
pa
sible section
* coll
ap
sible section
*
* @param Object line
* @param Number lineNumber
...
...
@@ -91,7 +91,7 @@ export const getIncrementalLineNumber = acc => {
* Parses the job log content into a structure usable by the template
*
* For collaspible lines (section_header = true):
* - creates a new array to hold the lines that are coll
pa
sible,
* - creates a new array to hold the lines that are coll
ap
sible,
* - adds a isClosed property to handle toggle
* - adds a isHeader property to handle template logic
* - adds the section_duration
...
...
spec/frontend/jobs/components/log/collapsible_section_spec.js
View file @
32fe88b9
import
{
mount
}
from
'
@vue/test-utils
'
;
import
Coll
pa
sibleSection
from
'
~/jobs/components/log/collapsible_section.vue
'
;
import
Coll
ap
sibleSection
from
'
~/jobs/components/log/collapsible_section.vue
'
;
import
{
collapsibleSectionClosed
,
collapsibleSectionOpened
}
from
'
./mock_data
'
;
describe
(
'
Job Log Collapsible Section
'
,
()
=>
{
...
...
@@ -11,7 +11,7 @@ describe('Job Log Collapsible Section', () => {
const
findCollapsibleLineSvg
=
()
=>
wrapper
.
find
(
'
.collapsible-line svg
'
);
const
createComponent
=
(
props
=
{})
=>
{
wrapper
=
mount
(
Coll
pa
sibleSection
,
{
wrapper
=
mount
(
Coll
ap
sibleSection
,
{
propsData
:
{
...
props
,
},
...
...
spec/frontend/jobs/store/utils_spec.js
View file @
32fe88b9
...
...
@@ -181,7 +181,7 @@ describe('Jobs Store Utils', () => {
});
});
describe
(
'
coll
pa
sible section
'
,
()
=>
{
describe
(
'
coll
ap
sible section
'
,
()
=>
{
it
(
'
adds a `isClosed` property
'
,
()
=>
{
expect
(
result
[
1
].
isClosed
).
toEqual
(
false
);
});
...
...
@@ -190,7 +190,7 @@ describe('Jobs Store Utils', () => {
expect
(
result
[
1
].
isHeader
).
toEqual
(
true
);
});
it
(
'
creates a lines array property with the content of the coll
pa
sible section
'
,
()
=>
{
it
(
'
creates a lines array property with the content of the coll
ap
sible section
'
,
()
=>
{
expect
(
result
[
1
].
lines
.
length
).
toEqual
(
2
);
expect
(
result
[
1
].
lines
[
0
].
content
).
toEqual
(
utilsMockData
[
2
].
content
);
expect
(
result
[
1
].
lines
[
1
].
content
).
toEqual
(
utilsMockData
[
3
].
content
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment