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
71025210
Commit
71025210
authored
Jun 08, 2018
by
DJ Mountney
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move qa test use of refresh selector into the job page
parent
19ac6bad
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
1 deletion
+6
-1
qa/qa/page/project/job/show.rb
qa/qa/page/project/job/show.rb
+5
-0
qa/qa/specs/features/project/deploy_key_clone_spec.rb
qa/qa/specs/features/project/deploy_key_clone_spec.rb
+1
-1
No files found.
qa/qa/page/project/job/show.rb
View file @
71025210
...
@@ -6,6 +6,7 @@ module QA::Page
...
@@ -6,6 +6,7 @@ module QA::Page
view
'app/views/shared/builds/_build_output.html.haml'
do
view
'app/views/shared/builds/_build_output.html.haml'
do
element
:build_output
,
'.js-build-output'
element
:build_output
,
'.js-build-output'
element
:loading_animation
,
'.js-build-refresh'
end
end
view
'app/assets/javascripts/vue_shared/components/ci_badge_link.vue'
do
view
'app/assets/javascripts/vue_shared/components/ci_badge_link.vue'
do
...
@@ -20,6 +21,10 @@ module QA::Page
...
@@ -20,6 +21,10 @@ module QA::Page
find
(
'.ci-status'
).
text
==
PASSED_STATUS
find
(
'.ci-status'
).
text
==
PASSED_STATUS
end
end
def
trace_loading?
has_css?
(
'.js-build-refresh'
)
end
# Reminder: You may wish to wait for a particular job status before checking output
# Reminder: You may wish to wait for a particular job status before checking output
def
output
def
output
find
(
'.js-build-output'
).
text
find
(
'.js-build-output'
).
text
...
...
qa/qa/specs/features/project/deploy_key_clone_spec.rb
View file @
71025210
...
@@ -93,7 +93,7 @@ module QA
...
@@ -93,7 +93,7 @@ module QA
Page
::
Project
::
Job
::
Show
.
perform
do
|
job
|
Page
::
Project
::
Job
::
Show
.
perform
do
|
job
|
job
.
wait
(
reload:
false
)
do
job
.
wait
(
reload:
false
)
do
job
.
completed?
&&
!
job
.
has_css?
(
'.js-build-refresh'
)
job
.
completed?
&&
!
job
.
trace_loading?
end
end
expect
(
job
.
passed?
).
to
be_truthy
,
"Job status did not become
\"
passed
\"
."
expect
(
job
.
passed?
).
to
be_truthy
,
"Job status did not become
\"
passed
\"
."
...
...
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