Commit 064dd7aa authored by Phil Hughes's avatar Phil Hughes

Merge branch 'winh-sidebar-todo' into 'master'

Copy sidebar todo component from EE

Closes gitlab-ee#9954

See merge request gitlab-org/gitlab-ce!26915
parents e81b4f90 52515dda
......@@ -50,6 +50,9 @@ export default {
buttonLabel() {
return this.isTodo ? MARK_TEXT : TODO_TEXT;
},
buttonTooltip() {
return !this.collapsed ? undefined : this.buttonLabel;
},
collapsedButtonIconClasses() {
return this.isTodo ? 'todo-undone' : '';
},
......@@ -69,7 +72,7 @@ export default {
<button
v-tooltip
:class="buttonClasses"
:title="buttonLabel"
:title="buttonTooltip"
:aria-label="buttonLabel"
:data-issuable-id="issuableId"
:data-issuable-type="issuableType"
......
......@@ -116,7 +116,7 @@ describe('SidebarTodo', () => {
const dataAttributes = {
issuableId: '1',
issuableType: 'epic',
originalTitle: 'Mark todo as done',
originalTitle: '',
placement: 'left',
container: 'body',
boundary: 'viewport',
......@@ -130,6 +130,10 @@ describe('SidebarTodo', () => {
});
});
it('check button label computed property', () => {
expect(vm.buttonLabel).toEqual('Mark todo as done');
});
it('renders button label element when `collapsed` prop is `false`', () => {
const buttonLabelEl = vm.$el.querySelector('span.issuable-todo-inner');
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment