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
ea8ab7d9
Commit
ea8ab7d9
authored
Oct 28, 2020
by
Jannik Lehmann
Committed by
Vitaly Slobodin
Oct 28, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace GlDeprecated Badge for geo app & Update Tests accordingly
parent
3803fff4
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
6 deletions
+11
-6
ee/app/assets/javascripts/geo_node_form/components/app.vue
ee/app/assets/javascripts/geo_node_form/components/app.vue
+2
-2
ee/changelogs/unreleased/replace-GldeprecatedBadge-for-geo-node-form-app.yml
...eased/replace-GldeprecatedBadge-for-geo-node-form-app.yml
+5
-0
ee/spec/frontend/geo_node_form/components/app_spec.js
ee/spec/frontend/geo_node_form/components/app_spec.js
+4
-4
No files found.
ee/app/assets/javascripts/geo_node_form/components/app.vue
View file @
ea8ab7d9
<
script
>
import
{
Gl
DeprecatedBadge
as
Gl
Badge
}
from
'
@gitlab/ui
'
;
import
{
GlBadge
}
from
'
@gitlab/ui
'
;
import
{
__
}
from
'
~/locale
'
;
import
GeoNodeForm
from
'
./geo_node_form.vue
'
;
...
...
@@ -33,7 +33,7 @@ export default {
},
pillDetails
()
{
return
{
variant
:
this
.
isNodePrimary
?
'
primary
'
:
'
light
'
,
variant
:
this
.
isNodePrimary
?
'
info
'
:
'
muted
'
,
label
:
this
.
isNodePrimary
?
__
(
'
Primary
'
)
:
__
(
'
Secondary
'
),
};
},
...
...
ee/changelogs/unreleased/replace-GldeprecatedBadge-for-geo-node-form-app.yml
0 → 100644
View file @
ea8ab7d9
---
title
:
Replace GlDeprecated Badge in ee/app/assets/javascripts/geo_node_form/components/app.vue
merge_request
:
46225
author
:
type
:
changed
ee/spec/frontend/geo_node_form/components/app_spec.js
View file @
ea8ab7d9
import
{
shallowMount
}
from
'
@vue/test-utils
'
;
import
{
Gl
DeprecatedBadge
as
Gl
Badge
}
from
'
@gitlab/ui
'
;
import
{
GlBadge
}
from
'
@gitlab/ui
'
;
import
GeoNodeFormApp
from
'
ee/geo_node_form/components/app.vue
'
;
import
GeoNodeForm
from
'
ee/geo_node_form/components/geo_node_form.vue
'
;
import
{
MOCK_SELECTIVE_SYNC_TYPES
,
MOCK_SYNC_SHARDS
}
from
'
../mock_data
'
;
...
...
@@ -34,9 +34,9 @@ describe('GeoNodeFormApp', () => {
describe
.
each
`
formType | node | title | pillTitle | variant
${
'
create a secondary node
'
}
|
${
null
}
|
${
'
Add New Node
'
}
|
${
'
Secondary
'
}
|
${
'
light
'
}
${
'
update a secondary node
'
}
|
${{
primary
:
false
}
} |
${
'
Edit Geo Node
'
}
|
${
'
Secondary
'
}
|
${
'
light
'
}
${
'
update a primary node
'
}
|
${{
primary
:
true
}
} |
${
'
Edit Geo Node
'
}
|
${
'
Primary
'
}
|
${
'
primary
'
}
${
'
create a secondary node
'
}
|
${
null
}
|
${
'
Add New Node
'
}
|
${
'
Secondary
'
}
|
${
'
muted
'
}
${
'
update a secondary node
'
}
|
${{
primary
:
false
}
} |
${
'
Edit Geo Node
'
}
|
${
'
Secondary
'
}
|
${
'
muted
'
}
${
'
update a primary node
'
}
|
${{
primary
:
true
}
} |
${
'
Edit Geo Node
'
}
|
${
'
Primary
'
}
|
${
'
info
'
}
`
(
`form header`
,
({
formType
,
node
,
title
,
pillTitle
,
variant
})
=>
{
describe
(
`when node form is to
${
formType
}
`
,
()
=>
{
beforeEach
(()
=>
{
...
...
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