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
5e8eec54
Commit
5e8eec54
authored
Oct 12, 2020
by
Miguel Rincon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Refactor css to utilities classes in CI header
parent
cfa45547
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
19 deletions
+8
-19
app/assets/javascripts/vue_shared/components/header_ci_component.vue
...javascripts/vue_shared/components/header_ci_component.vue
+5
-1
app/assets/stylesheets/pages/pipelines.scss
app/assets/stylesheets/pages/pipelines.scss
+0
-15
qa/qa/page/project/pipeline/show.rb
qa/qa/page/project/pipeline/show.rb
+2
-2
spec/features/projects/pipelines/pipeline_spec.rb
spec/features/projects/pipelines/pipeline_spec.rb
+1
-1
No files found.
app/assets/javascripts/vue_shared/components/header_ci_component.vue
View file @
5e8eec54
...
@@ -97,7 +97,11 @@ export default {
...
@@ -97,7 +97,11 @@ export default {
</
script
>
</
script
>
<
template
>
<
template
>
<header
class=
"page-content-header ci-header-container"
data-testid=
"pipeline-header-content"
>
<header
class=
"page-content-header gl-display-flex gl-min-h-7"
data-qa-selector=
"pipeline_header"
data-testid=
"ci-header-content"
>
<section
class=
"header-main-content"
>
<section
class=
"header-main-content"
>
<ci-icon-badge
:status=
"status"
/>
<ci-icon-badge
:status=
"status"
/>
...
...
app/assets/stylesheets/pages/pipelines.scss
View file @
5e8eec54
...
@@ -114,21 +114,6 @@
...
@@ -114,21 +114,6 @@
}
}
}
}
/**
* Pipelines / Jobs header
*/
[
data-page
=
'projects:pipelines:show'
],
[
data-page
=
'projects:jobs:show'
]
{
.ci-header-container
{
min-height
:
$gl-spacing-scale-7
;
display
:
flex
;
.text-center
{
padding-top
:
12px
;
}
}
}
.pipelines-container
.top-area
.nav-controls
>
.btn
:last-child
{
.pipelines-container
.top-area
.nav-controls
>
.btn
:last-child
{
float
:
none
;
float
:
none
;
}
}
...
...
qa/qa/page/project/pipeline/show.rb
View file @
5e8eec54
...
@@ -8,7 +8,7 @@ module QA
...
@@ -8,7 +8,7 @@ module QA
include
Component
::
CiBadgeLink
include
Component
::
CiBadgeLink
view
'app/assets/javascripts/vue_shared/components/header_ci_component.vue'
do
view
'app/assets/javascripts/vue_shared/components/header_ci_component.vue'
do
element
:pipeline_header
,
/header class.*ci-header-container.*/
# rubocop:disable QA/ElementWithPattern
element
:pipeline_header
end
end
view
'app/assets/javascripts/pipelines/components/graph/graph_component.vue'
do
view
'app/assets/javascripts/pipelines/components/graph/graph_component.vue'
do
...
@@ -35,7 +35,7 @@ module QA
...
@@ -35,7 +35,7 @@ module QA
end
end
def
running?
(
wait:
0
)
def
running?
(
wait:
0
)
within
(
'.ci-header-container'
)
do
within
_element
(
:pipeline_header
)
do
page
.
has_content?
(
'running'
,
wait:
wait
)
page
.
has_content?
(
'running'
,
wait:
wait
)
end
end
end
end
...
...
spec/features/projects/pipelines/pipeline_spec.rb
View file @
5e8eec54
...
@@ -178,7 +178,7 @@ RSpec.describe 'Pipeline', :js do
...
@@ -178,7 +178,7 @@ RSpec.describe 'Pipeline', :js do
it
'pipeline header shows the user status and emoji'
do
it
'pipeline header shows the user status and emoji'
do
visit
project_pipeline_path
(
project
,
pipeline
)
visit
project_pipeline_path
(
project
,
pipeline
)
within
'[data-testid="
pipeline
-header-content"]'
do
within
'[data-testid="
ci
-header-content"]'
do
expect
(
page
).
to
have_selector
(
"[data-testid='
#{
status
.
message
}
']"
)
expect
(
page
).
to
have_selector
(
"[data-testid='
#{
status
.
message
}
']"
)
expect
(
page
).
to
have_selector
(
"[data-name='
#{
status
.
emoji
}
']"
)
expect
(
page
).
to
have_selector
(
"[data-name='
#{
status
.
emoji
}
']"
)
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