Commit 2a9294e7 authored by Jacques Erasmus's avatar Jacques Erasmus

Merge branch...

Merge branch '342269-app-assets-javascripts-jobs-components-trigger_block-vue-consider-using-gltablelite' into 'master'

Update jobs/components/trigger_block.vue to use GlTableLite

See merge request gitlab-org/gitlab!84380
parents d74bef76 3378baf0
<script> <script>
import { GlButton, GlTable } from '@gitlab/ui'; import { GlButton, GlTableLite } from '@gitlab/ui';
import { __ } from '~/locale'; import { __ } from '~/locale';
const DEFAULT_TD_CLASSES = 'gl-w-half gl-font-sm! gl-border-gray-200!'; const DEFAULT_TD_CLASSES = 'gl-w-half gl-font-sm! gl-border-gray-200!';
...@@ -25,7 +25,7 @@ export default { ...@@ -25,7 +25,7 @@ export default {
], ],
components: { components: {
GlButton, GlButton,
GlTable, GlTableLite,
}, },
props: { props: {
trigger: { trigger: {
...@@ -84,7 +84,7 @@ export default { ...@@ -84,7 +84,7 @@ export default {
> >
</p> </p>
<gl-table :items="trigger.variables" :fields="$options.fields" small bordered fixed> <gl-table-lite :items="trigger.variables" :fields="$options.fields" small bordered fixed>
<template #cell(key)="{ item }"> <template #cell(key)="{ item }">
<span class="gl-overflow-break-word">{{ item.key }}</span> <span class="gl-overflow-break-word">{{ item.key }}</span>
</template> </template>
...@@ -92,7 +92,7 @@ export default { ...@@ -92,7 +92,7 @@ export default {
<template #cell(value)="data"> <template #cell(value)="data">
<span class="gl-overflow-break-word">{{ getDisplayValue(data.value) }}</span> <span class="gl-overflow-break-word">{{ getDisplayValue(data.value) }}</span>
</template> </template>
</gl-table> </gl-table-lite>
</template> </template>
</div> </div>
</template> </template>
import { GlButton, GlTable } from '@gitlab/ui'; import { GlButton, GlTableLite } from '@gitlab/ui';
import { mount } from '@vue/test-utils'; import { mount } from '@vue/test-utils';
import TriggerBlock from '~/jobs/components/trigger_block.vue'; import TriggerBlock from '~/jobs/components/trigger_block.vue';
describe('Trigger block', () => { describe('Trigger block', () => {
let wrapper; let wrapper;
const findRevealButton = () => wrapper.find(GlButton); const findRevealButton = () => wrapper.findComponent(GlButton);
const findVariableTable = () => wrapper.find(GlTable); const findVariableTable = () => wrapper.findComponent(GlTableLite);
const findShortToken = () => wrapper.find('[data-testid="trigger-short-token"]'); const findShortToken = () => wrapper.find('[data-testid="trigger-short-token"]');
const findVariableValue = (index) => const findVariableValue = (index) =>
wrapper.findAll('[data-testid="trigger-build-value"]').at(index); wrapper.findAll('[data-testid="trigger-build-value"]').at(index);
...@@ -22,7 +22,6 @@ describe('Trigger block', () => { ...@@ -22,7 +22,6 @@ describe('Trigger block', () => {
afterEach(() => { afterEach(() => {
wrapper.destroy(); wrapper.destroy();
wrapper = null;
}); });
describe('with short token and no variables', () => { describe('with short token and no variables', () => {
......
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