Commit 88eadb00 authored by Lukas Eipert's avatar Lukas Eipert

Properly overwrite the BoardPromotionState in Enterprise

Apparenly dynamic imports don't work properly. Let's just overwrite it
in the Enterprise version.
parent 8d390d16
...@@ -5,6 +5,7 @@ import { GlButtonGroup, GlButton, GlLabel, GlTooltip, GlIcon } from '@gitlab/ui' ...@@ -5,6 +5,7 @@ import { GlButtonGroup, GlButton, GlLabel, GlTooltip, GlIcon } from '@gitlab/ui'
import isWipLimitsOn from 'ee_else_ce/boards/mixins/is_wip_limits'; import isWipLimitsOn from 'ee_else_ce/boards/mixins/is_wip_limits';
import { s__, __, sprintf } from '~/locale'; import { s__, __, sprintf } from '~/locale';
import Tooltip from '~/vue_shared/directives/tooltip'; import Tooltip from '~/vue_shared/directives/tooltip';
import EmptyComponent from '~/vue_shared/components/empty_component';
import AccessorUtilities from '../../lib/utils/accessor'; import AccessorUtilities from '../../lib/utils/accessor';
import BoardBlankState from './board_blank_state.vue'; import BoardBlankState from './board_blank_state.vue';
import BoardDelete from './board_delete'; import BoardDelete from './board_delete';
...@@ -17,7 +18,7 @@ import { isScopedLabel } from '~/lib/utils/common_utils'; ...@@ -17,7 +18,7 @@ import { isScopedLabel } from '~/lib/utils/common_utils';
export default { export default {
components: { components: {
BoardPromotionState: () => import('ee_component/boards/components/board_promotion_state.vue'), BoardPromotionState: EmptyComponent,
BoardBlankState, BoardBlankState,
BoardDelete, BoardDelete,
BoardList, BoardList,
......
...@@ -3,8 +3,12 @@ import { mapActions } from 'vuex'; ...@@ -3,8 +3,12 @@ import { mapActions } from 'vuex';
import BoardColumnFoss from '~/boards/components/board_column.vue'; import BoardColumnFoss from '~/boards/components/board_column.vue';
import { __, sprintf, s__ } from '~/locale'; import { __, sprintf, s__ } from '~/locale';
import boardsStore from '~/boards/stores/boards_store'; import boardsStore from '~/boards/stores/boards_store';
import BoardPromotionState from 'ee/boards/components/board_promotion_state';
export default { export default {
components: {
BoardPromotionState,
},
extends: BoardColumnFoss, extends: BoardColumnFoss,
data() { data() {
return { return {
......
...@@ -10,6 +10,10 @@ import axios from '~/lib/utils/axios_utils'; ...@@ -10,6 +10,10 @@ import axios from '~/lib/utils/axios_utils';
import { TEST_HOST } from 'helpers/test_constants'; import { TEST_HOST } from 'helpers/test_constants';
import { listObj } from 'jest/boards/mock_data'; import { listObj } from 'jest/boards/mock_data';
// board_promotion_state tries to mount on the real DOM,
// so we are mocking it in this test
jest.mock('ee/boards/components/board_promotion_state', () => ({}));
describe('Board Column Component', () => { describe('Board Column Component', () => {
let wrapper; let wrapper;
let axiosMock; let axiosMock;
......
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