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
ea5fb9e3
Commit
ea5fb9e3
authored
Sep 17, 2021
by
pburdette
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change more trace instances
Change a few more trace instances to job log.
parent
41d44191
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
14 deletions
+14
-14
app/assets/javascripts/logs/stores/state.js
app/assets/javascripts/logs/stores/state.js
+1
-1
spec/frontend/jobs/components/job_log_controllers_spec.js
spec/frontend/jobs/components/job_log_controllers_spec.js
+5
-5
spec/frontend/jobs/store/actions_spec.js
spec/frontend/jobs/store/actions_spec.js
+6
-6
spec/frontend/jobs/store/mutations_spec.js
spec/frontend/jobs/store/mutations_spec.js
+2
-2
No files found.
app/assets/javascripts/logs/stores/state.js
View file @
ea5fb9e3
...
@@ -31,7 +31,7 @@ export default () => ({
...
@@ -31,7 +31,7 @@ export default () => ({
},
},
/**
/**
*
Logs including trace
*
Jobs with logs
*/
*/
logs
:
{
logs
:
{
lines
:
[],
lines
:
[],
...
...
spec/frontend/jobs/components/job_log_controllers_spec.js
View file @
ea5fb9e3
...
@@ -47,31 +47,31 @@ describe('Job log controllers', () => {
...
@@ -47,31 +47,31 @@ describe('Job log controllers', () => {
expect
(
findTruncatedInfo
().
text
()).
toMatch
(
'
499.95 KiB
'
);
expect
(
findTruncatedInfo
().
text
()).
toMatch
(
'
499.95 KiB
'
);
});
});
it
(
'
renders link to raw
trace
'
,
()
=>
{
it
(
'
renders link to raw
job log
'
,
()
=>
{
expect
(
findRawLink
().
attributes
(
'
href
'
)).
toBe
(
defaultProps
.
rawPath
);
expect
(
findRawLink
().
attributes
(
'
href
'
)).
toBe
(
defaultProps
.
rawPath
);
});
});
});
});
});
});
describe
(
'
links section
'
,
()
=>
{
describe
(
'
links section
'
,
()
=>
{
describe
(
'
with raw
trace
path
'
,
()
=>
{
describe
(
'
with raw
job log
path
'
,
()
=>
{
beforeEach
(()
=>
{
beforeEach
(()
=>
{
createWrapper
();
createWrapper
();
});
});
it
(
'
renders raw
trace
link
'
,
()
=>
{
it
(
'
renders raw
job log
link
'
,
()
=>
{
expect
(
findRawLinkController
().
attributes
(
'
href
'
)).
toBe
(
defaultProps
.
rawPath
);
expect
(
findRawLinkController
().
attributes
(
'
href
'
)).
toBe
(
defaultProps
.
rawPath
);
});
});
});
});
describe
(
'
without raw
trace
path
'
,
()
=>
{
describe
(
'
without raw
job log
path
'
,
()
=>
{
beforeEach
(()
=>
{
beforeEach
(()
=>
{
createWrapper
({
createWrapper
({
rawPath
:
null
,
rawPath
:
null
,
});
});
});
});
it
(
'
does not render raw
trace
link
'
,
()
=>
{
it
(
'
does not render raw
job log
link
'
,
()
=>
{
expect
(
findRawLinkController
().
exists
()).
toBe
(
false
);
expect
(
findRawLinkController
().
exists
()).
toBe
(
false
);
});
});
});
});
...
...
spec/frontend/jobs/store/actions_spec.js
View file @
ea5fb9e3
...
@@ -244,15 +244,15 @@ describe('Job State actions', () => {
...
@@ -244,15 +244,15 @@ describe('Job State actions', () => {
});
});
describe
(
'
when job is incomplete
'
,
()
=>
{
describe
(
'
when job is incomplete
'
,
()
=>
{
let
trace
Payload
;
let
jobLog
Payload
;
beforeEach
(()
=>
{
beforeEach
(()
=>
{
trace
Payload
=
{
jobLog
Payload
=
{
html
:
'
I, [2018-08-17T22:57:45.707325 #1841] INFO -- :
'
,
html
:
'
I, [2018-08-17T22:57:45.707325 #1841] INFO -- :
'
,
complete
:
false
,
complete
:
false
,
};
};
mock
.
onGet
(
`
${
TEST_HOST
}
/endpoint/trace.json`
).
replyOnce
(
200
,
trace
Payload
);
mock
.
onGet
(
`
${
TEST_HOST
}
/endpoint/trace.json`
).
replyOnce
(
200
,
jobLog
Payload
);
});
});
it
(
'
dispatches startPollingJobLog
'
,
(
done
)
=>
{
it
(
'
dispatches startPollingJobLog
'
,
(
done
)
=>
{
...
@@ -263,7 +263,7 @@ describe('Job State actions', () => {
...
@@ -263,7 +263,7 @@ describe('Job State actions', () => {
[],
[],
[
[
{
type
:
'
toggleScrollisInBottom
'
,
payload
:
true
},
{
type
:
'
toggleScrollisInBottom
'
,
payload
:
true
},
{
type
:
'
receiveJobLogSuccess
'
,
payload
:
trace
Payload
},
{
type
:
'
receiveJobLogSuccess
'
,
payload
:
jobLog
Payload
},
{
type
:
'
startPollingJobLog
'
},
{
type
:
'
startPollingJobLog
'
},
],
],
done
,
done
,
...
@@ -280,7 +280,7 @@ describe('Job State actions', () => {
...
@@ -280,7 +280,7 @@ describe('Job State actions', () => {
[],
[],
[
[
{
type
:
'
toggleScrollisInBottom
'
,
payload
:
true
},
{
type
:
'
toggleScrollisInBottom
'
,
payload
:
true
},
{
type
:
'
receiveJobLogSuccess
'
,
payload
:
trace
Payload
},
{
type
:
'
receiveJobLogSuccess
'
,
payload
:
jobLog
Payload
},
],
],
done
,
done
,
);
);
...
@@ -390,7 +390,7 @@ describe('Job State actions', () => {
...
@@ -390,7 +390,7 @@ describe('Job State actions', () => {
});
});
describe
(
'
receiveJobLogError
'
,
()
=>
{
describe
(
'
receiveJobLogError
'
,
()
=>
{
it
(
'
should commit stop polling
trace
'
,
(
done
)
=>
{
it
(
'
should commit stop polling
job log
'
,
(
done
)
=>
{
testAction
(
receiveJobLogError
,
null
,
mockedState
,
[],
[{
type
:
'
stopPollingJobLog
'
}],
done
);
testAction
(
receiveJobLogError
,
null
,
mockedState
,
[],
[{
type
:
'
stopPollingJobLog
'
}],
done
);
});
});
});
});
...
...
spec/frontend/jobs/store/mutations_spec.js
View file @
ea5fb9e3
...
@@ -46,7 +46,7 @@ describe('Jobs Store Mutations', () => {
...
@@ -46,7 +46,7 @@ describe('Jobs Store Mutations', () => {
});
});
describe
(
'
RECEIVE_JOB_LOG_SUCCESS
'
,
()
=>
{
describe
(
'
RECEIVE_JOB_LOG_SUCCESS
'
,
()
=>
{
describe
(
'
when
trace
has state
'
,
()
=>
{
describe
(
'
when
job log
has state
'
,
()
=>
{
it
(
'
sets jobLogState
'
,
()
=>
{
it
(
'
sets jobLogState
'
,
()
=>
{
const
stateLog
=
const
stateLog
=
'
eyJvZmZzZXQiOjczNDQ1MSwibl9vcGVuX3RhZ3MiOjAsImZnX2NvbG9yIjpudWxsLCJiZ19jb2xvciI6bnVsbCwic3R5bGVfbWFzayI6MH0=
'
;
'
eyJvZmZzZXQiOjczNDQ1MSwibl9vcGVuX3RhZ3MiOjAsImZnX2NvbG9yIjpudWxsLCJiZ19jb2xvciI6bnVsbCwic3R5bGVfbWFzayI6MH0=
'
;
...
@@ -76,7 +76,7 @@ describe('Jobs Store Mutations', () => {
...
@@ -76,7 +76,7 @@ describe('Jobs Store Mutations', () => {
});
});
});
});
it
(
'
sets
trace, trace
size and isJobLogComplete
'
,
()
=>
{
it
(
'
sets
job log
size and isJobLogComplete
'
,
()
=>
{
mutations
[
types
.
RECEIVE_JOB_LOG_SUCCESS
](
stateCopy
,
{
mutations
[
types
.
RECEIVE_JOB_LOG_SUCCESS
](
stateCopy
,
{
append
:
true
,
append
:
true
,
html
,
html
,
...
...
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