Commit 021ca831 authored by Frédéric Caplette's avatar Frédéric Caplette

Merge branch 'ss/rm-swimlanes-from-board-card' into 'master'

Rm isSwimlanesOn from board_card.vue

See merge request gitlab-org/gitlab!60450
parents 29582602 b1ce5132
<script>
import { mapActions, mapGetters, mapState } from 'vuex';
import { mapActions, mapState } from 'vuex';
import BoardCardInner from './board_card_inner.vue';
export default {
......@@ -31,7 +31,6 @@ export default {
},
computed: {
...mapState(['selectedBoardItems', 'activeId']),
...mapGetters(['isSwimlanesOn']),
isActive() {
return this.item.id === this.activeId;
},
......
......@@ -15,7 +15,7 @@ describe('Board card', () => {
const localVue = createLocalVue();
localVue.use(Vuex);
const createStore = ({ initialState = {}, isSwimlanesOn = false } = {}) => {
const createStore = ({ initialState = {} } = {}) => {
mockActions = {
toggleBoardItem: jest.fn(),
toggleBoardItemMultiSelection: jest.fn(),
......@@ -30,7 +30,6 @@ describe('Board card', () => {
},
actions: mockActions,
getters: {
isSwimlanesOn: () => isSwimlanesOn,
isEpicBoard: () => false,
},
});
......@@ -90,12 +89,8 @@ describe('Board card', () => {
});
});
describe.each`
isSwimlanesOn
${true} | ${false}
`('when isSwimlanesOn is $isSwimlanesOn', ({ isSwimlanesOn }) => {
it('should not highlight the card by default', async () => {
createStore({ isSwimlanesOn });
createStore();
mountComponent();
expect(wrapper.classes()).not.toContain('is-active');
......@@ -107,7 +102,6 @@ describe('Board card', () => {
initialState: {
activeId: mockIssue.id,
},
isSwimlanesOn,
});
mountComponent();
......@@ -121,7 +115,6 @@ describe('Board card', () => {
activeId: inactiveId,
selectedBoardItems: [mockIssue],
},
isSwimlanesOn,
});
mountComponent();
......@@ -131,7 +124,7 @@ describe('Board card', () => {
describe('when mouseup event is called on the card', () => {
beforeEach(() => {
createStore({ isSwimlanesOn });
createStore();
mountComponent();
});
......@@ -158,5 +151,4 @@ describe('Board card', () => {
});
});
});
});
});
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