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
44047113
Commit
44047113
authored
Oct 14, 2019
by
Mark Lapierre
Committed by
Dan Davison
Oct 14, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix security reports test and update pipeline test
parent
965fd391
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
5 deletions
+7
-5
qa/qa/ee/page/project/pipeline/show.rb
qa/qa/ee/page/project/pipeline/show.rb
+0
-4
qa/qa/page/project/pipeline/show.rb
qa/qa/page/project/pipeline/show.rb
+6
-0
qa/qa/specs/features/ee/browser_ui/6_release/multi-project_pipelines_spec.rb
...s/ee/browser_ui/6_release/multi-project_pipelines_spec.rb
+1
-1
No files found.
qa/qa/ee/page/project/pipeline/show.rb
View file @
44047113
...
@@ -5,10 +5,6 @@ module QA::EE::Page
...
@@ -5,10 +5,6 @@ module QA::EE::Page
module
Show
module
Show
def
self
.
prepended
(
page
)
def
self
.
prepended
(
page
)
page
.
module_eval
do
page
.
module_eval
do
view
'ee/app/assets/javascripts/pipelines/components/graph/linked_pipeline.vue'
do
element
:linked_pipeline_button
end
view
'ee/app/assets/javascripts/security_dashboard/components/filter.vue'
do
view
'ee/app/assets/javascripts/security_dashboard/components/filter.vue'
do
element
:filter_dropdown
,
':data-qa-selector="qaSelector"'
# rubocop:disable QA/ElementWithPattern
element
:filter_dropdown
,
':data-qa-selector="qaSelector"'
# rubocop:disable QA/ElementWithPattern
element
:filter_dropdown_content
element
:filter_dropdown_content
...
...
qa/qa/page/project/pipeline/show.rb
View file @
44047113
...
@@ -18,6 +18,10 @@ module QA::Page
...
@@ -18,6 +18,10 @@ module QA::Page
element
:job_link
element
:job_link
end
end
view
'app/assets/javascripts/pipelines/components/graph/linked_pipeline.vue'
do
element
:linked_pipeline_button
end
view
'app/assets/javascripts/vue_shared/components/ci_icon.vue'
do
view
'app/assets/javascripts/vue_shared/components/ci_icon.vue'
do
element
:status_icon
,
'ci-status-icon-${status}'
# rubocop:disable QA/ElementWithPattern
element
:status_icon
,
'ci-status-icon-${status}'
# rubocop:disable QA/ElementWithPattern
end
end
...
@@ -74,3 +78,5 @@ module QA::Page
...
@@ -74,3 +78,5 @@ module QA::Page
end
end
end
end
end
end
QA
::
Page
::
Project
::
Pipeline
::
Show
.
prepend_if_ee
(
'QA::EE::Page::Project::Pipeline::Show'
)
qa/qa/specs/features/ee/browser_ui/6_release/multi-project_pipelines_spec.rb
View file @
44047113
...
@@ -74,7 +74,7 @@ module QA
...
@@ -74,7 +74,7 @@ module QA
it
'creates a multi-project pipeline'
do
it
'creates a multi-project pipeline'
do
Page
::
MergeRequest
::
Show
.
perform
do
|
show
|
Page
::
MergeRequest
::
Show
.
perform
do
|
show
|
pipeline_passed
=
Support
::
Retrier
.
retry_until
do
pipeline_passed
=
show
.
retry_until
(
reload:
true
)
do
show
.
has_content?
(
/Pipeline #\d+ passed/
)
show
.
has_content?
(
/Pipeline #\d+ passed/
)
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