opendev/gerrit
Code Issues Proposed changes
78792e8e98
gerrit/polygerrit-ui/app/elements/diff/gr-diff-comment-thread/gr-diff-comment-thread_test.html

244 lines
7.5 KiB
HTML
Raw Normal View History

[PolyGerrit] Render (read-only) comments and column width ruler. Also some small additional changes as well: + Correct some :host selectors that were causing issues when Shadow DOM was used instead of Shady DOM. + Two of the same revisions should not be shown in side-by-side view. When two are specified via the url as /N..N/ redirect to /N/. + Added header to the diff view to give context and allow the user to go back to the top-level change. Feature: Issue 3676 Feature: Issue 3648 Feature: Issue 3649 Change-Id: Ib39bb7cb2eab26740f80971d4e00d579a2e08b0b
2015-11-18 16:31:18 -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-comment-thread</title>
Refactor directory structure of components There is no change in functionality. Only moving things around. + Separate html from the js. + Place the unit test for a component within the same folder. + Organize the components in subfolders. Change-Id: I51fdc510db75fc1b33f040ca63decbbdfd4d5513
2016-03-04 17:48:22 -05:00
<script src="../../../bower_components/webcomponentsjs/webcomponents-lite.min.js"></script>
<script src="../../../bower_components/web-component-tester/browser.js"></script>
<script src="../../../scripts/util.js"></script>
[PolyGerrit] Render (read-only) comments and column width ruler. Also some small additional changes as well: + Correct some :host selectors that were causing issues when Shadow DOM was used instead of Shady DOM. + Two of the same revisions should not be shown in side-by-side view. When two are specified via the url as /N..N/ redirect to /N/. + Added header to the diff view to give context and allow the user to go back to the top-level change. Feature: Issue 3676 Feature: Issue 3648 Feature: Issue 3649 Change-Id: Ib39bb7cb2eab26740f80971d4e00d579a2e08b0b
2015-11-18 16:31:18 -05:00
Refactor directory structure of components There is no change in functionality. Only moving things around. + Separate html from the js. + Place the unit test for a component within the same folder. + Organize the components in subfolders. Change-Id: I51fdc510db75fc1b33f040ca63decbbdfd4d5513
2016-03-04 17:48:22 -05:00
<link rel="import" href="../../../bower_components/iron-test-helpers/iron-test-helpers.html">
<link rel="import" href="gr-diff-comment-thread.html">
[PolyGerrit] Render (read-only) comments and column width ruler. Also some small additional changes as well: + Correct some :host selectors that were causing issues when Shadow DOM was used instead of Shady DOM. + Two of the same revisions should not be shown in side-by-side view. When two are specified via the url as /N..N/ redirect to /N/. + Added header to the diff view to give context and allow the user to go back to the top-level change. Feature: Issue 3676 Feature: Issue 3648 Feature: Issue 3649 Change-Id: Ib39bb7cb2eab26740f80971d4e00d579a2e08b0b
2015-11-18 16:31:18 -05:00
<test-fixture id="basic">
<template>
<gr-diff-comment-thread></gr-diff-comment-thread>
</template>
</test-fixture>
Implement comment display/draft authoring Some additional cleanup of event names and fixing of the bubbles property not being placed in the right place. TODO in a follow-up change: + Comments are not considered in context, yet. So if there is a comment made in a span of common lines that are hidden, it will be there underneath the context control but wont show the code. Feature: Issue 3649 Change-Id: I8117b243a7d8d529e0c1cea155a4b6b436c0c768
2015-12-20 19:13:45 -05:00
<test-fixture id="withComment">
<template>
<gr-diff-comment-thread></gr-diff-comment-thread>
</template>
</test-fixture>
[PolyGerrit] Render (read-only) comments and column width ruler. Also some small additional changes as well: + Correct some :host selectors that were causing issues when Shadow DOM was used instead of Shady DOM. + Two of the same revisions should not be shown in side-by-side view. When two are specified via the url as /N..N/ redirect to /N/. + Added header to the diff view to give context and allow the user to go back to the top-level change. Feature: Issue 3676 Feature: Issue 3648 Feature: Issue 3649 Change-Id: Ib39bb7cb2eab26740f80971d4e00d579a2e08b0b
2015-11-18 16:31:18 -05:00
<script>
suite('gr-diff-comment-thread tests', function() {
var element;
setup(function() {
element = fixture('basic');
});
test('comments are sorted correctly', function() {
var comments = [
{
id: 'jacks_reply',
message: 'i like you, too',
in_reply_to: 'sallys_confession',
updated: '2015-12-25 15:00:20.396000000',
},
{
id: 'sallys_confession',
message: 'i like you, jack',
updated: '2015-12-24 15:00:20.396000000',
},
{
id: 'sally_to_dr_finklestein',
message: 'i’m running away',
updated: '2015-10-31 09:00:20.396000000',
},
{
id: 'sallys_defiance',
in_reply_to: 'sally_to_dr_finklestein',
message: 'i will poison you so i can get away',
updated: '2015-10-31 15:00:20.396000000',
},
{
id: 'dr_finklesteins_response',
in_reply_to: 'sally_to_dr_finklestein',
message: 'no i will pull a thread and your arm will fall off',
updated: '2015-10-31 11:00:20.396000000'
},
{
id: 'sallys_mission',
message: 'i have to find santa',
updated: '2015-12-24 21:00:20.396000000'
}
];
var results = element._sortedComments(comments);
assert.deepEqual(results, [
{
id: 'sally_to_dr_finklestein',
message: 'i’m running away',
updated: '2015-10-31 09:00:20.396000000',
},
{
id: 'dr_finklesteins_response',
in_reply_to: 'sally_to_dr_finklestein',
message: 'no i will pull a thread and your arm will fall off',
updated: '2015-10-31 11:00:20.396000000'
},
{
id: 'sallys_defiance',
in_reply_to: 'sally_to_dr_finklestein',
message: 'i will poison you so i can get away',
updated: '2015-10-31 15:00:20.396000000',
},
{
id: 'sallys_confession',
message: 'i like you, jack',
updated: '2015-12-24 15:00:20.396000000',
},
{
id: 'jacks_reply',
message: 'i like you, too',
in_reply_to: 'sallys_confession',
updated: '2015-12-25 15:00:20.396000000',
},
{
id: 'sallys_mission',
message: 'i have to find santa',
updated: '2015-12-24 21:00:20.396000000'
}
]);
});
Implement comment display/draft authoring Some additional cleanup of event names and fixing of the bubbles property not being placed in the right place. TODO in a follow-up change: + Comments are not considered in context, yet. So if there is a comment made in a span of common lines that are hidden, it will be there underneath the context control but wont show the code. Feature: Issue 3649 Change-Id: I8117b243a7d8d529e0c1cea155a4b6b436c0c768
2015-12-20 19:13:45 -05:00
});
suite('comment action tests', function() {
var element;
var server;
setup(function() {
element = fixture('withComment');
element.comments = [{
author: {
name: 'Mr. Peanutbutter',
email: 'tenn1sballchaser@aol.com',
},
id: 'baf0414d_60047215',
line: 5,
message: 'is this a crossover episode!?',
updated: '2015-12-08 19:48:33.843000000',
}];
flushAsynchronousOperations();
server = sinon.fakeServer.create();
// Eat any requests made by elements in this suite.
server.respondWith(
'PUT',
'/changes/41/1/drafts',
[
201,
Fix issues detected by 'JSHint' and 'JSCS' Change-Id: Ia535be02d19f09e716f00ec8819ba785010798f7
2016-02-02 21:02:42 +01:00
{'Content-Type': 'application/json'},
Implement comment display/draft authoring Some additional cleanup of event names and fixing of the bubbles property not being placed in the right place. TODO in a follow-up change: + Comments are not considered in context, yet. So if there is a comment made in a span of common lines that are hidden, it will be there underneath the context control but wont show the code. Feature: Issue 3649 Change-Id: I8117b243a7d8d529e0c1cea155a4b6b436c0c768
2015-12-20 19:13:45 -05:00
')]}\'\n' + JSON.stringify({
Fix issues detected by 'JSHint' and 'JSCS' Change-Id: Ia535be02d19f09e716f00ec8819ba785010798f7
2016-02-02 21:02:42 +01:00
id: '7afa4931_de3d65bd',
Implement comment display/draft authoring Some additional cleanup of event names and fixing of the bubbles property not being placed in the right place. TODO in a follow-up change: + Comments are not considered in context, yet. So if there is a comment made in a span of common lines that are hidden, it will be there underneath the context control but wont show the code. Feature: Issue 3649 Change-Id: I8117b243a7d8d529e0c1cea155a4b6b436c0c768
2015-12-20 19:13:45 -05:00
path: '/path/to/file.txt',
line: 5,
in_reply_to: 'baf0414d_60047215',
updated: '2015-12-21 02:01:10.850000000',
message: 'Done'
}),
]
);
server.respondWith(
'DELETE',
'/changes/41/1/drafts/baf0414d_60047215',
[
204,
{},
'',
]
);
});
test('reply', function(done) {
var commentEl = element.$$('gr-diff-comment');
assert.ok(commentEl);
commentEl.addEventListener('reply', function() {
Fix issue where Reply/Done were not having any effect + This was an issue with not using proper array observation technique [1]. [1]: https://www.polymer-project.org/1.0/docs/devguide/properties.html#array-observation Change-Id: I79ef82636d16b3afb3bec42beeb04a8c4e5ab21f
2016-01-07 13:11:04 -05:00
var drafts = element._orderedComments.filter(function(c) {
Implement comment display/draft authoring Some additional cleanup of event names and fixing of the bubbles property not being placed in the right place. TODO in a follow-up change: + Comments are not considered in context, yet. So if there is a comment made in a span of common lines that are hidden, it will be there underneath the context control but wont show the code. Feature: Issue 3649 Change-Id: I8117b243a7d8d529e0c1cea155a4b6b436c0c768
2015-12-20 19:13:45 -05:00
return c.__draft == true;
});
assert.equal(drafts.length, 1);
assert.notOk(drafts[0].message, 'message should be empty');
assert.equal(drafts[0].in_reply_to, 'baf0414d_60047215');
done();
});
commentEl.fire('reply', {comment: commentEl.comment}, {bubbles: false});
});
Implement 'Quote' button on diff comments Also + Cleans up a TODO for a bug that isn’t existent anymore. + Doesn’t show cancel button unless editing a draft that has already been saved once. Bug: Issue 3783 Change-Id: I102d598f64e4f37eca41ff428b574e8230e298cf
2016-01-28 18:07:26 -05:00
test('quote reply', function(done) {
var commentEl = element.$$('gr-diff-comment');
assert.ok(commentEl);
commentEl.addEventListener('reply', function() {
var drafts = element._orderedComments.filter(function(c) {
return c.__draft == true;
});
assert.equal(drafts.length, 1);
Fix PolyGerrit tests Change-Id: Iaac3880d6a3cfc8ae14f27ecef6b296e80dd80ed
2016-02-05 18:22:05 -08:00
assert.equal(drafts[0].message, ' > is this a crossover episode!?\n\n');
Implement 'Quote' button on diff comments Also + Cleans up a TODO for a bug that isn’t existent anymore. + Doesn’t show cancel button unless editing a draft that has already been saved once. Bug: Issue 3783 Change-Id: I102d598f64e4f37eca41ff428b574e8230e298cf
2016-01-28 18:07:26 -05:00
assert.equal(drafts[0].in_reply_to, 'baf0414d_60047215');
done();
});
commentEl.fire('reply', {comment: commentEl.comment, quote: true},
{bubbles: false});
});
Implement comment display/draft authoring Some additional cleanup of event names and fixing of the bubbles property not being placed in the right place. TODO in a follow-up change: + Comments are not considered in context, yet. So if there is a comment made in a span of common lines that are hidden, it will be there underneath the context control but wont show the code. Feature: Issue 3649 Change-Id: I8117b243a7d8d529e0c1cea155a4b6b436c0c768
2015-12-20 19:13:45 -05:00
test('done', function(done) {
element.changeNum = '42';
element.patchNum = '1';
var commentEl = element.$$('gr-diff-comment');
assert.ok(commentEl);
commentEl.addEventListener('done', function() {
server.respond();
Fix issue where Reply/Done were not having any effect + This was an issue with not using proper array observation technique [1]. [1]: https://www.polymer-project.org/1.0/docs/devguide/properties.html#array-observation Change-Id: I79ef82636d16b3afb3bec42beeb04a8c4e5ab21f
2016-01-07 13:11:04 -05:00
var drafts = element._orderedComments.filter(function(c) {
Implement comment display/draft authoring Some additional cleanup of event names and fixing of the bubbles property not being placed in the right place. TODO in a follow-up change: + Comments are not considered in context, yet. So if there is a comment made in a span of common lines that are hidden, it will be there underneath the context control but wont show the code. Feature: Issue 3649 Change-Id: I8117b243a7d8d529e0c1cea155a4b6b436c0c768
2015-12-20 19:13:45 -05:00
return c.__draft == true;
});
assert.equal(drafts.length, 1);
assert.equal(drafts[0].message, 'Done');
assert.equal(drafts[0].in_reply_to, 'baf0414d_60047215');
done();
});
commentEl.fire('done', {comment: commentEl.comment}, {bubbles: false});
});
[PolyGerrit] Render (read-only) comments and column width ruler. Also some small additional changes as well: + Correct some :host selectors that were causing issues when Shadow DOM was used instead of Shady DOM. + Two of the same revisions should not be shown in side-by-side view. When two are specified via the url as /N..N/ redirect to /N/. + Added header to the diff view to give context and allow the user to go back to the top-level change. Feature: Issue 3676 Feature: Issue 3648 Feature: Issue 3649 Change-Id: Ib39bb7cb2eab26740f80971d4e00d579a2e08b0b
2015-11-18 16:31:18 -05:00
Implement comment display/draft authoring Some additional cleanup of event names and fixing of the bubbles property not being placed in the right place. TODO in a follow-up change: + Comments are not considered in context, yet. So if there is a comment made in a span of common lines that are hidden, it will be there underneath the context control but wont show the code. Feature: Issue 3649 Change-Id: I8117b243a7d8d529e0c1cea155a4b6b436c0c768
2015-12-20 19:13:45 -05:00
test('discard', function(done) {
element.changeNum = '42';
element.patchNum = '1';
Fix issue where Reply/Done were not having any effect + This was an issue with not using proper array observation technique [1]. [1]: https://www.polymer-project.org/1.0/docs/devguide/properties.html#array-observation Change-Id: I79ef82636d16b3afb3bec42beeb04a8c4e5ab21f
2016-01-07 13:11:04 -05:00
element.push('comments', element._newReply(
Implement comment display/draft authoring Some additional cleanup of event names and fixing of the bubbles property not being placed in the right place. TODO in a follow-up change: + Comments are not considered in context, yet. So if there is a comment made in a span of common lines that are hidden, it will be there underneath the context control but wont show the code. Feature: Issue 3649 Change-Id: I8117b243a7d8d529e0c1cea155a4b6b436c0c768
2015-12-20 19:13:45 -05:00
element.comments[0].id,
element.comments[0].line,
element.comments[0].path,
'it’s pronouced jiff, not giff'));
flushAsynchronousOperations();
var draftEl =
Polymer.dom(element.root).querySelectorAll('gr-diff-comment')[1];
assert.ok(draftEl);
draftEl.addEventListener('discard', function() {
server.respond();
var drafts = element.comments.filter(function(c) {
return c.__draft == true;
});
assert.equal(drafts.length, 0);
done();
});
draftEl.fire('discard', null, {bubbles: false});
});
[PolyGerrit] Render (read-only) comments and column width ruler. Also some small additional changes as well: + Correct some :host selectors that were causing issues when Shadow DOM was used instead of Shady DOM. + Two of the same revisions should not be shown in side-by-side view. When two are specified via the url as /N..N/ redirect to /N/. + Added header to the diff view to give context and allow the user to go back to the top-level change. Feature: Issue 3676 Feature: Issue 3648 Feature: Issue 3649 Change-Id: Ib39bb7cb2eab26740f80971d4e00d579a2e08b0b
2015-11-18 16:31:18 -05:00
});
</script>
Copy Permalink