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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
105a8c17
Commit
105a8c17
authored
Oct 18, 2018
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[QA] Fix the 'clone using deploy key' tests
Signed-off-by:
Rémy Coutable
<
remy@rymai.me
>
parent
4ef9bb6a
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
22 additions
and
13 deletions
+22
-13
app/assets/javascripts/jobs/components/job_app.vue
app/assets/javascripts/jobs/components/job_app.vue
+3
-3
app/assets/javascripts/jobs/components/job_log.vue
app/assets/javascripts/jobs/components/job_log.vue
+1
-1
app/assets/javascripts/vue_shared/components/ci_badge_link.vue
...ssets/javascripts/vue_shared/components/ci_badge_link.vue
+1
-1
qa/qa/page/project/job/show.rb
qa/qa/page/project/job/show.rb
+17
-8
No files found.
app/assets/javascripts/jobs/components/job_app.vue
View file @
105a8c17
...
...
@@ -165,7 +165,7 @@
<gl-loading-icon
v-if=
"isLoading"
:size=
"2"
class=
"js-job-loading prepend-top-20"
class=
"js-job-loading
qa-loading-animation
prepend-top-20"
/>
<template
v-else-if=
"shouldRenderContent"
>
...
...
@@ -217,8 +217,8 @@
/>
<!--job log -->
<div
v-if=
"hasTrace"
<div
v-if=
"hasTrace"
class=
"build-trace-container prepend-top-default"
>
<log-top-bar
:class=
"
{
...
...
app/assets/javascripts/jobs/components/job_log.vue
View file @
105a8c17
...
...
@@ -42,7 +42,7 @@
};
</
script
>
<
template
>
<pre
class=
"js-build-trace build-trace"
>
<pre
class=
"js-build-trace build-trace
qa-build-trace
"
>
<code
class=
"bash"
v-html=
"trace"
...
...
app/assets/javascripts/vue_shared/components/ci_badge_link.vue
View file @
105a8c17
...
...
@@ -43,7 +43,7 @@ export default {
computed
:
{
cssClass
()
{
const
className
=
this
.
status
.
group
;
return
className
?
`ci-status ci-
${
className
}
`
:
'
ci-status
'
;
return
className
?
`ci-status ci-
${
className
}
qa-status-badge`
:
'
ci-status qa-status-badge
'
;
},
},
};
...
...
qa/qa/page/project/job/show.rb
View file @
105a8c17
...
...
@@ -4,30 +4,39 @@ module QA::Page
COMPLETED_STATUSES
=
%w[passed failed canceled blocked skipped manual]
.
freeze
# excludes created, pending, running
PASSED_STATUS
=
'passed'
.
freeze
view
'app/views/shared/builds/_build_output.html.haml'
do
element
:build_output
,
'.js-build-output'
# rubocop:disable QA/ElementWithPattern
element
:loading_animation
,
'.js-build-refresh'
# rubocop:disable QA/ElementWithPattern
view
'app/assets/javascripts/jobs/components/job_app.vue'
do
element
:loading_animation
end
view
'app/assets/javascripts/jobs/components/job_log.vue'
do
element
:build_trace
end
view
'app/assets/javascripts/vue_shared/components/ci_badge_link.vue'
do
element
:status_badge
,
'ci-status'
# rubocop:disable QA/ElementWithPattern
element
:status_badge
end
def
completed?
COMPLETED_STATUSES
.
include?
find
(
'.ci-status'
).
text
COMPLETED_STATUSES
.
include?
(
status_badge
)
end
def
passed?
find
(
'.ci-status'
).
text
==
PASSED_STATUS
status_badge
==
PASSED_STATUS
end
def
trace_loading?
has_
css?
(
'.js-build-refresh'
)
has_
element?
(
:loading_animation
)
end
# Reminder: You may wish to wait for a particular job status before checking output
def
output
find
(
'.js-build-output'
).
text
find_element
(
:build_trace
).
text
end
private
def
status_badge
find_element
(
:status_badge
).
text
end
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