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
aec0eb91
Commit
aec0eb91
authored
Oct 28, 2021
by
Florie Guibert
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix epic board scope text
Changelog: fixed
parent
95175efd
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
24 additions
and
7 deletions
+24
-7
ee/app/assets/javascripts/boards/components/board_scope.vue
ee/app/assets/javascripts/boards/components/board_scope.vue
+6
-1
ee/spec/frontend/boards/components/board_scope_spec.js
ee/spec/frontend/boards/components/board_scope_spec.js
+15
-6
locale/gitlab.pot
locale/gitlab.pot
+3
-0
No files found.
ee/app/assets/javascripts/boards/components/board_scope.vue
View file @
aec0eb91
...
@@ -69,6 +69,11 @@ export default {
...
@@ -69,6 +69,11 @@ export default {
expandButtonText
()
{
expandButtonText
()
{
return
this
.
expanded
?
__
(
'
Collapse
'
)
:
__
(
'
Expand
'
);
return
this
.
expanded
?
__
(
'
Collapse
'
)
:
__
(
'
Expand
'
);
},
},
scopeText
()
{
return
this
.
isIssueBoard
?
__
(
'
Board scope affects which issues are displayed for anyone who visits this board
'
)
:
__
(
'
Board scope affects which epics are displayed for anyone who visits this board
'
);
},
},
},
methods
:
{
methods
:
{
...
@@ -92,7 +97,7 @@ export default {
...
@@ -92,7 +97,7 @@ export default {
</button>
</button>
</div>
</div>
<p
class=
"text-secondary gl-mb-3"
>
<p
class=
"text-secondary gl-mb-3"
>
{{
__
(
'
Board scope affects which issues are displayed for anyone who visits this board
'
)
}}
{{
scopeText
}}
</p>
</p>
<div
v-if=
"!collapseScope || expanded"
>
<div
v-if=
"!collapseScope || expanded"
>
<board-milestone-select
<board-milestone-select
...
...
ee/spec/frontend/boards/components/board_scope_spec.js
View file @
aec0eb91
...
@@ -11,16 +11,17 @@ describe('BoardScope', () => {
...
@@ -11,16 +11,17 @@ describe('BoardScope', () => {
let
wrapper
;
let
wrapper
;
let
store
;
let
store
;
const
createStore
=
()
=>
{
const
createStore
=
(
{
isIssueBoard
}
)
=>
{
return
new
Vuex
.
Store
({
return
new
Vuex
.
Store
({
getters
:
{
getters
:
{
isIssueBoard
:
()
=>
true
,
isIssueBoard
:
()
=>
isIssueBoard
,
isEpicBoard
:
()
=>
false
,
isEpicBoard
:
()
=>
!
isIssueBoard
,
},
},
});
});
};
};
function
mountComponent
()
{
function
mountComponent
({
isIssueBoard
=
true
}
=
[])
{
store
=
createStore
({
isIssueBoard
});
wrapper
=
mount
(
BoardScope
,
{
wrapper
=
mount
(
BoardScope
,
{
store
,
store
,
propsData
:
{
propsData
:
{
...
@@ -41,7 +42,6 @@ describe('BoardScope', () => {
...
@@ -41,7 +42,6 @@ describe('BoardScope', () => {
}
}
beforeEach
(()
=>
{
beforeEach
(()
=>
{
store
=
createStore
();
mountComponent
();
mountComponent
();
});
});
...
@@ -51,7 +51,7 @@ describe('BoardScope', () => {
...
@@ -51,7 +51,7 @@ describe('BoardScope', () => {
const
findLabelSelect
=
()
=>
wrapper
.
findComponent
(
LabelsSelect
);
const
findLabelSelect
=
()
=>
wrapper
.
findComponent
(
LabelsSelect
);
describe
(
'
ee/app/assets/javascripts/boards/components/board_scope.vu
e
'
,
()
=>
{
describe
(
'
BoardScop
e
'
,
()
=>
{
it
(
'
emits selected labels to be added and removed from the board
'
,
async
()
=>
{
it
(
'
emits selected labels to be added and removed from the board
'
,
async
()
=>
{
const
labels
=
[{
id
:
'
1
'
,
set
:
true
,
color
:
'
#BADA55
'
,
text_color
:
'
#FFFFFF
'
}];
const
labels
=
[{
id
:
'
1
'
,
set
:
true
,
color
:
'
#BADA55
'
,
text_color
:
'
#FFFFFF
'
}];
expect
(
findLabelSelect
().
exists
()).
toBe
(
true
);
expect
(
findLabelSelect
().
exists
()).
toBe
(
true
);
...
@@ -62,4 +62,13 @@ describe('BoardScope', () => {
...
@@ -62,4 +62,13 @@ describe('BoardScope', () => {
expect
(
wrapper
.
emitted
(
'
set-board-labels
'
)).
toEqual
([[
labels
]]);
expect
(
wrapper
.
emitted
(
'
set-board-labels
'
)).
toEqual
([[
labels
]]);
});
});
});
});
it
.
each
`
isIssueBoard | text
${
true
}
|
${
'
Board scope affects which issues are displayed for anyone who visits this board
'
}
${
false
}
|
${
'
Board scope affects which epics are displayed for anyone who visits this board
'
}
`
(
'
displays $text when isIssueBoard is $isIssueBoard
'
,
({
isIssueBoard
,
text
})
=>
{
mountComponent
({
isIssueBoard
});
expect
(
wrapper
.
find
(
'
p.text-secondary
'
).
text
()).
toEqual
(
text
);
});
});
});
locale/gitlab.pot
View file @
aec0eb91
...
@@ -5431,6 +5431,9 @@ msgstr ""
...
@@ -5431,6 +5431,9 @@ msgstr ""
msgid "Blog"
msgid "Blog"
msgstr ""
msgstr ""
msgid "Board scope affects which epics are displayed for anyone who visits this board"
msgstr ""
msgid "Board scope affects which issues are displayed for anyone who visits this board"
msgid "Board scope affects which issues are displayed for anyone who visits this board"
msgstr ""
msgstr ""
...
...
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