2015-12-11 12:02:57 -05:00
|
|
|
|
<!DOCTYPE html>
|
|
|
|
|
|
<!--
|
|
|
|
|
|
Copyright (C) 2015 The Android Open Source Project
|
|
|
|
|
|
|
|
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
|
|
|
|
you may not use this file except in compliance with the License.
|
|
|
|
|
|
You may obtain a copy of the License at
|
|
|
|
|
|
|
|
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
|
|
|
|
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
|
|
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
|
|
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
|
|
|
|
See the License for the specific language governing permissions and
|
|
|
|
|
|
limitations under the License.
|
|
|
|
|
|
-->
|
|
|
|
|
|
|
|
|
|
|
|
<meta name="viewport" content="width=device-width, minimum-scale=1.0, initial-scale=1.0, user-scalable=yes">
|
|
|
|
|
|
<title>gr-diff</title>
|
|
|
|
|
|
|
2017-03-28 17:02:44 -07:00
|
|
|
|
<script src="../../../bower_components/webcomponentsjs/webcomponents-lite.min.js"></script>
|
2016-03-04 17:48:22 -05:00
|
|
|
|
<script src="../../../bower_components/web-component-tester/browser.js"></script>
|
2016-05-23 17:18:43 -07:00
|
|
|
|
<script src="../../../scripts/util.js"></script>
|
2015-12-11 12:02:57 -05:00
|
|
|
|
|
2017-06-02 16:31:56 +00:00
|
|
|
|
<link rel="import" href="../../../bower_components/iron-test-helpers/iron-test-helpers.html">
|
2017-03-14 16:34:15 -07:00
|
|
|
|
<link rel="import" href="../../shared/gr-rest-api-interface/mock-diff-response_test.html">
|
2016-03-04 17:48:22 -05:00
|
|
|
|
<link rel="import" href="gr-diff.html">
|
2015-12-11 12:02:57 -05:00
|
|
|
|
|
2017-03-28 17:02:44 -07:00
|
|
|
|
<script>void(0);</script>
|
|
|
|
|
|
|
2015-12-11 12:02:57 -05:00
|
|
|
|
<test-fixture id="basic">
|
|
|
|
|
|
<template>
|
2016-01-11 20:43:02 -05:00
|
|
|
|
<gr-diff></gr-diff>
|
2015-12-11 12:02:57 -05:00
|
|
|
|
</template>
|
|
|
|
|
|
</test-fixture>
|
|
|
|
|
|
|
|
|
|
|
|
<script>
|
2017-05-16 13:33:41 -07:00
|
|
|
|
suite('gr-diff tests', () => {
|
|
|
|
|
|
let element;
|
|
|
|
|
|
let sandbox;
|
2017-01-27 15:33:08 -08:00
|
|
|
|
|
2017-05-16 13:33:41 -07:00
|
|
|
|
setup(() => {
|
2017-01-27 15:33:08 -08:00
|
|
|
|
sandbox = sinon.sandbox.create();
|
|
|
|
|
|
});
|
|
|
|
|
|
|
2017-05-16 13:33:41 -07:00
|
|
|
|
teardown(() => {
|
2017-01-27 15:33:08 -08:00
|
|
|
|
sandbox.restore();
|
|
|
|
|
|
});
|
2015-12-11 12:02:57 -05:00
|
|
|
|
|
2017-05-16 13:33:41 -07:00
|
|
|
|
suite('not logged in', () => {
|
|
|
|
|
|
setup(() => {
|
2016-05-23 15:24:05 -07:00
|
|
|
|
stub('gr-rest-api-interface', {
|
2017-05-16 13:33:41 -07:00
|
|
|
|
getLoggedIn() { return Promise.resolve(false); },
|
2016-05-23 15:24:05 -07:00
|
|
|
|
});
|
|
|
|
|
|
element = fixture('basic');
|
2016-03-25 16:48:13 -04:00
|
|
|
|
});
|
2015-12-11 12:02:57 -05:00
|
|
|
|
|
2017-05-16 13:33:41 -07:00
|
|
|
|
test('toggleLeftDiff', () => {
|
2016-08-10 11:53:12 -07:00
|
|
|
|
element.toggleLeftDiff();
|
|
|
|
|
|
assert.isTrue(element.classList.contains('no-left'));
|
|
|
|
|
|
element.toggleLeftDiff();
|
|
|
|
|
|
assert.isFalse(element.classList.contains('no-left'));
|
|
|
|
|
|
});
|
|
|
|
|
|
|
2017-05-16 13:33:41 -07:00
|
|
|
|
test('addDraftAtLine', done => {
|
2017-03-23 10:13:17 -07:00
|
|
|
|
sandbox.stub(element, '_selectLine');
|
2017-05-16 13:33:41 -07:00
|
|
|
|
const loggedInErrorSpy = sandbox.spy();
|
2017-03-23 10:13:17 -07:00
|
|
|
|
element.addEventListener('show-auth-required', loggedInErrorSpy);
|
|
|
|
|
|
element.addDraftAtLine();
|
2017-05-16 13:33:41 -07:00
|
|
|
|
flush(() => {
|
2017-03-23 10:13:17 -07:00
|
|
|
|
assert.isTrue(loggedInErrorSpy.called);
|
|
|
|
|
|
done();
|
|
|
|
|
|
});
|
|
|
|
|
|
});
|
|
|
|
|
|
|
2017-05-16 13:33:41 -07:00
|
|
|
|
test('view does not start with displayLine classList', () => {
|
2016-11-02 16:25:53 -07:00
|
|
|
|
assert.isFalse(
|
|
|
|
|
|
element.$$('.diffContainer').classList.contains('displayLine'));
|
|
|
|
|
|
});
|
|
|
|
|
|
|
2017-05-16 13:33:41 -07:00
|
|
|
|
test('displayLine class added called when displayLine is true', () => {
|
|
|
|
|
|
const spy = sandbox.spy(element, '_computeContainerClass');
|
2016-11-02 16:25:53 -07:00
|
|
|
|
element.displayLine = true;
|
|
|
|
|
|
assert.isTrue(spy.called);
|
|
|
|
|
|
assert.isTrue(
|
|
|
|
|
|
element.$$('.diffContainer').classList.contains('displayLine'));
|
|
|
|
|
|
});
|
|
|
|
|
|
|
2017-05-16 13:33:41 -07:00
|
|
|
|
test('get drafts', done => {
|
2016-05-23 15:24:05 -07:00
|
|
|
|
element.patchRange = {basePatchNum: 0, patchNum: 0};
|
|
|
|
|
|
|
2017-05-16 13:33:41 -07:00
|
|
|
|
const getDraftsStub = sandbox.stub(element.$.restAPI, 'getDiffDrafts');
|
|
|
|
|
|
element._getDiffDrafts().then(result => {
|
2016-05-23 15:24:05 -07:00
|
|
|
|
assert.deepEqual(result, {baseComments: [], comments: []});
|
|
|
|
|
|
sinon.assert.notCalled(getDraftsStub);
|
|
|
|
|
|
done();
|
|
|
|
|
|
});
|
2016-03-06 14:57:02 +01:00
|
|
|
|
});
|
2015-12-20 19:13:45 -05:00
|
|
|
|
|
2017-05-16 13:33:41 -07:00
|
|
|
|
test('get robot comments', done => {
|
2016-12-07 13:36:49 -08:00
|
|
|
|
element.patchRange = {basePatchNum: 0, patchNum: 0};
|
|
|
|
|
|
|
2017-05-16 13:33:41 -07:00
|
|
|
|
const getDraftsStub = sandbox.stub(element.$.restAPI,
|
2016-12-07 13:36:49 -08:00
|
|
|
|
'getDiffRobotComments');
|
2017-05-16 13:33:41 -07:00
|
|
|
|
element._getDiffDrafts().then(result => {
|
2016-12-07 13:36:49 -08:00
|
|
|
|
assert.deepEqual(result, {baseComments: [], comments: []});
|
|
|
|
|
|
sinon.assert.notCalled(getDraftsStub);
|
|
|
|
|
|
done();
|
|
|
|
|
|
});
|
|
|
|
|
|
});
|
|
|
|
|
|
|
2017-05-16 13:33:41 -07:00
|
|
|
|
test('loads files weblinks', done => {
|
|
|
|
|
|
sandbox.stub(element.$.restAPI, 'getDiff').returns(
|
2016-08-03 13:16:36 -07:00
|
|
|
|
Promise.resolve({
|
|
|
|
|
|
meta_a: {
|
|
|
|
|
|
web_links: 'foo',
|
|
|
|
|
|
},
|
|
|
|
|
|
meta_b: {
|
|
|
|
|
|
web_links: 'bar',
|
|
|
|
|
|
},
|
|
|
|
|
|
}));
|
|
|
|
|
|
element.patchRange = {};
|
2017-05-16 13:33:41 -07:00
|
|
|
|
element._getDiff().then(() => {
|
2016-08-03 13:16:36 -07:00
|
|
|
|
assert.deepEqual(element.filesWeblinks, {
|
|
|
|
|
|
meta_a: 'foo',
|
|
|
|
|
|
meta_b: 'bar',
|
|
|
|
|
|
});
|
|
|
|
|
|
done();
|
|
|
|
|
|
});
|
|
|
|
|
|
});
|
|
|
|
|
|
|
2017-05-16 13:33:41 -07:00
|
|
|
|
test('remove comment', () => {
|
2016-05-23 15:24:05 -07:00
|
|
|
|
element._comments = {
|
2016-03-25 16:48:13 -04:00
|
|
|
|
meta: {
|
|
|
|
|
|
changeNum: '42',
|
|
|
|
|
|
patchRange: {
|
|
|
|
|
|
basePatchNum: 'PARENT',
|
|
|
|
|
|
patchNum: 3,
|
|
|
|
|
|
},
|
|
|
|
|
|
path: '/path/to/foo',
|
|
|
|
|
|
projectConfig: {foo: 'bar'},
|
|
|
|
|
|
},
|
|
|
|
|
|
left: [
|
2017-01-30 12:03:13 -08:00
|
|
|
|
{id: 'bc1', side: 'PARENT', __commentSide: 'left'},
|
|
|
|
|
|
{id: 'bc2', side: 'PARENT', __commentSide: 'left'},
|
|
|
|
|
|
{id: 'bd1', __draft: true, side: 'PARENT', __commentSide: 'left'},
|
|
|
|
|
|
{id: 'bd2', __draft: true, side: 'PARENT', __commentSide: 'left'},
|
2016-03-25 16:48:13 -04:00
|
|
|
|
],
|
|
|
|
|
|
right: [
|
2017-01-30 12:03:13 -08:00
|
|
|
|
{id: 'c1', __commentSide: 'right'},
|
|
|
|
|
|
{id: 'c2', __commentSide: 'right'},
|
|
|
|
|
|
{id: 'd1', __draft: true, __commentSide: 'right'},
|
|
|
|
|
|
{id: 'd2', __draft: true, __commentSide: 'right'},
|
2016-03-25 16:48:13 -04:00
|
|
|
|
],
|
2016-05-23 15:24:05 -07:00
|
|
|
|
};
|
2016-01-06 10:43:30 -05:00
|
|
|
|
|
2016-05-23 15:24:05 -07:00
|
|
|
|
element._removeComment({});
|
|
|
|
|
|
// Using JSON.stringify because Safari 9.1 (11601.5.17.1) doesn’t seem
|
|
|
|
|
|
// to believe that one object deepEquals another even when they do :-/.
|
|
|
|
|
|
assert.equal(JSON.stringify(element._comments), JSON.stringify({
|
|
|
|
|
|
meta: {
|
|
|
|
|
|
changeNum: '42',
|
|
|
|
|
|
patchRange: {
|
|
|
|
|
|
basePatchNum: 'PARENT',
|
|
|
|
|
|
patchNum: 3,
|
|
|
|
|
|
},
|
|
|
|
|
|
path: '/path/to/foo',
|
|
|
|
|
|
projectConfig: {foo: 'bar'},
|
|
|
|
|
|
},
|
|
|
|
|
|
left: [
|
2017-01-30 12:03:13 -08:00
|
|
|
|
{id: 'bc1', side: 'PARENT', __commentSide: 'left'},
|
|
|
|
|
|
{id: 'bc2', side: 'PARENT', __commentSide: 'left'},
|
|
|
|
|
|
{id: 'bd1', __draft: true, side: 'PARENT', __commentSide: 'left'},
|
|
|
|
|
|
{id: 'bd2', __draft: true, side: 'PARENT', __commentSide: 'left'},
|
2016-05-23 15:24:05 -07:00
|
|
|
|
],
|
|
|
|
|
|
right: [
|
2017-01-30 12:03:13 -08:00
|
|
|
|
{id: 'c1', __commentSide: 'right'},
|
|
|
|
|
|
{id: 'c2', __commentSide: 'right'},
|
|
|
|
|
|
{id: 'd1', __draft: true, __commentSide: 'right'},
|
|
|
|
|
|
{id: 'd2', __draft: true, __commentSide: 'right'},
|
2016-05-23 15:24:05 -07:00
|
|
|
|
],
|
|
|
|
|
|
}));
|
2016-01-19 16:55:47 -05:00
|
|
|
|
|
2017-01-30 12:03:13 -08:00
|
|
|
|
element._removeComment({id: 'bc2', side: 'PARENT',
|
2017-05-16 13:33:41 -07:00
|
|
|
|
__commentSide: 'left'});
|
2017-01-30 12:03:13 -08:00
|
|
|
|
assert.deepEqual(element._comments, {
|
2016-05-23 15:24:05 -07:00
|
|
|
|
meta: {
|
|
|
|
|
|
changeNum: '42',
|
|
|
|
|
|
patchRange: {
|
|
|
|
|
|
basePatchNum: 'PARENT',
|
|
|
|
|
|
patchNum: 3,
|
|
|
|
|
|
},
|
|
|
|
|
|
path: '/path/to/foo',
|
|
|
|
|
|
projectConfig: {foo: 'bar'},
|
2016-03-25 16:48:13 -04:00
|
|
|
|
},
|
2016-05-23 15:24:05 -07:00
|
|
|
|
left: [
|
2017-01-30 12:03:13 -08:00
|
|
|
|
{id: 'bc1', side: 'PARENT', __commentSide: 'left'},
|
|
|
|
|
|
{id: 'bd1', __draft: true, side: 'PARENT', __commentSide: 'left'},
|
|
|
|
|
|
{id: 'bd2', __draft: true, side: 'PARENT', __commentSide: 'left'},
|
2016-05-23 15:24:05 -07:00
|
|
|
|
],
|
|
|
|
|
|
right: [
|
2017-01-30 12:03:13 -08:00
|
|
|
|
{id: 'c1', __commentSide: 'right'},
|
|
|
|
|
|
{id: 'c2', __commentSide: 'right'},
|
|
|
|
|
|
{id: 'd1', __draft: true, __commentSide: 'right'},
|
|
|
|
|
|
{id: 'd2', __draft: true, __commentSide: 'right'},
|
2016-05-23 15:24:05 -07:00
|
|
|
|
],
|
2017-01-30 12:03:13 -08:00
|
|
|
|
});
|
2016-05-23 15:24:05 -07:00
|
|
|
|
|
2017-01-30 12:03:13 -08:00
|
|
|
|
element._removeComment({id: 'd2', __commentSide: 'right'});
|
|
|
|
|
|
assert.deepEqual(element._comments, {
|
2016-05-23 15:24:05 -07:00
|
|
|
|
meta: {
|
|
|
|
|
|
changeNum: '42',
|
|
|
|
|
|
patchRange: {
|
|
|
|
|
|
basePatchNum: 'PARENT',
|
|
|
|
|
|
patchNum: 3,
|
|
|
|
|
|
},
|
|
|
|
|
|
path: '/path/to/foo',
|
|
|
|
|
|
projectConfig: {foo: 'bar'},
|
2016-03-25 16:48:13 -04:00
|
|
|
|
},
|
2016-05-23 15:24:05 -07:00
|
|
|
|
left: [
|
2017-01-30 12:03:13 -08:00
|
|
|
|
{id: 'bc1', side: 'PARENT', __commentSide: 'left'},
|
|
|
|
|
|
{id: 'bd1', __draft: true, side: 'PARENT', __commentSide: 'left'},
|
|
|
|
|
|
{id: 'bd2', __draft: true, side: 'PARENT', __commentSide: 'left'},
|
2016-05-23 15:24:05 -07:00
|
|
|
|
],
|
|
|
|
|
|
right: [
|
2017-01-30 12:03:13 -08:00
|
|
|
|
{id: 'c1', __commentSide: 'right'},
|
|
|
|
|
|
{id: 'c2', __commentSide: 'right'},
|
|
|
|
|
|
{id: 'd1', __draft: true, __commentSide: 'right'},
|
2016-05-23 15:24:05 -07:00
|
|
|
|
],
|
2017-01-30 12:03:13 -08:00
|
|
|
|
});
|
2016-05-23 15:24:05 -07:00
|
|
|
|
});
|
|
|
|
|
|
|
2017-05-16 13:33:41 -07:00
|
|
|
|
test('thread groups', () => {
|
|
|
|
|
|
const contentEl = document.createElement('div');
|
|
|
|
|
|
const commentSide = 'left';
|
|
|
|
|
|
const patchNum = 1;
|
|
|
|
|
|
const side = 'PARENT';
|
|
|
|
|
|
let range = {
|
2017-01-27 15:33:08 -08:00
|
|
|
|
startLine: 1,
|
|
|
|
|
|
startChar: 1,
|
|
|
|
|
|
endLine: 1,
|
|
|
|
|
|
endChar: 2,
|
|
|
|
|
|
};
|
|
|
|
|
|
|
2017-01-30 12:03:13 -08:00
|
|
|
|
element.changeNum = 123;
|
|
|
|
|
|
element.patchRange = {basePatchNum: 1, patchNum: 2};
|
|
|
|
|
|
element.path = 'file.txt';
|
|
|
|
|
|
|
2017-05-16 13:33:41 -07:00
|
|
|
|
sandbox.stub(element.$.diffBuilder, 'createCommentThreadGroup', () => {
|
|
|
|
|
|
const threadGroup =
|
|
|
|
|
|
document.createElement('gr-diff-comment-thread-group');
|
2017-02-09 07:34:23 -08:00
|
|
|
|
threadGroup.patchForNewThreads = 1;
|
|
|
|
|
|
return threadGroup;
|
2017-01-27 15:33:08 -08:00
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
|
|
// No thread groups.
|
|
|
|
|
|
assert.isNotOk(element._getThreadGroupForLine(contentEl));
|
|
|
|
|
|
|
|
|
|
|
|
// A thread group gets created.
|
2017-02-09 07:34:23 -08:00
|
|
|
|
assert.isOk(element._getOrCreateThreadAtLineRange(contentEl,
|
|
|
|
|
|
patchNum, commentSide, side));
|
2017-01-27 15:33:08 -08:00
|
|
|
|
|
|
|
|
|
|
// Try to fetch a thread with a different range.
|
|
|
|
|
|
range = {
|
|
|
|
|
|
startLine: 1,
|
|
|
|
|
|
startChar: 1,
|
|
|
|
|
|
endLine: 1,
|
|
|
|
|
|
endChar: 3,
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
assert.isOk(element._getOrCreateThreadAtLineRange(
|
2017-01-30 12:03:13 -08:00
|
|
|
|
contentEl, patchNum, commentSide, side, range));
|
2017-01-27 15:33:08 -08:00
|
|
|
|
// The new thread group can be fetched.
|
|
|
|
|
|
assert.isOk(element._getThreadGroupForLine(contentEl));
|
|
|
|
|
|
|
|
|
|
|
|
assert.equal(contentEl.querySelectorAll(
|
|
|
|
|
|
'gr-diff-comment-thread-group').length, 1);
|
|
|
|
|
|
|
2017-05-16 13:33:41 -07:00
|
|
|
|
const threadGroup = contentEl.querySelector(
|
2017-01-27 15:33:08 -08:00
|
|
|
|
'gr-diff-comment-thread-group');
|
2017-05-16 13:33:41 -07:00
|
|
|
|
const threadLength = Polymer.dom(threadGroup.root).
|
2017-01-27 15:33:08 -08:00
|
|
|
|
querySelectorAll('gr-diff-comment-thread').length;
|
|
|
|
|
|
assert.equal(threadLength, 2);
|
|
|
|
|
|
});
|
|
|
|
|
|
|
2017-05-16 13:33:41 -07:00
|
|
|
|
suite('image diffs', () => {
|
|
|
|
|
|
let mockFile1;
|
|
|
|
|
|
let mockFile2;
|
|
|
|
|
|
const stubs = [];
|
|
|
|
|
|
setup(() => {
|
2017-03-29 17:29:17 -07:00
|
|
|
|
mockFile1 = {
|
|
|
|
|
|
body: 'Qk06AAAAAAAAADYAAAAoAAAAAQAAAP////8BACAAAAAAAAAAAAATCwAAE' +
|
|
|
|
|
|
'wsAAAAAAAAAAAAAAAAA/w==',
|
|
|
|
|
|
type: 'image/bmp',
|
|
|
|
|
|
};
|
|
|
|
|
|
mockFile2 = {
|
|
|
|
|
|
body: 'Qk06AAAAAAAAADYAAAAoAAAAAQAAAP////8BACAAAAAAAAAAAAATCwAAE' +
|
|
|
|
|
|
'wsAAAAAAAAAAAAA/////w==',
|
2017-05-16 13:33:41 -07:00
|
|
|
|
type: 'image/bmp',
|
2017-03-29 17:29:17 -07:00
|
|
|
|
};
|
2017-05-16 13:33:41 -07:00
|
|
|
|
const mockCommit = {
|
2017-03-29 17:29:17 -07:00
|
|
|
|
commit: '9a1a1d10baece5efbba10bc4ccf808a67a50ac0a',
|
|
|
|
|
|
parents: [{
|
|
|
|
|
|
commit: '7338aa9adfe57909f1fdaf88975cdea467d3382f',
|
|
|
|
|
|
subject: 'Added a carrot',
|
|
|
|
|
|
}],
|
|
|
|
|
|
author: {
|
|
|
|
|
|
name: 'Wyatt Allen',
|
|
|
|
|
|
email: 'wyatta@google.com',
|
|
|
|
|
|
date: '2016-05-23 21:44:51.000000000',
|
|
|
|
|
|
tz: -420,
|
|
|
|
|
|
},
|
|
|
|
|
|
committer: {
|
|
|
|
|
|
name: 'Wyatt Allen',
|
|
|
|
|
|
email: 'wyatta@google.com',
|
|
|
|
|
|
date: '2016-05-25 00:25:41.000000000',
|
|
|
|
|
|
tz: -420,
|
|
|
|
|
|
},
|
|
|
|
|
|
subject: 'Updated the carrot',
|
|
|
|
|
|
message: 'Updated the carrot\n\nChange-Id: Iabcd123\n',
|
|
|
|
|
|
};
|
2017-05-16 13:33:41 -07:00
|
|
|
|
const mockComments = {baseComments: [], comments: []};
|
2017-03-29 17:29:17 -07:00
|
|
|
|
|
|
|
|
|
|
stubs.push(sandbox.stub(element.$.restAPI, 'getCommitInfo',
|
2017-05-16 13:33:41 -07:00
|
|
|
|
() => Promise.resolve(mockCommit)));
|
2017-03-29 17:29:17 -07:00
|
|
|
|
stubs.push(sandbox.stub(element.$.restAPI,
|
|
|
|
|
|
'getChangeFileContents',
|
2017-05-16 13:33:41 -07:00
|
|
|
|
(changeId, patchNum, path, opt_parentIndex) => {
|
2017-05-05 10:08:47 -07:00
|
|
|
|
return Promise.resolve(opt_parentIndex === 1 ? mockFile1 :
|
|
|
|
|
|
mockFile2);
|
|
|
|
|
|
}));
|
2017-03-29 17:29:17 -07:00
|
|
|
|
stubs.push(sandbox.stub(element.$.restAPI, '_getDiffComments',
|
2017-05-16 13:33:41 -07:00
|
|
|
|
() => Promise.resolve(mockComments)));
|
2017-03-29 17:29:17 -07:00
|
|
|
|
stubs.push(sandbox.stub(element.$.restAPI, 'getDiffDrafts',
|
2017-05-16 13:33:41 -07:00
|
|
|
|
() => Promise.resolve(mockComments)));
|
2017-03-29 17:29:17 -07:00
|
|
|
|
|
|
|
|
|
|
element.patchRange = {basePatchNum: 'PARENT', patchNum: 1};
|
|
|
|
|
|
});
|
2016-05-23 15:24:05 -07:00
|
|
|
|
|
2017-05-16 13:33:41 -07:00
|
|
|
|
test('renders image diffs with same file name', done => {
|
|
|
|
|
|
const mockDiff = {
|
2017-03-29 17:29:17 -07:00
|
|
|
|
meta_a: {name: 'carrot.jpg', content_type: 'image/jpeg', lines: 66},
|
|
|
|
|
|
meta_b: {name: 'carrot.jpg', content_type: 'image/jpeg',
|
2017-05-16 13:33:41 -07:00
|
|
|
|
lines: 560},
|
2017-03-29 17:29:17 -07:00
|
|
|
|
intraline_status: 'OK',
|
|
|
|
|
|
change_type: 'MODIFIED',
|
|
|
|
|
|
diff_header: [
|
|
|
|
|
|
'diff --git a/carrot.jpg b/carrot.jpg',
|
|
|
|
|
|
'index 2adc47d..f9c2f2c 100644',
|
|
|
|
|
|
'--- a/carrot.jpg',
|
|
|
|
|
|
'+++ b/carrot.jpg',
|
|
|
|
|
|
'Binary files differ',
|
|
|
|
|
|
],
|
|
|
|
|
|
content: [{skip: 66}],
|
|
|
|
|
|
binary: true,
|
|
|
|
|
|
};
|
|
|
|
|
|
stubs.push(sandbox.stub(element, '_getDiff',
|
2017-05-16 13:33:41 -07:00
|
|
|
|
() => Promise.resolve(mockDiff)));
|
2017-03-29 17:29:17 -07:00
|
|
|
|
|
2017-05-16 13:33:41 -07:00
|
|
|
|
const rendered = () => {
|
2017-03-29 17:29:17 -07:00
|
|
|
|
// Recognizes that it should be an image diff.
|
|
|
|
|
|
assert.isTrue(element.isImageDiff);
|
|
|
|
|
|
assert.instanceOf(
|
2017-05-16 13:33:41 -07:00
|
|
|
|
element.$.diffBuilder._builder, GrDiffBuilderImage);
|
2017-03-29 17:29:17 -07:00
|
|
|
|
|
|
|
|
|
|
// Left image rendered with the parent commit's version of the file.
|
2017-05-16 13:33:41 -07:00
|
|
|
|
const leftImage = element.$.diffTable.querySelector('td.left img');
|
|
|
|
|
|
const leftLabel =
|
|
|
|
|
|
element.$.diffTable.querySelector('td.left label');
|
|
|
|
|
|
const leftLabelContent = leftLabel.querySelector('.label');
|
|
|
|
|
|
const leftLabelName = leftLabel.querySelector('.name');
|
|
|
|
|
|
|
|
|
|
|
|
const rightImage =
|
|
|
|
|
|
element.$.diffTable.querySelector('td.right img');
|
|
|
|
|
|
const rightLabel = element.$.diffTable.querySelector(
|
|
|
|
|
|
'td.right label');
|
|
|
|
|
|
const rightLabelContent = rightLabel.querySelector('.label');
|
|
|
|
|
|
const rightLabelName = rightLabel.querySelector('.name');
|
2017-03-29 17:29:17 -07:00
|
|
|
|
|
|
|
|
|
|
assert.isNotOk(rightLabelName);
|
|
|
|
|
|
assert.isNotOk(leftLabelName);
|
|
|
|
|
|
|
2017-05-16 13:33:41 -07:00
|
|
|
|
let leftLoaded = false;
|
|
|
|
|
|
let rightLoaded = false;
|
2017-03-29 17:29:17 -07:00
|
|
|
|
|
2017-05-16 13:33:41 -07:00
|
|
|
|
leftImage.addEventListener('load', () => {
|
2017-03-29 17:29:17 -07:00
|
|
|
|
assert.isOk(leftImage);
|
|
|
|
|
|
assert.equal(leftImage.getAttribute('src'),
|
|
|
|
|
|
'data:image/bmp;base64, ' + mockFile1.body);
|
|
|
|
|
|
assert.equal(leftLabelContent.textContent, '1⨉1 image/bmp');
|
|
|
|
|
|
leftLoaded = true;
|
|
|
|
|
|
if (rightLoaded) {
|
|
|
|
|
|
element.removeEventListener('render', rendered);
|
|
|
|
|
|
done();
|
|
|
|
|
|
}
|
|
|
|
|
|
});
|
|
|
|
|
|
|
2017-05-16 13:33:41 -07:00
|
|
|
|
rightImage.addEventListener('load', () => {
|
2017-03-29 17:29:17 -07:00
|
|
|
|
assert.isOk(rightImage);
|
|
|
|
|
|
assert.equal(rightImage.getAttribute('src'),
|
|
|
|
|
|
'data:image/bmp;base64, ' + mockFile2.body);
|
|
|
|
|
|
assert.equal(rightLabelContent.textContent, '1⨉1 image/bmp');
|
|
|
|
|
|
|
|
|
|
|
|
rightLoaded = true;
|
|
|
|
|
|
if (leftLoaded) {
|
|
|
|
|
|
element.removeEventListener('render', rendered);
|
|
|
|
|
|
done();
|
|
|
|
|
|
}
|
|
|
|
|
|
});
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
element.addEventListener('render', rendered);
|
|
|
|
|
|
|
2017-05-16 13:33:41 -07:00
|
|
|
|
element.$.restAPI.getDiffPreferences().then(prefs => {
|
2017-03-29 17:29:17 -07:00
|
|
|
|
element.prefs = prefs;
|
|
|
|
|
|
element.reload();
|
|
|
|
|
|
});
|
|
|
|
|
|
});
|
2016-05-23 15:24:05 -07:00
|
|
|
|
|
2017-05-16 13:33:41 -07:00
|
|
|
|
test('renders image diffs with a different file name', done => {
|
|
|
|
|
|
const mockDiff = {
|
2017-03-29 17:29:17 -07:00
|
|
|
|
meta_a: {name: 'carrot.jpg', content_type: 'image/jpeg', lines: 66},
|
|
|
|
|
|
meta_b: {name: 'carrot2.jpg', content_type: 'image/jpeg',
|
2017-05-16 13:33:41 -07:00
|
|
|
|
lines: 560},
|
2017-03-29 17:29:17 -07:00
|
|
|
|
intraline_status: 'OK',
|
|
|
|
|
|
change_type: 'MODIFIED',
|
|
|
|
|
|
diff_header: [
|
|
|
|
|
|
'diff --git a/carrot.jpg b/carrot2.jpg',
|
|
|
|
|
|
'index 2adc47d..f9c2f2c 100644',
|
|
|
|
|
|
'--- a/carrot.jpg',
|
|
|
|
|
|
'+++ b/carrot2.jpg',
|
|
|
|
|
|
'Binary files differ',
|
|
|
|
|
|
],
|
|
|
|
|
|
content: [{skip: 66}],
|
|
|
|
|
|
binary: true,
|
|
|
|
|
|
};
|
|
|
|
|
|
stubs.push(sandbox.stub(element, '_getDiff',
|
2017-05-16 13:33:41 -07:00
|
|
|
|
() => Promise.resolve(mockDiff)));
|
2017-03-29 17:29:17 -07:00
|
|
|
|
|
2017-05-16 13:33:41 -07:00
|
|
|
|
const rendered = () => {
|
2017-03-29 17:29:17 -07:00
|
|
|
|
// Recognizes that it should be an image diff.
|
|
|
|
|
|
assert.isTrue(element.isImageDiff);
|
|
|
|
|
|
assert.instanceOf(
|
2017-05-16 13:33:41 -07:00
|
|
|
|
element.$.diffBuilder._builder, GrDiffBuilderImage);
|
2017-03-29 17:29:17 -07:00
|
|
|
|
|
|
|
|
|
|
// Left image rendered with the parent commit's version of the file.
|
2017-05-16 13:33:41 -07:00
|
|
|
|
const leftImage = element.$.diffTable.querySelector('td.left img');
|
|
|
|
|
|
const leftLabel =
|
|
|
|
|
|
element.$.diffTable.querySelector('td.left label');
|
|
|
|
|
|
const leftLabelContent = leftLabel.querySelector('.label');
|
|
|
|
|
|
const leftLabelName = leftLabel.querySelector('.name');
|
|
|
|
|
|
|
|
|
|
|
|
const rightImage =
|
|
|
|
|
|
element.$.diffTable.querySelector('td.right img');
|
|
|
|
|
|
const rightLabel = element.$.diffTable.querySelector(
|
|
|
|
|
|
'td.right label');
|
|
|
|
|
|
const rightLabelContent = rightLabel.querySelector('.label');
|
|
|
|
|
|
const rightLabelName = rightLabel.querySelector('.name');
|
2017-03-29 17:29:17 -07:00
|
|
|
|
|
|
|
|
|
|
assert.isOk(rightLabelName);
|
|
|
|
|
|
assert.isOk(leftLabelName);
|
|
|
|
|
|
assert.equal(leftLabelName.textContent, mockDiff.meta_a.name);
|
|
|
|
|
|
assert.equal(rightLabelName.textContent, mockDiff.meta_b.name);
|
|
|
|
|
|
|
2017-05-16 13:33:41 -07:00
|
|
|
|
let leftLoaded = false;
|
|
|
|
|
|
let rightLoaded = false;
|
2017-03-29 17:29:17 -07:00
|
|
|
|
|
2017-05-16 13:33:41 -07:00
|
|
|
|
leftImage.addEventListener('load', () => {
|
2017-03-29 17:29:17 -07:00
|
|
|
|
assert.isOk(leftImage);
|
|
|
|
|
|
assert.equal(leftImage.getAttribute('src'),
|
|
|
|
|
|
'data:image/bmp;base64, ' + mockFile1.body);
|
|
|
|
|
|
assert.equal(leftLabelContent.textContent, '1⨉1 image/bmp');
|
|
|
|
|
|
leftLoaded = true;
|
|
|
|
|
|
if (rightLoaded) {
|
|
|
|
|
|
element.removeEventListener('render', rendered);
|
|
|
|
|
|
done();
|
|
|
|
|
|
}
|
|
|
|
|
|
});
|
|
|
|
|
|
|
2017-05-16 13:33:41 -07:00
|
|
|
|
rightImage.addEventListener('load', () => {
|
2017-03-29 17:29:17 -07:00
|
|
|
|
assert.isOk(rightImage);
|
|
|
|
|
|
assert.equal(rightImage.getAttribute('src'),
|
|
|
|
|
|
'data:image/bmp;base64, ' + mockFile2.body);
|
|
|
|
|
|
assert.equal(rightLabelContent.textContent, '1⨉1 image/bmp');
|
|
|
|
|
|
|
|
|
|
|
|
rightLoaded = true;
|
|
|
|
|
|
if (leftLoaded) {
|
|
|
|
|
|
element.removeEventListener('render', rendered);
|
|
|
|
|
|
done();
|
|
|
|
|
|
}
|
|
|
|
|
|
});
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
element.addEventListener('render', rendered);
|
|
|
|
|
|
|
2017-05-16 13:33:41 -07:00
|
|
|
|
element.$.restAPI.getDiffPreferences().then(prefs => {
|
2017-03-29 17:29:17 -07:00
|
|
|
|
element.prefs = prefs;
|
|
|
|
|
|
element.reload();
|
|
|
|
|
|
});
|
2016-05-23 15:24:05 -07:00
|
|
|
|
});
|
2017-04-12 15:13:09 -07:00
|
|
|
|
|
2017-05-16 13:33:41 -07:00
|
|
|
|
test('renders added image', done => {
|
|
|
|
|
|
const mockDiff = {
|
2017-04-12 15:13:09 -07:00
|
|
|
|
meta_b: {name: 'carrot.jpg', content_type: 'image/jpeg',
|
2017-05-16 13:33:41 -07:00
|
|
|
|
lines: 560},
|
2017-04-12 15:13:09 -07:00
|
|
|
|
intraline_status: 'OK',
|
|
|
|
|
|
change_type: 'ADDED',
|
|
|
|
|
|
diff_header: [
|
|
|
|
|
|
'diff --git a/carrot.jpg b/carrot.jpg',
|
|
|
|
|
|
'index 0000000..f9c2f2c 100644',
|
|
|
|
|
|
'--- /dev/null',
|
|
|
|
|
|
'+++ b/carrot.jpg',
|
|
|
|
|
|
'Binary files differ',
|
|
|
|
|
|
],
|
|
|
|
|
|
content: [{skip: 66}],
|
|
|
|
|
|
binary: true,
|
|
|
|
|
|
};
|
|
|
|
|
|
stubs.push(sandbox.stub(element, '_getDiff',
|
2017-05-16 13:33:41 -07:00
|
|
|
|
() => Promise.resolve(mockDiff)));
|
2017-04-12 15:13:09 -07:00
|
|
|
|
|
2017-05-16 13:33:41 -07:00
|
|
|
|
element.addEventListener('render', () => {
|
2017-04-12 15:13:09 -07:00
|
|
|
|
// Recognizes that it should be an image diff.
|
|
|
|
|
|
assert.isTrue(element.isImageDiff);
|
|
|
|
|
|
assert.instanceOf(
|
|
|
|
|
|
element.$.diffBuilder._builder, GrDiffBuilderImage);
|
|
|
|
|
|
|
2017-05-16 13:33:41 -07:00
|
|
|
|
const leftImage = element.$.diffTable.querySelector('td.left img');
|
|
|
|
|
|
const rightImage = element.$.diffTable.querySelector('td.right img');
|
2017-04-12 15:13:09 -07:00
|
|
|
|
|
|
|
|
|
|
assert.isNotOk(leftImage);
|
|
|
|
|
|
assert.isOk(rightImage);
|
|
|
|
|
|
done();
|
|
|
|
|
|
});
|
|
|
|
|
|
|
2017-05-16 13:33:41 -07:00
|
|
|
|
element.$.restAPI.getDiffPreferences().then(prefs => {
|
2017-04-12 15:13:09 -07:00
|
|
|
|
element.prefs = prefs;
|
|
|
|
|
|
element.reload();
|
|
|
|
|
|
});
|
|
|
|
|
|
});
|
|
|
|
|
|
|
2017-05-16 13:33:41 -07:00
|
|
|
|
test('renders removed image', done => {
|
|
|
|
|
|
const mockDiff = {
|
2017-04-12 15:13:09 -07:00
|
|
|
|
meta_a: {name: 'carrot.jpg', content_type: 'image/jpeg',
|
2017-05-16 13:33:41 -07:00
|
|
|
|
lines: 560},
|
2017-04-12 15:13:09 -07:00
|
|
|
|
intraline_status: 'OK',
|
|
|
|
|
|
change_type: 'DELETED',
|
|
|
|
|
|
diff_header: [
|
|
|
|
|
|
'diff --git a/carrot.jpg b/carrot.jpg',
|
|
|
|
|
|
'index f9c2f2c..0000000 100644',
|
|
|
|
|
|
'--- a/carrot.jpg',
|
|
|
|
|
|
'+++ /dev/null',
|
|
|
|
|
|
'Binary files differ',
|
|
|
|
|
|
],
|
|
|
|
|
|
content: [{skip: 66}],
|
|
|
|
|
|
binary: true,
|
|
|
|
|
|
};
|
|
|
|
|
|
stubs.push(sandbox.stub(element, '_getDiff',
|
2017-05-16 13:33:41 -07:00
|
|
|
|
() => Promise.resolve(mockDiff)));
|
2017-04-12 15:13:09 -07:00
|
|
|
|
|
2017-05-16 13:33:41 -07:00
|
|
|
|
element.addEventListener('render', () => {
|
2017-04-12 15:13:09 -07:00
|
|
|
|
// Recognizes that it should be an image diff.
|
|
|
|
|
|
assert.isTrue(element.isImageDiff);
|
|
|
|
|
|
assert.instanceOf(
|
|
|
|
|
|
element.$.diffBuilder._builder, GrDiffBuilderImage);
|
|
|
|
|
|
|
2017-05-16 13:33:41 -07:00
|
|
|
|
const leftImage = element.$.diffTable.querySelector('td.left img');
|
|
|
|
|
|
const rightImage = element.$.diffTable.querySelector('td.right img');
|
2017-04-12 15:13:09 -07:00
|
|
|
|
|
|
|
|
|
|
assert.isOk(leftImage);
|
|
|
|
|
|
assert.isNotOk(rightImage);
|
|
|
|
|
|
done();
|
|
|
|
|
|
});
|
|
|
|
|
|
|
2017-05-16 13:33:41 -07:00
|
|
|
|
element.$.restAPI.getDiffPreferences().then(prefs => {
|
2017-04-12 15:13:09 -07:00
|
|
|
|
element.prefs = prefs;
|
|
|
|
|
|
element.reload();
|
|
|
|
|
|
});
|
|
|
|
|
|
});
|
2017-04-14 15:45:31 -07:00
|
|
|
|
|
2017-05-16 13:33:41 -07:00
|
|
|
|
test('does not render disallowed image type', done => {
|
|
|
|
|
|
const mockDiff = {
|
2017-04-14 15:45:31 -07:00
|
|
|
|
meta_a: {name: 'carrot.jpg', content_type: 'image/jpeg-evil',
|
2017-05-16 13:33:41 -07:00
|
|
|
|
lines: 560},
|
2017-04-14 15:45:31 -07:00
|
|
|
|
intraline_status: 'OK',
|
|
|
|
|
|
change_type: 'DELETED',
|
|
|
|
|
|
diff_header: [
|
|
|
|
|
|
'diff --git a/carrot.jpg b/carrot.jpg',
|
|
|
|
|
|
'index f9c2f2c..0000000 100644',
|
|
|
|
|
|
'--- a/carrot.jpg',
|
|
|
|
|
|
'+++ /dev/null',
|
|
|
|
|
|
'Binary files differ',
|
|
|
|
|
|
],
|
|
|
|
|
|
content: [{skip: 66}],
|
|
|
|
|
|
binary: true,
|
|
|
|
|
|
};
|
|
|
|
|
|
mockFile1.type = 'image/jpeg-evil';
|
|
|
|
|
|
|
|
|
|
|
|
stubs.push(sandbox.stub(element, '_getDiff',
|
2017-05-16 13:33:41 -07:00
|
|
|
|
() => Promise.resolve(mockDiff)));
|
2017-04-14 15:45:31 -07:00
|
|
|
|
|
2017-05-16 13:33:41 -07:00
|
|
|
|
element.addEventListener('render', () => {
|
2017-04-14 15:45:31 -07:00
|
|
|
|
// Recognizes that it should be an image diff.
|
|
|
|
|
|
assert.isTrue(element.isImageDiff);
|
|
|
|
|
|
assert.instanceOf(
|
|
|
|
|
|
element.$.diffBuilder._builder, GrDiffBuilderImage);
|
2017-05-16 13:33:41 -07:00
|
|
|
|
const leftImage = element.$.diffTable.querySelector('td.left img');
|
2017-04-14 15:45:31 -07:00
|
|
|
|
assert.isNotOk(leftImage);
|
|
|
|
|
|
done();
|
|
|
|
|
|
});
|
|
|
|
|
|
|
2017-05-16 13:33:41 -07:00
|
|
|
|
element.$.restAPI.getDiffPreferences().then(prefs => {
|
2017-04-14 15:45:31 -07:00
|
|
|
|
element.prefs = prefs;
|
|
|
|
|
|
element.reload();
|
|
|
|
|
|
});
|
|
|
|
|
|
});
|
2016-05-23 15:24:05 -07:00
|
|
|
|
});
|
2016-06-21 12:43:25 -07:00
|
|
|
|
|
2017-05-16 13:33:41 -07:00
|
|
|
|
test('_handleTap lineNum', done => {
|
|
|
|
|
|
const addDraftStub = sandbox.stub(element, 'addDraftAtLine');
|
|
|
|
|
|
const el = document.createElement('div');
|
2016-06-21 12:43:25 -07:00
|
|
|
|
el.className = 'lineNum';
|
2017-05-16 13:33:41 -07:00
|
|
|
|
el.addEventListener('click', e => {
|
2016-06-21 12:43:25 -07:00
|
|
|
|
element._handleTap(e);
|
|
|
|
|
|
assert.isTrue(addDraftStub.called);
|
|
|
|
|
|
assert.equal(addDraftStub.lastCall.args[0], el);
|
|
|
|
|
|
done();
|
|
|
|
|
|
});
|
|
|
|
|
|
el.click();
|
|
|
|
|
|
});
|
|
|
|
|
|
|
2017-05-16 13:33:41 -07:00
|
|
|
|
test('_handleTap context', done => {
|
|
|
|
|
|
const showContextStub =
|
|
|
|
|
|
sandbox.stub(element.$.diffBuilder, 'showContext');
|
|
|
|
|
|
const el = document.createElement('div');
|
2016-06-21 12:43:25 -07:00
|
|
|
|
el.className = 'showContext';
|
2017-05-16 13:33:41 -07:00
|
|
|
|
el.addEventListener('click', e => {
|
2016-06-21 12:43:25 -07:00
|
|
|
|
element._handleTap(e);
|
|
|
|
|
|
assert.isTrue(showContextStub.called);
|
|
|
|
|
|
done();
|
|
|
|
|
|
});
|
|
|
|
|
|
el.click();
|
|
|
|
|
|
});
|
|
|
|
|
|
|
2017-05-16 13:33:41 -07:00
|
|
|
|
test('_handleTap content', done => {
|
|
|
|
|
|
const content = document.createElement('div');
|
|
|
|
|
|
const lineEl = document.createElement('div');
|
2016-06-21 12:43:25 -07:00
|
|
|
|
|
2017-05-16 13:33:41 -07:00
|
|
|
|
const selectStub = sandbox.stub(element, '_selectLine');
|
|
|
|
|
|
sandbox.stub(element.$.diffBuilder, 'getLineElByChild', () => lineEl);
|
2016-06-21 12:43:25 -07:00
|
|
|
|
|
|
|
|
|
|
content.className = 'content';
|
2017-05-16 13:33:41 -07:00
|
|
|
|
content.addEventListener('click', e => {
|
2016-06-21 12:43:25 -07:00
|
|
|
|
element._handleTap(e);
|
|
|
|
|
|
assert.isTrue(selectStub.called);
|
|
|
|
|
|
assert.equal(selectStub.lastCall.args[0], lineEl);
|
|
|
|
|
|
done();
|
|
|
|
|
|
});
|
|
|
|
|
|
content.click();
|
|
|
|
|
|
});
|
2016-10-13 11:40:27 -07:00
|
|
|
|
|
2017-05-16 13:33:41 -07:00
|
|
|
|
test('_getDiff handles null diff responses', done => {
|
2016-10-13 11:40:27 -07:00
|
|
|
|
stub('gr-rest-api-interface', {
|
2017-05-16 13:33:41 -07:00
|
|
|
|
getDiff() { return Promise.resolve(null); },
|
2016-10-13 11:40:27 -07:00
|
|
|
|
});
|
|
|
|
|
|
element.changeNum = 123;
|
|
|
|
|
|
element.patchRange = {basePatchNum: 1, patchNum: 2};
|
|
|
|
|
|
element.path = 'file.txt';
|
|
|
|
|
|
element._getDiff().then(done);
|
|
|
|
|
|
});
|
2017-03-14 16:34:15 -07:00
|
|
|
|
|
2017-05-16 13:33:41 -07:00
|
|
|
|
suite('getCursorStops', () => {
|
|
|
|
|
|
const setupDiff = function() {
|
|
|
|
|
|
const mock = document.createElement('mock-diff-response');
|
2017-03-14 16:34:15 -07:00
|
|
|
|
element._diff = mock.diffResponse;
|
|
|
|
|
|
element._comments = {
|
|
|
|
|
|
left: [],
|
|
|
|
|
|
right: [],
|
|
|
|
|
|
};
|
|
|
|
|
|
element.prefs = {
|
|
|
|
|
|
context: 10,
|
|
|
|
|
|
tab_size: 8,
|
|
|
|
|
|
font_size: 12,
|
|
|
|
|
|
line_length: 100,
|
|
|
|
|
|
cursor_blink_rate: 0,
|
|
|
|
|
|
line_wrapping: false,
|
|
|
|
|
|
intraline_difference: true,
|
|
|
|
|
|
show_line_endings: true,
|
|
|
|
|
|
show_tabs: true,
|
|
|
|
|
|
show_whitespace_errors: true,
|
|
|
|
|
|
syntax_highlighting: true,
|
|
|
|
|
|
auto_hide_diff_table_header: true,
|
|
|
|
|
|
theme: 'DEFAULT',
|
|
|
|
|
|
ignore_whitespace: 'IGNORE_NONE',
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
element._renderDiffTable();
|
|
|
|
|
|
flushAsynchronousOperations();
|
|
|
|
|
|
};
|
|
|
|
|
|
|
2017-05-16 13:33:41 -07:00
|
|
|
|
test('getCursorStops returns [] when hidden and noAutoRender', () => {
|
2017-03-14 16:34:15 -07:00
|
|
|
|
element.noAutoRender = true;
|
|
|
|
|
|
setupDiff();
|
|
|
|
|
|
element.hidden = true;
|
|
|
|
|
|
assert.equal(element.getCursorStops().length, 0);
|
|
|
|
|
|
});
|
|
|
|
|
|
|
2017-05-16 13:33:41 -07:00
|
|
|
|
test('getCursorStops', () => {
|
2017-03-14 16:34:15 -07:00
|
|
|
|
setupDiff();
|
|
|
|
|
|
assert.equal(element.getCursorStops().length, 50);
|
|
|
|
|
|
});
|
|
|
|
|
|
});
|
2017-05-12 11:24:31 -07:00
|
|
|
|
|
2017-05-16 13:33:41 -07:00
|
|
|
|
test('adds .hiddenscroll', () => {
|
2017-05-12 11:24:31 -07:00
|
|
|
|
Gerrit.hiddenscroll = true;
|
|
|
|
|
|
element.displayLine = true;
|
|
|
|
|
|
assert.include(element.$$('.diffContainer').className, 'hiddenscroll');
|
|
|
|
|
|
});
|
2016-01-21 12:54:05 -05:00
|
|
|
|
});
|
2016-05-23 17:18:43 -07:00
|
|
|
|
|
2017-05-16 13:33:41 -07:00
|
|
|
|
suite('logged in', () => {
|
|
|
|
|
|
setup(() => {
|
2016-05-23 15:24:05 -07:00
|
|
|
|
stub('gr-rest-api-interface', {
|
2017-05-16 13:33:41 -07:00
|
|
|
|
getLoggedIn() { return Promise.resolve(true); },
|
|
|
|
|
|
getPreferences() {
|
2016-10-15 20:22:00 -07:00
|
|
|
|
return Promise.resolve({time_format: 'HHMM_12'});
|
|
|
|
|
|
},
|
2016-05-23 15:24:05 -07:00
|
|
|
|
});
|
|
|
|
|
|
element = fixture('basic');
|
|
|
|
|
|
});
|
|
|
|
|
|
|
2017-05-16 13:33:41 -07:00
|
|
|
|
test('get drafts', done => {
|
2016-05-23 15:24:05 -07:00
|
|
|
|
element.patchRange = {basePatchNum: 0, patchNum: 0};
|
2017-05-16 13:33:41 -07:00
|
|
|
|
const draftsResponse = {
|
2016-05-23 15:24:05 -07:00
|
|
|
|
baseComments: [{id: 'foo'}],
|
|
|
|
|
|
comments: [{id: 'bar'}],
|
|
|
|
|
|
};
|
2017-05-16 13:33:41 -07:00
|
|
|
|
sandbox.stub(element.$.restAPI, 'getDiffDrafts',
|
|
|
|
|
|
() => Promise.resolve(draftsResponse));
|
|
|
|
|
|
element._getDiffDrafts().then(result => {
|
2016-05-23 15:24:05 -07:00
|
|
|
|
assert.deepEqual(result, draftsResponse);
|
|
|
|
|
|
done();
|
|
|
|
|
|
});
|
|
|
|
|
|
});
|
|
|
|
|
|
|
2017-05-16 13:33:41 -07:00
|
|
|
|
test('get comments and drafts', done => {
|
|
|
|
|
|
const comments = {
|
2016-05-23 15:24:05 -07:00
|
|
|
|
baseComments: [
|
2017-01-30 12:03:13 -08:00
|
|
|
|
{id: 'bc1', __commentSide: 'left'},
|
|
|
|
|
|
{id: 'bc2', __commentSide: 'left'},
|
2016-05-23 15:24:05 -07:00
|
|
|
|
],
|
|
|
|
|
|
comments: [
|
2017-01-30 12:03:13 -08:00
|
|
|
|
{id: 'c1', __commentSide: 'right'},
|
|
|
|
|
|
{id: 'c2', __commentSide: 'right'},
|
2016-05-23 15:24:05 -07:00
|
|
|
|
],
|
|
|
|
|
|
};
|
2017-05-16 13:33:41 -07:00
|
|
|
|
sandbox.stub(element, '_getDiffComments',
|
|
|
|
|
|
() => Promise.resolve(comments));
|
2016-05-23 15:24:05 -07:00
|
|
|
|
|
2017-05-16 13:33:41 -07:00
|
|
|
|
const drafts = {
|
2016-05-23 15:24:05 -07:00
|
|
|
|
baseComments: [
|
2017-01-30 12:03:13 -08:00
|
|
|
|
{id: 'bd1', __commentSide: 'left'},
|
|
|
|
|
|
{id: 'bd2', __commentSide: 'left'},
|
2016-05-23 15:24:05 -07:00
|
|
|
|
],
|
|
|
|
|
|
comments: [
|
2017-01-30 12:03:13 -08:00
|
|
|
|
{id: 'd1', __commentSide: 'right'},
|
|
|
|
|
|
{id: 'd2', __commentSide: 'right'},
|
2016-05-23 15:24:05 -07:00
|
|
|
|
],
|
|
|
|
|
|
};
|
2016-12-07 13:36:49 -08:00
|
|
|
|
|
2017-05-16 13:33:41 -07:00
|
|
|
|
sandbox.stub(element, '_getDiffDrafts', () => Promise.resolve(drafts));
|
2016-05-23 15:24:05 -07:00
|
|
|
|
|
2017-05-16 13:33:41 -07:00
|
|
|
|
const robotComments = {
|
2016-12-07 13:36:49 -08:00
|
|
|
|
baseComments: [
|
2017-01-30 12:03:13 -08:00
|
|
|
|
{id: 'br1', __commentSide: 'left'},
|
|
|
|
|
|
{id: 'br2', __commentSide: 'left'},
|
2016-12-07 13:36:49 -08:00
|
|
|
|
],
|
|
|
|
|
|
comments: [
|
2017-01-30 12:03:13 -08:00
|
|
|
|
{id: 'r1', __commentSide: 'right'},
|
|
|
|
|
|
{id: 'r2', __commentSide: 'right'},
|
2016-12-07 13:36:49 -08:00
|
|
|
|
],
|
|
|
|
|
|
};
|
|
|
|
|
|
|
2017-05-16 13:33:41 -07:00
|
|
|
|
sandbox.stub(element,
|
|
|
|
|
|
'_getDiffRobotComments', () => Promise.resolve(robotComments));
|
2016-12-07 13:36:49 -08:00
|
|
|
|
|
2016-05-23 15:24:05 -07:00
|
|
|
|
element.changeNum = '42';
|
|
|
|
|
|
element.patchRange = {
|
|
|
|
|
|
basePatchNum: 'PARENT',
|
|
|
|
|
|
patchNum: 3,
|
|
|
|
|
|
};
|
|
|
|
|
|
element.path = '/path/to/foo';
|
|
|
|
|
|
element.projectConfig = {foo: 'bar'};
|
|
|
|
|
|
|
2017-05-16 13:33:41 -07:00
|
|
|
|
element._getDiffCommentsAndDrafts().then(result => {
|
2016-05-23 15:24:05 -07:00
|
|
|
|
assert.deepEqual(result, {
|
|
|
|
|
|
meta: {
|
|
|
|
|
|
changeNum: '42',
|
|
|
|
|
|
patchRange: {
|
|
|
|
|
|
basePatchNum: 'PARENT',
|
|
|
|
|
|
patchNum: 3,
|
|
|
|
|
|
},
|
|
|
|
|
|
path: '/path/to/foo',
|
|
|
|
|
|
projectConfig: {foo: 'bar'},
|
|
|
|
|
|
},
|
|
|
|
|
|
left: [
|
2017-01-30 12:03:13 -08:00
|
|
|
|
{id: 'bc1', __commentSide: 'left'},
|
|
|
|
|
|
{id: 'bc2', __commentSide: 'left'},
|
|
|
|
|
|
{id: 'bd1', __draft: true, __commentSide: 'left'},
|
|
|
|
|
|
{id: 'bd2', __draft: true, __commentSide: 'left'},
|
|
|
|
|
|
{id: 'br1', __commentSide: 'left'},
|
|
|
|
|
|
{id: 'br2', __commentSide: 'left'},
|
2016-05-23 15:24:05 -07:00
|
|
|
|
],
|
|
|
|
|
|
right: [
|
2017-01-30 12:03:13 -08:00
|
|
|
|
{id: 'c1', __commentSide: 'right'},
|
|
|
|
|
|
{id: 'c2', __commentSide: 'right'},
|
|
|
|
|
|
{id: 'd1', __draft: true, __commentSide: 'right'},
|
|
|
|
|
|
{id: 'd2', __draft: true, __commentSide: 'right'},
|
|
|
|
|
|
{id: 'r1', __commentSide: 'right'},
|
|
|
|
|
|
{id: 'r2', __commentSide: 'right'},
|
2016-05-23 15:24:05 -07:00
|
|
|
|
],
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
|
|
done();
|
|
|
|
|
|
});
|
|
|
|
|
|
});
|
|
|
|
|
|
|
2017-05-16 13:33:41 -07:00
|
|
|
|
test('addDraftAtLine', done => {
|
|
|
|
|
|
const fakeLineEl = {getAttribute: sandbox.stub().returns(42)};
|
2017-03-23 10:13:17 -07:00
|
|
|
|
sandbox.stub(element, '_selectLine');
|
|
|
|
|
|
sandbox.stub(element, '_addDraft');
|
2017-05-16 13:33:41 -07:00
|
|
|
|
const loggedInErrorSpy = sandbox.spy();
|
2017-03-23 10:13:17 -07:00
|
|
|
|
element.addEventListener('show-auth-required', loggedInErrorSpy);
|
|
|
|
|
|
element.addDraftAtLine(fakeLineEl);
|
2017-05-16 13:33:41 -07:00
|
|
|
|
flush(() => {
|
2017-03-23 10:13:17 -07:00
|
|
|
|
assert.isFalse(loggedInErrorSpy.called);
|
|
|
|
|
|
assert.isTrue(element._addDraft.calledWithExactly(fakeLineEl, 42));
|
|
|
|
|
|
done();
|
|
|
|
|
|
});
|
|
|
|
|
|
});
|
|
|
|
|
|
|
2017-05-16 13:33:41 -07:00
|
|
|
|
suite('change in preferences', () => {
|
|
|
|
|
|
setup(() => {
|
2017-05-08 14:41:57 -07:00
|
|
|
|
element._diff = {
|
|
|
|
|
|
meta_a: {name: 'carrot.jpg', content_type: 'image/jpeg', lines: 66},
|
|
|
|
|
|
meta_b: {name: 'carrot.jpg', content_type: 'image/jpeg',
|
2017-05-16 13:33:41 -07:00
|
|
|
|
lines: 560},
|
2017-05-08 14:41:57 -07:00
|
|
|
|
diff_header: [],
|
|
|
|
|
|
intraline_status: 'OK',
|
|
|
|
|
|
change_type: 'MODIFIED',
|
|
|
|
|
|
content: [{skip: 66}],
|
|
|
|
|
|
};
|
|
|
|
|
|
element._comments = {
|
|
|
|
|
|
meta: {
|
|
|
|
|
|
changeNum: '42',
|
|
|
|
|
|
patchRange: {
|
|
|
|
|
|
basePatchNum: 'PARENT',
|
|
|
|
|
|
patchNum: 3,
|
|
|
|
|
|
},
|
|
|
|
|
|
path: '/path/to/foo',
|
|
|
|
|
|
projectConfig: {foo: 'bar'},
|
|
|
|
|
|
},
|
|
|
|
|
|
left: [
|
|
|
|
|
|
{id: 'bc1', side: 'PARENT', __commentSide: 'left'},
|
|
|
|
|
|
{id: 'bc2', side: 'PARENT', __commentSide: 'left'},
|
|
|
|
|
|
{id: 'bd1', __draft: true, side: 'PARENT', __commentSide: 'left'},
|
|
|
|
|
|
{id: 'bd2', __draft: true, side: 'PARENT', __commentSide: 'left'},
|
|
|
|
|
|
],
|
|
|
|
|
|
right: [
|
|
|
|
|
|
{id: 'c1', __commentSide: 'right'},
|
|
|
|
|
|
{id: 'c2', __commentSide: 'right'},
|
|
|
|
|
|
{id: 'd1', __draft: true, __commentSide: 'right'},
|
|
|
|
|
|
{id: 'd2', __draft: true, __commentSide: 'right'},
|
|
|
|
|
|
],
|
|
|
|
|
|
};
|
|
|
|
|
|
});
|
|
|
|
|
|
|
2017-05-16 13:33:41 -07:00
|
|
|
|
test('change in preferences re-renders diff', () => {
|
2017-05-08 14:41:57 -07:00
|
|
|
|
sandbox.stub(element, '_renderDiffTable');
|
|
|
|
|
|
element.prefs = {};
|
|
|
|
|
|
element.prefs = {time_format: 'HHMM_12'};
|
|
|
|
|
|
assert.isTrue(element._renderDiffTable.called);
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
|
|
test('change in preferences does not re-renders diff with ' +
|
2017-05-16 13:33:41 -07:00
|
|
|
|
'noRenderOnPrefsChange', () => {
|
2017-05-08 14:41:57 -07:00
|
|
|
|
sandbox.stub(element, '_renderDiffTable');
|
|
|
|
|
|
element.noRenderOnPrefsChange = true;
|
|
|
|
|
|
element.prefs = {};
|
|
|
|
|
|
element.prefs = {time_format: 'HHMM_12'};
|
|
|
|
|
|
assert.isFalse(element._renderDiffTable.called);
|
|
|
|
|
|
});
|
|
|
|
|
|
});
|
|
|
|
|
|
|
2017-05-16 13:33:41 -07:00
|
|
|
|
suite('handle comment-update', () => {
|
|
|
|
|
|
setup(() => {
|
2016-05-23 15:24:05 -07:00
|
|
|
|
element._comments = {
|
|
|
|
|
|
meta: {
|
|
|
|
|
|
changeNum: '42',
|
|
|
|
|
|
patchRange: {
|
|
|
|
|
|
basePatchNum: 'PARENT',
|
|
|
|
|
|
patchNum: 3,
|
|
|
|
|
|
},
|
|
|
|
|
|
path: '/path/to/foo',
|
|
|
|
|
|
projectConfig: {foo: 'bar'},
|
|
|
|
|
|
},
|
|
|
|
|
|
left: [
|
2017-01-30 12:03:13 -08:00
|
|
|
|
{id: 'bc1', side: 'PARENT', __commentSide: 'left'},
|
|
|
|
|
|
{id: 'bc2', side: 'PARENT', __commentSide: 'left'},
|
|
|
|
|
|
{id: 'bd1', __draft: true, side: 'PARENT', __commentSide: 'left'},
|
|
|
|
|
|
{id: 'bd2', __draft: true, side: 'PARENT', __commentSide: 'left'},
|
2016-05-23 15:24:05 -07:00
|
|
|
|
],
|
|
|
|
|
|
right: [
|
2017-01-30 12:03:13 -08:00
|
|
|
|
{id: 'c1', __commentSide: 'right'},
|
|
|
|
|
|
{id: 'c2', __commentSide: 'right'},
|
|
|
|
|
|
{id: 'd1', __draft: true, __commentSide: 'right'},
|
|
|
|
|
|
{id: 'd2', __draft: true, __commentSide: 'right'},
|
2016-05-23 15:24:05 -07:00
|
|
|
|
],
|
|
|
|
|
|
};
|
|
|
|
|
|
});
|
|
|
|
|
|
|
2017-05-16 13:33:41 -07:00
|
|
|
|
test('creating a draft', () => {
|
|
|
|
|
|
const comment = {__draft: true, __draftID: 'tempID', side: 'PARENT',
|
|
|
|
|
|
__commentSide: 'left'};
|
|
|
|
|
|
element.fire('comment-update', {comment});
|
2016-05-23 15:24:05 -07:00
|
|
|
|
assert.include(element._comments.left, comment);
|
|
|
|
|
|
});
|
|
|
|
|
|
|
2017-05-16 13:33:41 -07:00
|
|
|
|
test('saving a draft', () => {
|
|
|
|
|
|
const draftID = 'tempID';
|
|
|
|
|
|
const id = 'savedID';
|
2017-05-17 16:00:33 -07:00
|
|
|
|
const comment = {
|
2017-05-16 13:33:41 -07:00
|
|
|
|
__draft: true,
|
|
|
|
|
|
__draftID: draftID,
|
|
|
|
|
|
side: 'PARENT',
|
|
|
|
|
|
__commentSide: 'left',
|
|
|
|
|
|
};
|
|
|
|
|
|
element._comments.left.push(comment);
|
|
|
|
|
|
comment.id = id;
|
|
|
|
|
|
element.fire('comment-update', {comment});
|
|
|
|
|
|
const drafts = element._comments.left.filter(item => {
|
2016-05-23 15:24:05 -07:00
|
|
|
|
return item.__draftID === draftID;
|
|
|
|
|
|
});
|
|
|
|
|
|
assert.equal(drafts.length, 1);
|
|
|
|
|
|
assert.equal(drafts[0].id, id);
|
|
|
|
|
|
});
|
2016-05-23 17:18:43 -07:00
|
|
|
|
});
|
|
|
|
|
|
});
|
2017-04-07 15:52:28 -07:00
|
|
|
|
|
2017-05-16 13:33:41 -07:00
|
|
|
|
suite('diff header', () => {
|
|
|
|
|
|
setup(() => {
|
2017-04-07 15:52:28 -07:00
|
|
|
|
element._diff = {
|
2017-05-16 13:33:41 -07:00
|
|
|
|
meta_a: {name: 'carrot.jpg', content_type: 'image/jpeg', lines: 66},
|
|
|
|
|
|
meta_b: {name: 'carrot.jpg', content_type: 'image/jpeg',
|
|
|
|
|
|
lines: 560},
|
|
|
|
|
|
diff_header: [],
|
|
|
|
|
|
intraline_status: 'OK',
|
|
|
|
|
|
change_type: 'MODIFIED',
|
|
|
|
|
|
content: [{skip: 66}],
|
|
|
|
|
|
};
|
2017-04-07 15:52:28 -07:00
|
|
|
|
});
|
|
|
|
|
|
|
2017-05-16 13:33:41 -07:00
|
|
|
|
test('hidden', () => {
|
2017-04-07 15:52:28 -07:00
|
|
|
|
assert.equal(element._diffHeaderItems.length, 0);
|
|
|
|
|
|
element.push('_diff.diff_header', 'diff --git a/test.jpg b/test.jpg');
|
|
|
|
|
|
assert.equal(element._diffHeaderItems.length, 0);
|
|
|
|
|
|
element.push('_diff.diff_header', 'index 2adc47d..f9c2f2c 100644');
|
|
|
|
|
|
assert.equal(element._diffHeaderItems.length, 0);
|
|
|
|
|
|
element.push('_diff.diff_header', '--- a/test.jpg');
|
|
|
|
|
|
assert.equal(element._diffHeaderItems.length, 0);
|
|
|
|
|
|
element.push('_diff.diff_header', '+++ b/test.jpg');
|
|
|
|
|
|
assert.equal(element._diffHeaderItems.length, 0);
|
|
|
|
|
|
element.push('_diff.diff_header', 'test');
|
|
|
|
|
|
assert.equal(element._diffHeaderItems.length, 1);
|
|
|
|
|
|
flushAsynchronousOperations();
|
|
|
|
|
|
|
|
|
|
|
|
assert.equal(element.$.diffHeader.textContent.trim(), 'test');
|
|
|
|
|
|
element.set('_diff.binary', true);
|
|
|
|
|
|
assert.equal(element._diffHeaderItems.length, 0);
|
|
|
|
|
|
});
|
|
|
|
|
|
});
|
2016-01-06 10:43:30 -05:00
|
|
|
|
});
|
2015-12-11 12:02:57 -05:00
|
|
|
|
</script>
|
