Skip to content
Snippets Groups Projects
Commit 06025e4a authored by André Luís's avatar André Luís
Browse files

Display click to expand on collapsed diffs

parent 71f3d485
No related branches found
No related tags found
1 merge request!10495Merge Requests - Assignee
Loading
Loading
@@ -44,7 +44,7 @@ export default {
},
showExpandMessage() {
return (
!this.isCollapsed &&
this.isCollapsed ||
!this.file.highlightedDiffLines &&
!this.isLoadingCollapsedDiff &&
!this.file.tooLarge &&
Loading
Loading
---
title: Fix absent Click to Expand link on diffs not rendered on first load of Merge
Requests Changes tab
merge_request: 21716
author:
type: fixed
Loading
Loading
@@ -63,6 +63,18 @@ describe('DiffFile', () => {
});
});
 
it('should have collapsed text and link even before rendered', done => {
vm.file.renderIt = false;
vm.file.collapsed = true;
vm.$nextTick(() => {
expect(vm.$el.innerText).toContain('This diff is collapsed');
expect(vm.$el.querySelectorAll('.js-click-to-expand').length).toEqual(1);
done();
});
});
it('should have loading icon while loading a collapsed diffs', done => {
vm.file.collapsed = true;
vm.isLoadingCollapsedDiff = true;
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment