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
8b327671
Commit
8b327671
authored
Dec 18, 2019
by
Aleksandr Soborov
Committed by
Sanad Liaquat
Dec 18, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix Job page object for E2E tests to use new job log
parent
586ef92a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
10 deletions
+5
-10
app/assets/javascripts/jobs/components/log/log.vue
app/assets/javascripts/jobs/components/log/log.vue
+1
-1
qa/qa/page/project/job/show.rb
qa/qa/page/project/job/show.rb
+4
-4
qa/qa/specs/features/browser_ui/6_release/deploy_key/clone_using_deploy_key_spec.rb
...er_ui/6_release/deploy_key/clone_using_deploy_key_spec.rb
+0
-5
No files found.
app/assets/javascripts/jobs/components/log/log.vue
View file @
8b327671
...
@@ -49,7 +49,7 @@ export default {
...
@@ -49,7 +49,7 @@ export default {
};
};
</
script
>
</
script
>
<
template
>
<
template
>
<code
class=
"job-log d-block"
>
<code
class=
"job-log d-block"
data-qa-selector=
"job_log_content"
>
<template
v-for=
"(section, index) in trace"
>
<template
v-for=
"(section, index) in trace"
>
<collpasible-log-section
<collpasible-log-section
v-if=
"section.isHeader"
v-if=
"section.isHeader"
...
...
qa/qa/page/project/job/show.rb
View file @
8b327671
...
@@ -5,8 +5,8 @@ module QA::Page
...
@@ -5,8 +5,8 @@ module QA::Page
class
Show
<
QA
::
Page
::
Base
class
Show
<
QA
::
Page
::
Base
include
Component
::
CiBadgeLink
include
Component
::
CiBadgeLink
view
'app/assets/javascripts/jobs/components/
job_
log.vue'
do
view
'app/assets/javascripts/jobs/components/
log/
log.vue'
do
element
:
build_trace
element
:
job_log_content
end
end
view
'app/assets/javascripts/jobs/components/stages_dropdown.vue'
do
view
'app/assets/javascripts/jobs/components/stages_dropdown.vue'
do
...
@@ -25,7 +25,7 @@ module QA::Page
...
@@ -25,7 +25,7 @@ module QA::Page
result
=
''
result
=
''
wait
(
reload:
false
,
max:
wait
,
interval:
1
)
do
wait
(
reload:
false
,
max:
wait
,
interval:
1
)
do
result
=
find_element
(
:
build_trace
).
text
result
=
find_element
(
:
job_log_content
).
text
result
.
include?
(
'Job'
)
result
.
include?
(
'Job'
)
end
end
...
@@ -37,7 +37,7 @@ module QA::Page
...
@@ -37,7 +37,7 @@ module QA::Page
def
loaded?
(
wait:
60
)
def
loaded?
(
wait:
60
)
wait
(
reload:
true
,
max:
wait
,
interval:
1
)
do
wait
(
reload:
true
,
max:
wait
,
interval:
1
)
do
has_element?
(
:
build_trace
,
wait:
1
)
has_element?
(
:
job_log_content
,
wait:
1
)
end
end
end
end
end
end
...
...
qa/qa/specs/features/browser_ui/6_release/deploy_key/clone_using_deploy_key_spec.rb
View file @
8b327671
...
@@ -6,10 +6,6 @@ module QA
...
@@ -6,10 +6,6 @@ module QA
context
'Release'
,
:docker
do
context
'Release'
,
:docker
do
describe
'Git clone using a deploy key'
do
describe
'Git clone using a deploy key'
do
before
do
before
do
# Handle WIP Job Logs flag - https://gitlab.com/gitlab-org/gitlab/issues/31162
@job_log_json_flag_enabled
=
Runtime
::
Feature
.
enabled?
(
'job_log_json'
)
Runtime
::
Feature
.
disable
(
'job_log_json'
)
if
@job_log_json_flag_enabled
Flow
::
Login
.
sign_in
Flow
::
Login
.
sign_in
@runner_name
=
"qa-runner-
#{
Time
.
now
.
to_i
}
"
@runner_name
=
"qa-runner-
#{
Time
.
now
.
to_i
}
"
...
@@ -29,7 +25,6 @@ module QA
...
@@ -29,7 +25,6 @@ module QA
end
end
after
do
after
do
Runtime
::
Feature
.
enable
(
'job_log_json'
)
if
@job_log_json_flag_enabled
Service
::
DockerRun
::
GitlabRunner
.
new
(
@runner_name
).
remove!
Service
::
DockerRun
::
GitlabRunner
.
new
(
@runner_name
).
remove!
end
end
...
...
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