Merge branch '63984-rename-in-folder' into 'master'
Hid re-named entries in subfolders Closes #63984 See merge request gitlab-org/gitlab-ce!30242
This commit is contained in:
commit
3fd4c77ee4
|
@ -131,7 +131,7 @@ export default {
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<div>
|
<div v-if="!file.moved">
|
||||||
<file-header v-if="file.isHeader" :path="file.path" />
|
<file-header v-if="file.isHeader" :path="file.path" />
|
||||||
<div
|
<div
|
||||||
v-else
|
v-else
|
||||||
|
|
|
@ -90,6 +90,19 @@ describe('File row component', () => {
|
||||||
expect(vm.$el.querySelector('.js-file-row-header')).not.toBe(null);
|
expect(vm.$el.querySelector('.js-file-row-header')).not.toBe(null);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('is not rendered for `moved` entries in subfolders', () => {
|
||||||
|
createComponent({
|
||||||
|
file: {
|
||||||
|
path: 't5',
|
||||||
|
moved: true,
|
||||||
|
tree: [],
|
||||||
|
},
|
||||||
|
level: 2,
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(vm.$el.nodeType).not.toEqual(1);
|
||||||
|
});
|
||||||
|
|
||||||
describe('new dropdown', () => {
|
describe('new dropdown', () => {
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
createComponent({
|
createComponent({
|
||||||
|
|
Loading…
Reference in New Issue