Commit da521deb authored by Filipa Lacerda's avatar Filipa Lacerda

Merge branch 'enable-image-comments-for-renamed-files' into 'master'

Fixed image commenting on moved files

See merge request gitlab-org/gitlab-ce!23023
parents a4729ffa 73d3cb8c
...@@ -44,8 +44,11 @@ export default { ...@@ -44,8 +44,11 @@ export default {
isNew() { isNew() {
return this.diffMode === diffModes.new; return this.diffMode === diffModes.new;
}, },
isRenamed() {
return this.diffMode === diffModes.renamed;
},
imagePath() { imagePath() {
return this.isNew ? this.newPath : this.oldPath; return this.isNew || this.isRenamed ? this.newPath : this.oldPath;
}, },
}, },
methods: { methods: {
...@@ -114,7 +117,7 @@ export default { ...@@ -114,7 +117,7 @@ export default {
}]" }]"
> >
<slot <slot
v-if="isNew" v-if="isNew || isRenamed"
slot="image-overlay" slot="image-overlay"
name="image-overlay" name="image-overlay"
> >
......
...@@ -97,6 +97,26 @@ describe('ImageDiffViewer', () => { ...@@ -97,6 +97,26 @@ describe('ImageDiffViewer', () => {
}); });
}); });
it('renders image diff for renamed', done => {
vm = new Vue({
components: {
imageDiffViewer,
},
template: `
<image-diff-viewer diff-mode="renamed" new-path="${GREEN_BOX_IMAGE_URL}" old-path="">
<span slot="image-overlay" class="overlay">test</span>
</image-diff-viewer>
`,
}).$mount();
setTimeout(() => {
expect(vm.$el.querySelector('img').getAttribute('src')).toBe(GREEN_BOX_IMAGE_URL);
expect(vm.$el.querySelector('.overlay')).not.toBe(null);
done();
});
});
describe('swipeMode', () => { describe('swipeMode', () => {
beforeEach(done => { beforeEach(done => {
createComponent({ createComponent({
......
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