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
6e19be45
Commit
6e19be45
authored
Dec 04, 2019
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix environment containers logs
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
9121f475
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
9 deletions
+9
-9
ee/app/assets/javascripts/api.js
ee/app/assets/javascripts/api.js
+3
-3
ee/spec/frontend/api_spec.js
ee/spec/frontend/api_spec.js
+3
-3
ee/spec/frontend/logs/stores/actions_spec.js
ee/spec/frontend/logs/stores/actions_spec.js
+3
-3
No files found.
ee/app/assets/javascripts/api.js
View file @
6e19be45
...
...
@@ -11,11 +11,11 @@ export default {
groupEpicsPath
:
'
/api/:version/groups/:id/epics?include_ancestor_groups=:includeAncestorGroups&include_descendant_groups=:includeDescendantGroups
'
,
epicIssuePath
:
'
/api/:version/groups/:id/epics/:epic_iid/issues/:issue_id
'
,
podLogsPath
:
'
/:project_full_path/environments/:environment_id/pods/containers/logs.json
'
,
podLogsPath
:
'
/:project_full_path/
-/
environments/:environment_id/pods/containers/logs.json
'
,
podLogsPathWithPod
:
'
/:project_full_path/environments/:environment_id/pods/:pod_name/containers/logs.json
'
,
'
/:project_full_path/
-/
environments/:environment_id/pods/:pod_name/containers/logs.json
'
,
podLogsPathWithPodContainer
:
'
/:project_full_path/environments/:environment_id/pods/:pod_name/containers/:container_name/logs.json
'
,
'
/:project_full_path/
-/
environments/:environment_id/pods/:pod_name/containers/:container_name/logs.json
'
,
groupPackagesPath
:
'
/api/:version/groups/:id/packages
'
,
projectPackagesPath
:
'
/api/:version/projects/:id/packages
'
,
projectPackagePath
:
'
/api/:version/projects/:id/packages/:package_id
'
,
...
...
ee/spec/frontend/api_spec.js
View file @
6e19be45
...
...
@@ -181,7 +181,7 @@ describe('Api', () => {
});
it
(
'
calls `axios.get` with pod_name and container_name
'
,
done
=>
{
const
expectedUrl
=
`
${
dummyUrlRoot
}
/
${
projectPath
}
/environments/
${
environmentId
}
/pods/
${
podName
}
/containers/
${
containerName
}
/logs.json`
;
const
expectedUrl
=
`
${
dummyUrlRoot
}
/
${
projectPath
}
/
-/
environments/
${
environmentId
}
/pods/
${
podName
}
/containers/
${
containerName
}
/logs.json`
;
Api
.
getPodLogs
({
projectPath
,
environmentId
,
podName
,
containerName
})
.
then
(()
=>
{
...
...
@@ -192,7 +192,7 @@ describe('Api', () => {
});
it
(
'
calls `axios.get` without pod_name and container_name
'
,
done
=>
{
const
expectedUrl
=
`
${
dummyUrlRoot
}
/
${
projectPath
}
/environments/
${
environmentId
}
/pods/containers/logs.json`
;
const
expectedUrl
=
`
${
dummyUrlRoot
}
/
${
projectPath
}
/
-/
environments/
${
environmentId
}
/pods/containers/logs.json`
;
Api
.
getPodLogs
({
projectPath
,
environmentId
})
.
then
(()
=>
{
...
...
@@ -203,7 +203,7 @@ describe('Api', () => {
});
it
(
'
calls `axios.get` with pod_name
'
,
done
=>
{
const
expectedUrl
=
`
${
dummyUrlRoot
}
/
${
projectPath
}
/environments/
${
environmentId
}
/pods/
${
podName
}
/containers/logs.json`
;
const
expectedUrl
=
`
${
dummyUrlRoot
}
/
${
projectPath
}
/
-/
environments/
${
environmentId
}
/pods/
${
podName
}
/containers/logs.json`
;
Api
.
getPodLogs
({
projectPath
,
environmentId
,
podName
})
.
then
(()
=>
{
...
...
ee/spec/frontend/logs/stores/actions_spec.js
View file @
6e19be45
...
...
@@ -117,7 +117,7 @@ describe('Logs Store actions', () => {
state
.
environments
.
current
=
mockEnvId
;
state
.
pods
.
current
=
mockPodName
;
const
endpoint
=
`/
${
mockProjectPath
}
/environments/
${
mockEnvId
}
/pods/
${
mockPodName
}
/containers/logs.json`
;
const
endpoint
=
`/
${
mockProjectPath
}
/
-/
environments/
${
mockEnvId
}
/pods/
${
mockPodName
}
/containers/logs.json`
;
mock
.
onGet
(
endpoint
).
reply
(
200
,
{
pod_name
:
mockPodName
,
...
...
@@ -147,7 +147,7 @@ describe('Logs Store actions', () => {
state
.
projectPath
=
mockProjectPath
;
state
.
environments
.
current
=
mockEnvId
;
const
endpoint
=
`/
${
mockProjectPath
}
/environments/
${
mockEnvId
}
/pods/containers/logs.json`
;
const
endpoint
=
`/
${
mockProjectPath
}
/
-/
environments/
${
mockEnvId
}
/pods/containers/logs.json`
;
mock
.
onGet
(
endpoint
).
reply
(
200
,
{
pod_name
:
mockPodName
,
...
...
@@ -176,7 +176,7 @@ describe('Logs Store actions', () => {
state
.
projectPath
=
mockProjectPath
;
state
.
environments
.
current
=
mockEnvId
;
const
endpoint
=
`/
${
mockProjectPath
}
/environments/
${
mockEnvId
}
/pods/containers/logs.json`
;
const
endpoint
=
`/
${
mockProjectPath
}
/
-/
environments/
${
mockEnvId
}
/pods/containers/logs.json`
;
mock
.
onGet
(
endpoint
).
replyOnce
(
500
);
testAction
(
...
...
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