Rename diffs store variable
This commit is contained in:
parent
6c51a6df40
commit
4a2b19706c
5 changed files with 14 additions and 9 deletions
|
@ -167,7 +167,7 @@ export const expandAllFiles = ({ commit }) => {
|
|||
export const toggleFileDiscussions = ({ getters, dispatch }, diff) => {
|
||||
const discussions = getters.getDiffFileDiscussions(diff);
|
||||
const shouldCloseAll = getters.diffHasAllExpandedDiscussions(diff);
|
||||
const shouldExpandAll = getters.diffHasAllCollpasedDiscussions(diff);
|
||||
const shouldExpandAll = getters.diffHasAllCollapsedDiscussions(diff);
|
||||
|
||||
discussions.forEach(discussion => {
|
||||
const data = { discussionId: discussion.id };
|
||||
|
|
|
@ -27,7 +27,7 @@ export const diffHasAllExpandedDiscussions = (state, getters) => diff => {
|
|||
* @param {Object} diff
|
||||
* @returns {Boolean}
|
||||
*/
|
||||
export const diffHasAllCollpasedDiscussions = (state, getters) => diff => {
|
||||
export const diffHasAllCollapsedDiscussions = (state, getters) => diff => {
|
||||
const discussions = getters.getDiffFileDiscussions(diff);
|
||||
|
||||
return (
|
||||
|
|
5
changelogs/unreleased/gt-rename-diffs-store-variable.yml
Normal file
5
changelogs/unreleased/gt-rename-diffs-store-variable.yml
Normal file
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
title: Rename diffs store variable
|
||||
merge_request: 23123
|
||||
author: George Tsiolis
|
||||
type: other
|
|
@ -416,7 +416,7 @@ describe('DiffsStoreActions', () => {
|
|||
const getters = {
|
||||
getDiffFileDiscussions: jasmine.createSpy().and.returnValue([{ id: 1 }]),
|
||||
diffHasAllExpandedDiscussions: jasmine.createSpy().and.returnValue(true),
|
||||
diffHasAllCollpasedDiscussions: jasmine.createSpy().and.returnValue(false),
|
||||
diffHasAllCollapsedDiscussions: jasmine.createSpy().and.returnValue(false),
|
||||
};
|
||||
|
||||
const dispatch = jasmine.createSpy('dispatch');
|
||||
|
@ -434,7 +434,7 @@ describe('DiffsStoreActions', () => {
|
|||
const getters = {
|
||||
getDiffFileDiscussions: jasmine.createSpy().and.returnValue([{ id: 1 }]),
|
||||
diffHasAllExpandedDiscussions: jasmine.createSpy().and.returnValue(false),
|
||||
diffHasAllCollpasedDiscussions: jasmine.createSpy().and.returnValue(true),
|
||||
diffHasAllCollapsedDiscussions: jasmine.createSpy().and.returnValue(true),
|
||||
};
|
||||
|
||||
const dispatch = jasmine.createSpy();
|
||||
|
@ -452,7 +452,7 @@ describe('DiffsStoreActions', () => {
|
|||
const getters = {
|
||||
getDiffFileDiscussions: jasmine.createSpy().and.returnValue([{ expanded: false, id: 1 }]),
|
||||
diffHasAllExpandedDiscussions: jasmine.createSpy().and.returnValue(false),
|
||||
diffHasAllCollpasedDiscussions: jasmine.createSpy().and.returnValue(false),
|
||||
diffHasAllCollapsedDiscussions: jasmine.createSpy().and.returnValue(false),
|
||||
};
|
||||
|
||||
const dispatch = jasmine.createSpy();
|
||||
|
|
|
@ -106,13 +106,13 @@ describe('Diffs Module Getters', () => {
|
|||
});
|
||||
});
|
||||
|
||||
describe('diffHasAllCollpasedDiscussions', () => {
|
||||
describe('diffHasAllCollapsedDiscussions', () => {
|
||||
it('returns true when all discussions are collapsed', () => {
|
||||
discussionMock.diff_file.file_hash = diffFileMock.fileHash;
|
||||
discussionMock.expanded = false;
|
||||
|
||||
expect(
|
||||
getters.diffHasAllCollpasedDiscussions(localState, {
|
||||
getters.diffHasAllCollapsedDiscussions(localState, {
|
||||
getDiffFileDiscussions: () => [discussionMock],
|
||||
})(diffFileMock),
|
||||
).toEqual(true);
|
||||
|
@ -120,7 +120,7 @@ describe('Diffs Module Getters', () => {
|
|||
|
||||
it('returns false when there are no discussions', () => {
|
||||
expect(
|
||||
getters.diffHasAllCollpasedDiscussions(localState, {
|
||||
getters.diffHasAllCollapsedDiscussions(localState, {
|
||||
getDiffFileDiscussions: () => [],
|
||||
})(diffFileMock),
|
||||
).toEqual(false);
|
||||
|
@ -130,7 +130,7 @@ describe('Diffs Module Getters', () => {
|
|||
discussionMock1.expanded = false;
|
||||
|
||||
expect(
|
||||
getters.diffHasAllCollpasedDiscussions(localState, {
|
||||
getters.diffHasAllCollapsedDiscussions(localState, {
|
||||
getDiffFileDiscussions: () => [discussionMock, discussionMock1],
|
||||
})(diffFileMock),
|
||||
).toEqual(false);
|
||||
|
|
Loading…
Reference in a new issue