2015-11-14 15:40:47 -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">
|
2015-11-18 16:31:18 -05:00
|
|
|
<title>gr-diff-view</title>
|
2015-11-14 15:40:47 -05:00
|
|
|
|
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>
|
Polygerrit now loads polymer-resin
polymer-resin intercepts polymer property assignments
before they reach XSS-vulnerable sinks like `href="..."`
and text nodes in `<script>` elements.
This follows the instructions in WORKSPACE for adding a new bower
dependency with kaspern's tweak to use the dependency in a rule so
that it's found. //lib/js/bower_components.bzl has already been
rolled-back per those instructions.
The license is the polymer license as can be seen at
https://github.com/Polymer/polymer-resin/blob/master/LICENSE though
I'm not sure that //tools/js/bower2bazel.py recognizes it as such.
Docs for the added component are available at
https://github.com/Polymer/polymer-resin/blob/master/README.md
https://github.com/Polymer/polymer-resin/blob/master/getting-started.md
With this change, when I introduce an XSS vulnerability as below,
polymer-resin intercepts and stops it.
Patch that introduces a strawman vulnerability.
--- a/polygerrit-ui/app/elements/core/gr-main-header/gr-main-header.js
+++ b/polygerrit-ui/app/elements/core/gr-main-header/gr-main-header.js
@@ -55,6 +55,10 @@
url: '/q/status:abandoned',
name: 'Abandoned',
},
+ {
+ url: location.hash.replace(/^#/, '') || 'http://example.com/#fragment_echoed_here',
+ name: 'XSS Me',
+ },
],
}];
---
Address kaspern's and paladox's comments.
---
Undo version bumps for bower dependencies.
---
Change Soy index template to parallel app/index.html.
---
update polymer-resin to version 1.1.1-beta
----
Load polymer-resin into polygerrit-ui/**/*_test.html
After this, I ran the tests with
-l chrome
-l firefox
I ran a handful of tests with -p and observed that the
console shows "initResin" is called before test cases start
executing.
These changes were done programmaticly by running the script below
(approximately) thus:
```
gerrit/ $ cd polygerrit-ui/app
app/ $ find . -name \*test.html | xargs perl hack-tests.pl
```
```
use strict;
sub removeResin($) {
my $s = $_[0];
$s =~ s@<link rel="import" href="[^"]*/polymer-resin/[^"]*"[^>]*>\n?@@;
$s =~ s@<script src="[^"]*/polymer-resin/[^"]*"></script>\n?@@;
$s =~ s@<script>\s*security\.polymer_resin.*?</script>\n?@@s;
return $s;
}
for my $f (@ARGV) {
next if $f =~ m@/bower_components/|/node_modules/@;
system('git', 'checkout', $f);
print "$f\n";
my @lines = ();
open(IN, "<$f") or die "$f: $!";
my $maxLineOfMatch = 0;
while (<IN>) {
push(@lines, $_);
# Put a marker after core loading directives.
$maxLineOfMatch = scalar(@lines)
if m@/webcomponentsjs/|/polymer[.]html\b|/browser[.]js@;
}
close(IN) or die "$f: $!";
die "$f missing loading directives" unless $maxLineOfMatch;
# Given ./a/b/c/my_test.html, $pathToRoot is "../../.."
# assuming no non-leading . or .. components in the path from find.
my $pathToRoot = $f;
$pathToRoot =~ s@^\.\/@@;
$pathToRoot =~ s@^(.*?/)?app/@@;
$pathToRoot =~ s@\/[^\/]*$@@;
$pathToRoot =~ s@[^/]+@..@g;
my $nLines = scalar(@lines);
open(OUT, ">$f") or die "$f: $!";
# Output the lines up to the last polymer-resin dependency
# loaded explicitly by this test.
my $before = join '', @lines[0..($maxLineOfMatch - 1)];
$before = removeResin($before);
print OUT "$before";
# Dump out the lines that load polymer-resin and configure it for
# polygerrit.
if (1) {
print OUT qq'<link rel="import" href="$pathToRoot/bower_components/polymer-resin/standalone/polymer-resin-debug.html"/>
<script>
security.polymer_resin.install({allowedIdentifierPrefixes: [\'\']});
</script>
';
}
# Emit any remaining lines.
my $after = join '', @lines[$maxLineOfMatch..$#lines];
$after = removeResin($after);
$after =~ s/^\n*//;
print OUT "$after";
close(OUT) or die "$f: $!";
}
```
---
update polymer-resin to version 1.2.1-beta
---
update Soy index template to new style polymer-resin initialization
----
fix lint warnings
----
Load test/common-test-setup.html into *_test.html
Instead of inserting instructions to load and initialize polymer-resin into
every test file, add a common-test-setup.html that does that and also fold
iron-test-helpers loading into it.
----
imported files do not need to load webcomponentsjs
Change-Id: I71221c36ed8a0fe7f8720c1064a2fcc9555bb8df
2017-05-08 14:07:13 -04:00
|
|
|
<link rel="import" href="../../../test/common-test-setup.html"/>
|
2016-03-04 17:48:22 -05:00
|
|
|
<script src="../../../bower_components/page/page.js"></script>
|
|
|
|
|
<script src="../../../scripts/util.js"></script>
|
2015-11-25 19:08:45 -05:00
|
|
|
|
2016-03-04 17:48:22 -05:00
|
|
|
<link rel="import" href="gr-diff-view.html">
|
2015-11-14 15:40:47 -05:00
|
|
|
|
2017-03-28 17:02:44 -07:00
|
|
|
<script>void(0);</script>
|
|
|
|
|
|
2015-11-14 15:40:47 -05:00
|
|
|
<test-fixture id="basic">
|
2015-12-02 13:17:35 -05:00
|
|
|
<template>
|
|
|
|
|
<gr-diff-view></gr-diff-view>
|
|
|
|
|
</template>
|
|
|
|
|
</test-fixture>
|
|
|
|
|
|
2016-08-25 12:35:50 -07:00
|
|
|
<test-fixture id="blank">
|
|
|
|
|
<template>
|
|
|
|
|
<div></div>
|
|
|
|
|
</template>
|
2016-09-16 10:44:37 -07:00
|
|
|
</test-fixture>
|
2016-08-25 12:35:50 -07:00
|
|
|
|
2015-11-14 15:40:47 -05:00
|
|
|
<script>
|
2017-05-16 14:38:48 -07:00
|
|
|
suite('gr-diff-view tests', () => {
|
|
|
|
|
let element;
|
|
|
|
|
let sandbox;
|
2015-12-02 13:17:35 -05:00
|
|
|
|
2017-05-16 14:38:48 -07:00
|
|
|
setup(() => {
|
2016-10-26 17:11:50 -07:00
|
|
|
sandbox = sinon.sandbox.create();
|
|
|
|
|
|
2016-03-29 14:06:39 -04:00
|
|
|
stub('gr-rest-api-interface', {
|
2017-05-16 14:38:48 -07:00
|
|
|
getLoggedIn() { return Promise.resolve(false); },
|
|
|
|
|
getProjectConfig() { return Promise.resolve({}); },
|
|
|
|
|
getDiffChangeDetail() { return Promise.resolve(null); },
|
|
|
|
|
getChangeFiles() { return Promise.resolve({}); },
|
|
|
|
|
saveFileReviewed() { return Promise.resolve(); },
|
2016-03-29 14:06:39 -04:00
|
|
|
});
|
2015-11-14 15:40:47 -05:00
|
|
|
element = fixture('basic');
|
2015-12-02 13:17:35 -05:00
|
|
|
});
|
2015-11-14 15:40:47 -05:00
|
|
|
|
2017-05-16 14:38:48 -07:00
|
|
|
teardown(() => {
|
2016-10-26 17:11:50 -07:00
|
|
|
sandbox.restore();
|
|
|
|
|
});
|
|
|
|
|
|
2017-05-16 14:38:48 -07:00
|
|
|
test('toggle left diff with a hotkey', () => {
|
|
|
|
|
const toggleLeftDiffStub = sandbox.stub(element.$.diff, 'toggleLeftDiff');
|
2016-11-15 17:01:15 -08:00
|
|
|
MockInteractions.pressAndReleaseKeyOn(element, 65, 'shift', 'a');
|
2016-08-10 11:53:12 -07:00
|
|
|
assert.isTrue(toggleLeftDiffStub.calledOnce);
|
|
|
|
|
});
|
|
|
|
|
|
2017-05-16 14:38:48 -07:00
|
|
|
test('keyboard shortcuts', () => {
|
2015-12-01 01:02:00 -05:00
|
|
|
element._changeNum = '42';
|
2015-12-11 12:02:57 -05:00
|
|
|
element._patchRange = {
|
2016-05-11 14:31:49 -04:00
|
|
|
basePatchNum: 'PARENT',
|
2015-12-11 12:02:57 -05:00
|
|
|
patchNum: '10',
|
|
|
|
|
};
|
2016-02-25 11:51:15 -05:00
|
|
|
element._change = {
|
|
|
|
|
revisions: {
|
2016-04-29 22:25:51 +02:00
|
|
|
a: {_number: 10},
|
2016-02-25 11:51:15 -05:00
|
|
|
},
|
|
|
|
|
};
|
2015-12-01 01:02:00 -05:00
|
|
|
element._fileList = ['chell.go', 'glados.txt', 'wheatley.md'];
|
|
|
|
|
element._path = 'glados.txt';
|
2016-02-03 20:40:36 -08:00
|
|
|
element.changeViewState.selectedFileIndex = 1;
|
2015-12-01 01:02:00 -05:00
|
|
|
|
2017-05-16 14:38:48 -07:00
|
|
|
const showStub = sandbox.stub(page, 'show');
|
2016-11-15 17:01:15 -08:00
|
|
|
MockInteractions.pressAndReleaseKeyOn(element, 85, null, 'u');
|
2016-02-25 11:51:15 -05:00
|
|
|
assert(showStub.lastCall.calledWithExactly('/c/42/'),
|
|
|
|
|
'Should navigate to /c/42/');
|
2015-12-01 01:02:00 -05:00
|
|
|
|
2016-11-15 17:01:15 -08:00
|
|
|
MockInteractions.pressAndReleaseKeyOn(element, 221, null, ']');
|
2015-12-01 01:02:00 -05:00
|
|
|
assert(showStub.lastCall.calledWithExactly('/c/42/10/wheatley.md'),
|
|
|
|
|
'Should navigate to /c/42/10/wheatley.md');
|
|
|
|
|
element._path = 'wheatley.md';
|
2016-02-03 20:40:36 -08:00
|
|
|
assert.equal(element.changeViewState.selectedFileIndex, 2);
|
2015-12-01 01:02:00 -05:00
|
|
|
|
2016-11-15 17:01:15 -08:00
|
|
|
MockInteractions.pressAndReleaseKeyOn(element, 219, null, '[');
|
2015-12-01 01:02:00 -05:00
|
|
|
assert(showStub.lastCall.calledWithExactly('/c/42/10/glados.txt'),
|
|
|
|
|
'Should navigate to /c/42/10/glados.txt');
|
|
|
|
|
element._path = 'glados.txt';
|
2016-02-03 20:40:36 -08:00
|
|
|
assert.equal(element.changeViewState.selectedFileIndex, 1);
|
2015-12-01 01:02:00 -05:00
|
|
|
|
2016-11-15 17:01:15 -08:00
|
|
|
MockInteractions.pressAndReleaseKeyOn(element, 219, null, '[');
|
2015-12-01 01:02:00 -05:00
|
|
|
assert(showStub.lastCall.calledWithExactly('/c/42/10/chell.go'),
|
|
|
|
|
'Should navigate to /c/42/10/chell.go');
|
|
|
|
|
element._path = 'chell.go';
|
2016-02-03 20:40:36 -08:00
|
|
|
assert.equal(element.changeViewState.selectedFileIndex, 0);
|
2015-12-01 01:02:00 -05:00
|
|
|
|
2016-11-15 17:01:15 -08:00
|
|
|
MockInteractions.pressAndReleaseKeyOn(element, 219, null, '[');
|
2016-02-25 11:51:15 -05:00
|
|
|
assert(showStub.lastCall.calledWithExactly('/c/42/'),
|
|
|
|
|
'Should navigate to /c/42/');
|
2016-02-03 20:40:36 -08:00
|
|
|
assert.equal(element.changeViewState.selectedFileIndex, 0);
|
2015-12-01 01:02:00 -05:00
|
|
|
|
2017-05-16 14:38:48 -07:00
|
|
|
const showPrefsStub =
|
|
|
|
|
sandbox.stub(element.$.diffPreferences.$.prefsOverlay, 'open',
|
|
|
|
|
() => Promise.resolve());
|
2016-09-16 10:44:37 -07:00
|
|
|
|
2016-11-15 17:01:15 -08:00
|
|
|
MockInteractions.pressAndReleaseKeyOn(element, 188, null, ',');
|
2016-01-26 16:30:02 -05:00
|
|
|
assert(showPrefsStub.calledOnce);
|
|
|
|
|
|
2017-05-16 14:38:48 -07:00
|
|
|
let scrollStub = sandbox.stub(element.$.cursor, 'moveToNextChunk');
|
2016-11-15 17:01:15 -08:00
|
|
|
MockInteractions.pressAndReleaseKeyOn(element, 78, null, 'n');
|
2016-02-25 18:19:51 -05:00
|
|
|
assert(scrollStub.calledOnce);
|
|
|
|
|
|
2016-10-26 17:11:50 -07:00
|
|
|
scrollStub = sandbox.stub(element.$.cursor, 'moveToPreviousChunk');
|
2016-11-15 17:01:15 -08:00
|
|
|
MockInteractions.pressAndReleaseKeyOn(element, 80, null, 'p');
|
2016-02-25 18:19:51 -05:00
|
|
|
assert(scrollStub.calledOnce);
|
|
|
|
|
|
2016-10-26 17:11:50 -07:00
|
|
|
scrollStub = sandbox.stub(element.$.cursor, 'moveToNextCommentThread');
|
2016-11-15 17:01:15 -08:00
|
|
|
MockInteractions.pressAndReleaseKeyOn(element, 78, 'shift', 'n');
|
2016-02-25 18:19:51 -05:00
|
|
|
assert(scrollStub.calledOnce);
|
|
|
|
|
|
2016-10-26 17:11:50 -07:00
|
|
|
scrollStub = sandbox.stub(element.$.cursor,
|
|
|
|
|
'moveToPreviousCommentThread');
|
2016-11-15 17:01:15 -08:00
|
|
|
MockInteractions.pressAndReleaseKeyOn(element, 80, 'shift', 'p');
|
2016-02-25 18:19:51 -05:00
|
|
|
assert(scrollStub.calledOnce);
|
2016-11-02 16:25:53 -07:00
|
|
|
|
2017-05-16 14:38:48 -07:00
|
|
|
const computeContainerClassStub = sandbox.stub(element.$.diff,
|
2016-11-02 16:25:53 -07:00
|
|
|
'_computeContainerClass');
|
2016-11-15 17:01:15 -08:00
|
|
|
MockInteractions.pressAndReleaseKeyOn(element, 74, null, 'j');
|
2016-11-02 16:25:53 -07:00
|
|
|
assert(computeContainerClassStub.lastCall.calledWithExactly(
|
|
|
|
|
false, 'SIDE_BY_SIDE', true));
|
|
|
|
|
|
2016-11-15 17:01:15 -08:00
|
|
|
MockInteractions.pressAndReleaseKeyOn(element, 27, null, 'esc');
|
2016-11-02 16:25:53 -07:00
|
|
|
assert(computeContainerClassStub.lastCall.calledWithExactly(
|
|
|
|
|
false, 'SIDE_BY_SIDE', false));
|
2016-01-08 10:13:54 -05:00
|
|
|
});
|
2015-12-01 01:02:00 -05:00
|
|
|
|
2017-05-16 14:38:48 -07:00
|
|
|
test('keyboard shortcuts with patch range', () => {
|
2016-01-08 10:13:54 -05:00
|
|
|
element._changeNum = '42';
|
|
|
|
|
element._patchRange = {
|
|
|
|
|
basePatchNum: '5',
|
|
|
|
|
patchNum: '10',
|
|
|
|
|
};
|
2016-02-25 11:51:15 -05:00
|
|
|
element._change = {
|
|
|
|
|
revisions: {
|
2016-04-29 22:25:51 +02:00
|
|
|
a: {_number: 10},
|
2016-02-25 11:51:15 -05:00
|
|
|
},
|
|
|
|
|
};
|
2016-01-08 10:13:54 -05:00
|
|
|
element._fileList = ['chell.go', 'glados.txt', 'wheatley.md'];
|
|
|
|
|
element._path = 'glados.txt';
|
2015-12-01 01:02:00 -05:00
|
|
|
|
2017-05-16 14:38:48 -07:00
|
|
|
const showStub = sandbox.stub(page, 'show');
|
2015-12-01 01:02:00 -05:00
|
|
|
|
2016-11-15 17:01:15 -08:00
|
|
|
MockInteractions.pressAndReleaseKeyOn(element, 65, null, 'a');
|
2016-01-28 14:58:04 -05:00
|
|
|
assert.isTrue(showStub.notCalled, 'The `a` keyboard shortcut should ' +
|
|
|
|
|
'only work when the user is logged in.');
|
|
|
|
|
assert.isNull(window.sessionStorage.getItem(
|
2016-02-22 18:12:27 -05:00
|
|
|
'changeView.showReplyDialog'));
|
2016-01-28 14:58:04 -05:00
|
|
|
|
|
|
|
|
element._loggedIn = true;
|
2016-11-15 17:01:15 -08:00
|
|
|
MockInteractions.pressAndReleaseKeyOn(element, 65, null, 'a');
|
2016-02-22 18:12:27 -05:00
|
|
|
assert.isTrue(element.changeViewState.showReplyDialog);
|
2016-02-03 20:40:36 -08:00
|
|
|
|
2016-05-11 14:31:49 -04:00
|
|
|
assert(showStub.lastCall.calledWithExactly('/c/42/5..10'),
|
|
|
|
|
'Should navigate to /c/42/5..10');
|
2016-01-28 14:58:04 -05:00
|
|
|
|
2016-11-15 17:01:15 -08:00
|
|
|
MockInteractions.pressAndReleaseKeyOn(element, 85, null, 'u');
|
2016-05-11 14:31:49 -04:00
|
|
|
assert(showStub.lastCall.calledWithExactly('/c/42/5..10'),
|
|
|
|
|
'Should navigate to /c/42/5..10');
|
2015-12-01 01:02:00 -05:00
|
|
|
|
2016-11-15 17:01:15 -08:00
|
|
|
MockInteractions.pressAndReleaseKeyOn(element, 221, null, ']');
|
2016-01-08 10:13:54 -05:00
|
|
|
assert(showStub.lastCall.calledWithExactly('/c/42/5..10/wheatley.md'),
|
|
|
|
|
'Should navigate to /c/42/5..10/wheatley.md');
|
|
|
|
|
element._path = 'wheatley.md';
|
2015-12-01 01:02:00 -05:00
|
|
|
|
2016-11-15 17:01:15 -08:00
|
|
|
MockInteractions.pressAndReleaseKeyOn(element, 219, null, '[');
|
2016-01-08 10:13:54 -05:00
|
|
|
assert(showStub.lastCall.calledWithExactly('/c/42/5..10/glados.txt'),
|
|
|
|
|
'Should navigate to /c/42/5..10/glados.txt');
|
|
|
|
|
element._path = 'glados.txt';
|
2015-12-01 01:02:00 -05:00
|
|
|
|
2016-11-15 17:01:15 -08:00
|
|
|
MockInteractions.pressAndReleaseKeyOn(element, 219, null, '[');
|
2016-01-08 10:13:54 -05:00
|
|
|
assert(showStub.lastCall.calledWithExactly('/c/42/5..10/chell.go'),
|
|
|
|
|
'Should navigate to /c/42/5..10/chell.go');
|
|
|
|
|
element._path = 'chell.go';
|
2015-12-01 01:02:00 -05:00
|
|
|
|
2016-11-15 17:01:15 -08:00
|
|
|
MockInteractions.pressAndReleaseKeyOn(element, 219, null, '[');
|
2016-05-11 14:31:49 -04:00
|
|
|
assert(showStub.lastCall.calledWithExactly('/c/42/5..10'),
|
|
|
|
|
'Should navigate to /c/42/5..10');
|
2016-02-25 11:51:15 -05:00
|
|
|
});
|
|
|
|
|
|
2017-05-16 14:38:48 -07:00
|
|
|
test('keyboard shortcuts with old patch number', () => {
|
2016-02-25 11:51:15 -05:00
|
|
|
element._changeNum = '42';
|
|
|
|
|
element._patchRange = {
|
2016-05-11 14:31:49 -04:00
|
|
|
basePatchNum: 'PARENT',
|
2016-02-25 11:51:15 -05:00
|
|
|
patchNum: '1',
|
|
|
|
|
};
|
|
|
|
|
element._change = {
|
|
|
|
|
revisions: {
|
2016-04-29 22:25:51 +02:00
|
|
|
a: {_number: 1},
|
|
|
|
|
b: {_number: 2},
|
2016-02-25 11:51:15 -05:00
|
|
|
},
|
|
|
|
|
};
|
|
|
|
|
element._fileList = ['chell.go', 'glados.txt', 'wheatley.md'];
|
|
|
|
|
element._path = 'glados.txt';
|
|
|
|
|
|
2017-05-16 14:38:48 -07:00
|
|
|
const showStub = sandbox.stub(page, 'show');
|
2016-02-25 11:51:15 -05:00
|
|
|
|
2016-11-15 17:01:15 -08:00
|
|
|
MockInteractions.pressAndReleaseKeyOn(element, 65, null, 'a');
|
2016-02-25 11:51:15 -05:00
|
|
|
assert.isTrue(showStub.notCalled, 'The `a` keyboard shortcut should ' +
|
|
|
|
|
'only work when the user is logged in.');
|
|
|
|
|
assert.isNull(window.sessionStorage.getItem(
|
|
|
|
|
'changeView.showReplyDialog'));
|
|
|
|
|
|
|
|
|
|
element._loggedIn = true;
|
2016-11-15 17:01:15 -08:00
|
|
|
MockInteractions.pressAndReleaseKeyOn(element, 65, null, 'a');
|
2016-02-25 11:51:15 -05:00
|
|
|
assert.isTrue(element.changeViewState.showReplyDialog);
|
|
|
|
|
|
|
|
|
|
assert(showStub.lastCall.calledWithExactly('/c/42/1'),
|
|
|
|
|
'Should navigate to /c/42/1');
|
|
|
|
|
|
2016-11-15 17:01:15 -08:00
|
|
|
MockInteractions.pressAndReleaseKeyOn(element, 85, null, 'u');
|
2016-02-25 11:51:15 -05:00
|
|
|
assert(showStub.lastCall.calledWithExactly('/c/42/1'),
|
|
|
|
|
'Should navigate to /c/42/1');
|
|
|
|
|
|
2016-11-15 17:01:15 -08:00
|
|
|
MockInteractions.pressAndReleaseKeyOn(element, 221, null, ']');
|
2016-02-25 11:51:15 -05:00
|
|
|
assert(showStub.lastCall.calledWithExactly('/c/42/1/wheatley.md'),
|
|
|
|
|
'Should navigate to /c/42/1/wheatley.md');
|
|
|
|
|
element._path = 'wheatley.md';
|
|
|
|
|
|
2016-11-15 17:01:15 -08:00
|
|
|
MockInteractions.pressAndReleaseKeyOn(element, 219, null, '[');
|
2016-02-25 11:51:15 -05:00
|
|
|
assert(showStub.lastCall.calledWithExactly('/c/42/1/glados.txt'),
|
|
|
|
|
'Should navigate to /c/42/1/glados.txt');
|
|
|
|
|
element._path = 'glados.txt';
|
|
|
|
|
|
2016-11-15 17:01:15 -08:00
|
|
|
MockInteractions.pressAndReleaseKeyOn(element, 219, null, '[');
|
2016-02-25 11:51:15 -05:00
|
|
|
assert(showStub.lastCall.calledWithExactly('/c/42/1/chell.go'),
|
|
|
|
|
'Should navigate to /c/42/1/chell.go');
|
|
|
|
|
element._path = 'chell.go';
|
|
|
|
|
|
2016-11-15 17:01:15 -08:00
|
|
|
MockInteractions.pressAndReleaseKeyOn(element, 219, null, '[');
|
2016-02-25 11:51:15 -05:00
|
|
|
assert(showStub.lastCall.calledWithExactly('/c/42/1'),
|
|
|
|
|
'Should navigate to /c/42/1');
|
|
|
|
|
});
|
|
|
|
|
|
2017-05-16 14:38:48 -07:00
|
|
|
test('Diff preferences hidden when no prefs or logged out', () => {
|
2017-05-08 14:41:57 -07:00
|
|
|
element._loggedIn = false;
|
|
|
|
|
flushAsynchronousOperations();
|
|
|
|
|
assert.isTrue(element.$.diffPrefsContainer.hidden);
|
|
|
|
|
|
|
|
|
|
element._loggedIn = true;
|
|
|
|
|
flushAsynchronousOperations();
|
|
|
|
|
assert.isTrue(element.$.diffPrefsContainer.hidden);
|
|
|
|
|
|
|
|
|
|
element._loggedIn = false;
|
2017-05-16 14:38:48 -07:00
|
|
|
element._prefs = {font_size: '12'};
|
2017-05-08 14:41:57 -07:00
|
|
|
flushAsynchronousOperations();
|
|
|
|
|
assert.isTrue(element.$.diffPrefsContainer.hidden);
|
|
|
|
|
|
|
|
|
|
element._loggedIn = true;
|
|
|
|
|
flushAsynchronousOperations();
|
|
|
|
|
assert.isFalse(element.$.diffPrefsContainer.hidden);
|
|
|
|
|
});
|
|
|
|
|
|
2017-05-16 14:38:48 -07:00
|
|
|
test('prefsButton opens gr-diff-preferences', () => {
|
|
|
|
|
const handlePrefsTapSpy = sandbox.spy(element, '_handlePrefsTap');
|
|
|
|
|
const overlayOpenStub = sandbox.stub(element.$.diffPreferences,
|
2017-05-08 14:41:57 -07:00
|
|
|
'open');
|
2017-05-16 14:38:48 -07:00
|
|
|
const prefsButton =
|
|
|
|
|
Polymer.dom(element.root).querySelector('.prefsButton');
|
2017-05-08 14:41:57 -07:00
|
|
|
|
|
|
|
|
MockInteractions.tap(prefsButton);
|
|
|
|
|
|
|
|
|
|
assert.isTrue(handlePrefsTapSpy.called);
|
|
|
|
|
assert.isTrue(overlayOpenStub.called);
|
|
|
|
|
});
|
|
|
|
|
|
2017-05-16 14:38:48 -07:00
|
|
|
test('go up to change via kb without change loaded', () => {
|
2016-02-25 11:51:15 -05:00
|
|
|
element._changeNum = '42';
|
|
|
|
|
element._patchRange = {
|
2016-05-11 14:31:49 -04:00
|
|
|
basePatchNum: 'PARENT',
|
2016-02-25 11:51:15 -05:00
|
|
|
patchNum: '1',
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
element._fileList = ['chell.go', 'glados.txt', 'wheatley.md'];
|
|
|
|
|
element._path = 'glados.txt';
|
|
|
|
|
|
2017-05-16 14:38:48 -07:00
|
|
|
const showStub = sandbox.stub(page, 'show');
|
2016-02-25 11:51:15 -05:00
|
|
|
|
2016-11-15 17:01:15 -08:00
|
|
|
MockInteractions.pressAndReleaseKeyOn(element, 65, null, 'a');
|
2016-02-25 11:51:15 -05:00
|
|
|
assert.isTrue(showStub.notCalled, 'The `a` keyboard shortcut should ' +
|
|
|
|
|
'only work when the user is logged in.');
|
|
|
|
|
assert.isNull(window.sessionStorage.getItem(
|
|
|
|
|
'changeView.showReplyDialog'));
|
|
|
|
|
|
|
|
|
|
element._loggedIn = true;
|
2016-11-15 17:01:15 -08:00
|
|
|
MockInteractions.pressAndReleaseKeyOn(element, 65, null, 'a');
|
2016-02-25 11:51:15 -05:00
|
|
|
assert.isTrue(element.changeViewState.showReplyDialog);
|
|
|
|
|
|
|
|
|
|
assert(showStub.lastCall.calledWithExactly('/c/42/1'),
|
|
|
|
|
'Should navigate to /c/42/1');
|
|
|
|
|
|
2016-11-15 17:01:15 -08:00
|
|
|
MockInteractions.pressAndReleaseKeyOn(element, 85, null, 'u');
|
2016-02-25 11:51:15 -05:00
|
|
|
assert(showStub.lastCall.calledWithExactly('/c/42/1'),
|
|
|
|
|
'Should navigate to /c/42/1');
|
|
|
|
|
|
2016-11-15 17:01:15 -08:00
|
|
|
MockInteractions.pressAndReleaseKeyOn(element, 221, null, ']');
|
2016-02-25 11:51:15 -05:00
|
|
|
assert(showStub.lastCall.calledWithExactly('/c/42/1/wheatley.md'),
|
|
|
|
|
'Should navigate to /c/42/1/wheatley.md');
|
|
|
|
|
element._path = 'wheatley.md';
|
|
|
|
|
|
2016-11-15 17:01:15 -08:00
|
|
|
MockInteractions.pressAndReleaseKeyOn(element, 219, null, '[');
|
2016-02-25 11:51:15 -05:00
|
|
|
assert(showStub.lastCall.calledWithExactly('/c/42/1/glados.txt'),
|
|
|
|
|
'Should navigate to /c/42/1/glados.txt');
|
|
|
|
|
element._path = 'glados.txt';
|
|
|
|
|
|
2016-11-15 17:01:15 -08:00
|
|
|
MockInteractions.pressAndReleaseKeyOn(element, 219, null, '[');
|
2016-02-25 11:51:15 -05:00
|
|
|
assert(showStub.lastCall.calledWithExactly('/c/42/1/chell.go'),
|
|
|
|
|
'Should navigate to /c/42/1/chell.go');
|
|
|
|
|
element._path = 'chell.go';
|
|
|
|
|
|
2016-11-15 17:01:15 -08:00
|
|
|
MockInteractions.pressAndReleaseKeyOn(element, 219, null, '[');
|
2016-02-25 11:51:15 -05:00
|
|
|
assert(showStub.lastCall.calledWithExactly('/c/42/1'),
|
|
|
|
|
'Should navigate to /c/42/1');
|
2015-12-01 01:02:00 -05:00
|
|
|
});
|
2015-12-11 12:02:57 -05:00
|
|
|
|
2017-05-16 14:38:48 -07:00
|
|
|
test('jump to file dropdown', () => {
|
2015-12-28 12:40:03 -05:00
|
|
|
element._changeNum = '42';
|
|
|
|
|
element._patchRange = {
|
2016-05-11 14:31:49 -04:00
|
|
|
basePatchNum: 'PARENT',
|
2015-12-28 12:40:03 -05:00
|
|
|
patchNum: '10',
|
|
|
|
|
};
|
|
|
|
|
element._fileList = ['chell.go', 'glados.txt', 'wheatley.md'];
|
|
|
|
|
element._path = 'glados.txt';
|
|
|
|
|
flushAsynchronousOperations();
|
2017-05-16 14:38:48 -07:00
|
|
|
const linkEls =
|
2015-12-28 12:40:03 -05:00
|
|
|
Polymer.dom(element.root).querySelectorAll('.dropdown-content > a');
|
|
|
|
|
assert.equal(linkEls.length, 3);
|
|
|
|
|
assert.isFalse(linkEls[0].hasAttribute('selected'));
|
|
|
|
|
assert.isTrue(linkEls[1].hasAttribute('selected'));
|
|
|
|
|
assert.isFalse(linkEls[2].hasAttribute('selected'));
|
|
|
|
|
assert.equal(linkEls[0].getAttribute('data-key-nav'), '[');
|
|
|
|
|
assert.equal(linkEls[1].getAttribute('data-key-nav'), '');
|
|
|
|
|
assert.equal(linkEls[2].getAttribute('data-key-nav'), ']');
|
2016-01-08 10:13:54 -05:00
|
|
|
assert.equal(linkEls[0].getAttribute('href'), '/c/42/10/chell.go');
|
|
|
|
|
assert.equal(linkEls[1].getAttribute('href'), '/c/42/10/glados.txt');
|
|
|
|
|
assert.equal(linkEls[2].getAttribute('href'), '/c/42/10/wheatley.md');
|
2016-03-02 18:00:09 -05:00
|
|
|
|
|
|
|
|
assert.equal(element._computeFileDisplayName('/foo/bar/baz'),
|
|
|
|
|
'/foo/bar/baz');
|
|
|
|
|
assert.equal(element._computeFileDisplayName('/COMMIT_MSG'),
|
|
|
|
|
'Commit message');
|
2017-05-04 18:26:02 -07:00
|
|
|
assert.equal(element._computeFileDisplayName('/MERGE_LIST'),
|
|
|
|
|
'Merge list');
|
2015-12-28 12:40:03 -05:00
|
|
|
});
|
|
|
|
|
|
2017-05-16 14:38:48 -07:00
|
|
|
test('jump to file dropdown with patch range', () => {
|
2016-01-08 10:13:54 -05:00
|
|
|
element._changeNum = '42';
|
|
|
|
|
element._patchRange = {
|
|
|
|
|
basePatchNum: '5',
|
|
|
|
|
patchNum: '10',
|
|
|
|
|
};
|
|
|
|
|
element._fileList = ['chell.go', 'glados.txt', 'wheatley.md'];
|
|
|
|
|
element._path = 'glados.txt';
|
|
|
|
|
flushAsynchronousOperations();
|
2017-05-16 14:38:48 -07:00
|
|
|
const linkEls =
|
2016-01-08 10:13:54 -05:00
|
|
|
Polymer.dom(element.root).querySelectorAll('.dropdown-content > a');
|
|
|
|
|
assert.equal(linkEls.length, 3);
|
|
|
|
|
assert.isFalse(linkEls[0].hasAttribute('selected'));
|
|
|
|
|
assert.isTrue(linkEls[1].hasAttribute('selected'));
|
|
|
|
|
assert.isFalse(linkEls[2].hasAttribute('selected'));
|
|
|
|
|
assert.equal(linkEls[0].getAttribute('data-key-nav'), '[');
|
|
|
|
|
assert.equal(linkEls[1].getAttribute('data-key-nav'), '');
|
|
|
|
|
assert.equal(linkEls[2].getAttribute('data-key-nav'), ']');
|
|
|
|
|
assert.equal(linkEls[0].getAttribute('href'), '/c/42/5..10/chell.go');
|
|
|
|
|
assert.equal(linkEls[1].getAttribute('href'), '/c/42/5..10/glados.txt');
|
|
|
|
|
assert.equal(linkEls[2].getAttribute('href'), '/c/42/5..10/wheatley.md');
|
|
|
|
|
});
|
2016-02-10 21:59:20 +01:00
|
|
|
|
2017-05-16 14:38:48 -07:00
|
|
|
test('prev/up/next links', () => {
|
2016-09-07 17:34:41 -04:00
|
|
|
element._changeNum = '42';
|
|
|
|
|
element._patchRange = {
|
|
|
|
|
basePatchNum: 'PARENT',
|
|
|
|
|
patchNum: '10',
|
|
|
|
|
};
|
2017-03-29 16:33:29 +00:00
|
|
|
element._change = {
|
|
|
|
|
revisions: {
|
|
|
|
|
a: {_number: 10},
|
|
|
|
|
},
|
|
|
|
|
};
|
2016-09-07 17:34:41 -04:00
|
|
|
element._fileList = ['chell.go', 'glados.txt', 'wheatley.md'];
|
|
|
|
|
element._path = 'glados.txt';
|
|
|
|
|
flushAsynchronousOperations();
|
2017-05-16 14:38:48 -07:00
|
|
|
const linkEls = Polymer.dom(element.root).querySelectorAll('.navLink');
|
2017-03-29 16:33:29 +00:00
|
|
|
assert.equal(linkEls.length, 3);
|
2016-09-07 17:34:41 -04:00
|
|
|
assert.equal(linkEls[0].getAttribute('href'), '/c/42/10/chell.go');
|
2017-03-29 16:33:29 +00:00
|
|
|
assert.equal(linkEls[1].getAttribute('href'), '/c/42/');
|
|
|
|
|
assert.equal(linkEls[2].getAttribute('href'), '/c/42/10/wheatley.md');
|
2016-09-07 17:34:41 -04:00
|
|
|
element._path = 'wheatley.md';
|
|
|
|
|
flushAsynchronousOperations();
|
|
|
|
|
assert.equal(linkEls[0].getAttribute('href'), '/c/42/10/glados.txt');
|
2017-03-29 16:33:29 +00:00
|
|
|
assert.equal(linkEls[1].getAttribute('href'), '/c/42/');
|
|
|
|
|
assert.isFalse(linkEls[2].hasAttribute('href'));
|
2016-09-07 17:34:41 -04:00
|
|
|
element._path = 'chell.go';
|
|
|
|
|
flushAsynchronousOperations();
|
|
|
|
|
assert.isFalse(linkEls[0].hasAttribute('href'));
|
2017-03-29 16:33:29 +00:00
|
|
|
assert.equal(linkEls[1].getAttribute('href'), '/c/42/');
|
|
|
|
|
assert.equal(linkEls[2].getAttribute('href'), '/c/42/10/glados.txt');
|
2017-01-06 15:31:32 -08:00
|
|
|
element._path = 'not_a_real_file';
|
|
|
|
|
flushAsynchronousOperations();
|
|
|
|
|
assert.equal(linkEls[0].getAttribute('href'), '/c/42/10/wheatley.md');
|
2017-03-29 16:33:29 +00:00
|
|
|
assert.equal(linkEls[1].getAttribute('href'), '/c/42/');
|
|
|
|
|
assert.equal(linkEls[2].getAttribute('href'), '/c/42/10/chell.go');
|
2016-09-07 17:34:41 -04:00
|
|
|
});
|
|
|
|
|
|
2017-05-16 14:38:48 -07:00
|
|
|
test('download link', () => {
|
2016-10-21 11:01:08 -07:00
|
|
|
element._changeNum = '42';
|
|
|
|
|
element._patchRange = {
|
|
|
|
|
basePatchNum: 'PARENT',
|
|
|
|
|
patchNum: '10',
|
|
|
|
|
};
|
|
|
|
|
element._fileList = ['chell.go', 'glados.txt', 'wheatley.md'];
|
|
|
|
|
element._path = 'glados.txt';
|
|
|
|
|
flushAsynchronousOperations();
|
|
|
|
|
assert.equal(element.$$('.downloadLink').getAttribute('href'),
|
|
|
|
|
'/changes/42/revisions/10/patch?zip&path=glados.txt');
|
|
|
|
|
});
|
|
|
|
|
|
2017-05-16 14:38:48 -07:00
|
|
|
test('prev/up/next links with patch range', () => {
|
2016-09-07 17:34:41 -04:00
|
|
|
element._changeNum = '42';
|
|
|
|
|
element._patchRange = {
|
|
|
|
|
basePatchNum: '5',
|
|
|
|
|
patchNum: '10',
|
|
|
|
|
};
|
2017-03-29 16:33:29 +00:00
|
|
|
element._change = {
|
|
|
|
|
revisions: {
|
|
|
|
|
a: {_number: 5},
|
|
|
|
|
b: {_number: 10},
|
|
|
|
|
},
|
|
|
|
|
};
|
2016-09-07 17:34:41 -04:00
|
|
|
element._fileList = ['chell.go', 'glados.txt', 'wheatley.md'];
|
|
|
|
|
element._path = 'glados.txt';
|
|
|
|
|
flushAsynchronousOperations();
|
2017-05-16 14:38:48 -07:00
|
|
|
const linkEls = Polymer.dom(element.root).querySelectorAll('.navLink');
|
2017-03-29 16:33:29 +00:00
|
|
|
assert.equal(linkEls.length, 3);
|
2016-09-07 17:34:41 -04:00
|
|
|
assert.equal(linkEls[0].getAttribute('href'), '/c/42/5..10/chell.go');
|
2017-03-29 16:33:29 +00:00
|
|
|
assert.equal(linkEls[1].getAttribute('href'), '/c/42/5..10');
|
|
|
|
|
assert.equal(linkEls[2].getAttribute('href'), '/c/42/5..10/wheatley.md');
|
2016-09-07 17:34:41 -04:00
|
|
|
element._path = 'wheatley.md';
|
|
|
|
|
flushAsynchronousOperations();
|
|
|
|
|
assert.equal(linkEls[0].getAttribute('href'), '/c/42/5..10/glados.txt');
|
2017-03-29 16:33:29 +00:00
|
|
|
assert.equal(linkEls[1].getAttribute('href'), '/c/42/5..10');
|
|
|
|
|
assert.isFalse(linkEls[2].hasAttribute('href'));
|
2016-09-07 17:34:41 -04:00
|
|
|
element._path = 'chell.go';
|
|
|
|
|
flushAsynchronousOperations();
|
|
|
|
|
assert.isFalse(linkEls[0].hasAttribute('href'));
|
2017-03-29 16:33:29 +00:00
|
|
|
assert.equal(linkEls[1].getAttribute('href'), '/c/42/5..10');
|
|
|
|
|
assert.equal(linkEls[2].getAttribute('href'), '/c/42/5..10/glados.txt');
|
2016-09-07 17:34:41 -04:00
|
|
|
});
|
|
|
|
|
|
2017-05-16 14:38:48 -07:00
|
|
|
test('file review status', done => {
|
2016-02-10 21:59:20 +01:00
|
|
|
element._loggedIn = true;
|
|
|
|
|
element._changeNum = '42';
|
|
|
|
|
element._patchRange = {
|
|
|
|
|
basePatchNum: '1',
|
|
|
|
|
patchNum: '2',
|
|
|
|
|
};
|
|
|
|
|
element._fileList = ['/COMMIT_MSG'];
|
|
|
|
|
element._path = '/COMMIT_MSG';
|
2017-05-16 14:38:48 -07:00
|
|
|
const saveReviewedStub = sandbox.stub(element, '_saveReviewedState',
|
|
|
|
|
() => Promise.resolve());
|
2016-02-10 21:59:20 +01:00
|
|
|
|
2017-05-16 14:38:48 -07:00
|
|
|
flush(() => {
|
|
|
|
|
const commitMsg = Polymer.dom(element.root).querySelector(
|
2016-02-10 21:59:20 +01:00
|
|
|
'input[type="checkbox"]');
|
|
|
|
|
|
|
|
|
|
assert.isTrue(commitMsg.checked);
|
2016-04-05 16:06:57 -04:00
|
|
|
MockInteractions.tap(commitMsg);
|
|
|
|
|
assert.isFalse(commitMsg.checked);
|
|
|
|
|
assert.isTrue(saveReviewedStub.lastCall.calledWithExactly(false));
|
2016-02-10 21:59:20 +01:00
|
|
|
|
|
|
|
|
MockInteractions.tap(commitMsg);
|
2016-04-05 16:06:57 -04:00
|
|
|
assert.isTrue(commitMsg.checked);
|
|
|
|
|
assert.isTrue(saveReviewedStub.lastCall.calledWithExactly(true));
|
|
|
|
|
|
|
|
|
|
done();
|
2016-03-06 14:57:02 +01:00
|
|
|
});
|
2016-02-10 21:59:20 +01:00
|
|
|
});
|
2016-05-05 16:53:38 -07:00
|
|
|
|
2017-05-16 14:38:48 -07:00
|
|
|
test('diff mode selector correctly toggles the diff', () => {
|
|
|
|
|
const select = element.$.modeSelect;
|
|
|
|
|
const diffDisplay = element.$.diff;
|
2016-12-09 16:58:31 -08:00
|
|
|
element._userPrefs = {default_diff_view: 'SIDE_BY_SIDE'};
|
2016-05-05 16:53:38 -07:00
|
|
|
|
|
|
|
|
// The mode selected in the view state reflects the selected option.
|
|
|
|
|
assert.equal(element._getDiffViewMode(), select.value);
|
|
|
|
|
|
|
|
|
|
// The mode selected in the view state reflects the view rednered in the
|
|
|
|
|
// diff.
|
|
|
|
|
assert.equal(select.value, diffDisplay.viewMode);
|
|
|
|
|
|
|
|
|
|
// We will simulate a user change of the selected mode.
|
2017-05-16 14:38:48 -07:00
|
|
|
const newMode = 'UNIFIED_DIFF';
|
2016-05-05 16:53:38 -07:00
|
|
|
// Set the actual value of the select, and simulate the change event.
|
|
|
|
|
select.value = newMode;
|
2016-07-13 21:06:03 +02:00
|
|
|
element.fire('change', {}, {node: select});
|
2016-05-05 16:53:38 -07:00
|
|
|
|
|
|
|
|
// Make sure the handler was called and the state is still coherent.
|
|
|
|
|
assert.equal(element._getDiffViewMode(), newMode);
|
|
|
|
|
assert.equal(element._getDiffViewMode(), select.value);
|
|
|
|
|
assert.equal(element._getDiffViewMode(), diffDisplay.viewMode);
|
|
|
|
|
});
|
2016-06-20 14:38:33 -07:00
|
|
|
|
2017-05-16 14:38:48 -07:00
|
|
|
test('diff mode selector initializes from preferences', () => {
|
|
|
|
|
let resolvePrefs;
|
|
|
|
|
const prefsPromise = new Promise(resolve => {
|
2016-08-25 12:35:50 -07:00
|
|
|
resolvePrefs = resolve;
|
|
|
|
|
});
|
2017-05-16 14:38:48 -07:00
|
|
|
sandbox.stub(element.$.restAPI, 'getPreferences', () => prefsPromise);
|
2016-08-25 12:35:50 -07:00
|
|
|
|
|
|
|
|
// Attach a new gr-diff-view so we can intercept the preferences fetch.
|
2017-05-16 14:38:48 -07:00
|
|
|
const view = document.createElement('gr-diff-view');
|
|
|
|
|
const select = view.$.modeSelect;
|
2016-08-25 12:35:50 -07:00
|
|
|
fixture('blank').appendChild(view);
|
|
|
|
|
flushAsynchronousOperations();
|
|
|
|
|
|
|
|
|
|
// At this point the diff mode doesn't yet have the user's preference.
|
|
|
|
|
assert.equal(select.value, 'SIDE_BY_SIDE');
|
|
|
|
|
|
|
|
|
|
// Receive the overriding preference.
|
2016-12-09 16:58:31 -08:00
|
|
|
resolvePrefs({default_diff_view: 'UNIFIED'});
|
2016-08-25 12:35:50 -07:00
|
|
|
flushAsynchronousOperations();
|
|
|
|
|
assert.equal(select.value, 'SIDE_BY_SIDE');
|
|
|
|
|
});
|
|
|
|
|
|
2017-05-16 14:38:48 -07:00
|
|
|
test('_loadHash', () => {
|
2016-06-20 14:38:33 -07:00
|
|
|
assert.isNotOk(element.$.cursor.initialLineNumber);
|
|
|
|
|
|
|
|
|
|
// Ignores invalid hashes:
|
|
|
|
|
element._loadHash('not valid');
|
|
|
|
|
assert.isNotOk(element.$.cursor.initialLineNumber);
|
|
|
|
|
|
|
|
|
|
// Revision hash:
|
|
|
|
|
element._loadHash('234');
|
|
|
|
|
assert.equal(element.$.cursor.initialLineNumber, 234);
|
|
|
|
|
assert.equal(element.$.cursor.side, 'right');
|
|
|
|
|
|
|
|
|
|
// Base hash:
|
|
|
|
|
element._loadHash('b345');
|
|
|
|
|
assert.equal(element.$.cursor.initialLineNumber, 345);
|
|
|
|
|
assert.equal(element.$.cursor.side, 'left');
|
2016-10-19 15:03:18 -07:00
|
|
|
|
|
|
|
|
// GWT-style base hash:
|
|
|
|
|
element._loadHash('a123');
|
|
|
|
|
assert.equal(element.$.cursor.initialLineNumber, 123);
|
|
|
|
|
assert.equal(element.$.cursor.side, 'left');
|
2016-06-20 14:38:33 -07:00
|
|
|
});
|
2016-09-27 15:57:56 -07:00
|
|
|
|
2017-05-16 14:38:48 -07:00
|
|
|
test('_shortenPath with long path should add ellipsis', () => {
|
|
|
|
|
let path = 'level1/level2/level3/level4/file.js';
|
|
|
|
|
let shortenedPath = util.truncatePath(path);
|
2016-10-11 13:23:53 -07:00
|
|
|
// The expected path is truncated with an ellipsis.
|
2017-05-16 14:38:48 -07:00
|
|
|
const expectedPath = '\u2026/file.js';
|
2016-10-11 13:23:53 -07:00
|
|
|
assert.equal(shortenedPath, expectedPath);
|
|
|
|
|
|
2017-05-16 14:38:48 -07:00
|
|
|
path = 'level2/file.js';
|
|
|
|
|
shortenedPath = util.truncatePath(path);
|
2016-10-11 13:23:53 -07:00
|
|
|
assert.equal(shortenedPath, expectedPath);
|
|
|
|
|
});
|
|
|
|
|
|
2017-05-16 14:38:48 -07:00
|
|
|
test('_shortenPath with short path should not add ellipsis', () => {
|
|
|
|
|
const path = 'file.js';
|
|
|
|
|
const expectedPath = 'file.js';
|
|
|
|
|
const shortenedPath = util.truncatePath(path);
|
2016-10-11 13:23:53 -07:00
|
|
|
assert.equal(shortenedPath, expectedPath);
|
|
|
|
|
});
|
2016-10-26 17:11:50 -07:00
|
|
|
|
2017-05-16 14:38:48 -07:00
|
|
|
test('_onLineSelected', () => {
|
|
|
|
|
const replaceStateStub = sandbox.stub(history, 'replaceState');
|
|
|
|
|
const moveStub = sandbox.stub(element.$.cursor, 'moveToLineNumber');
|
2016-10-26 17:11:50 -07:00
|
|
|
|
2017-05-16 14:38:48 -07:00
|
|
|
const e = {};
|
|
|
|
|
const detail = {number: 123, side: 'right'};
|
2016-10-26 17:11:50 -07:00
|
|
|
|
|
|
|
|
element._onLineSelected(e, detail);
|
|
|
|
|
|
|
|
|
|
assert.isTrue(moveStub.called);
|
|
|
|
|
assert.equal(moveStub.lastCall.args[0], detail.number);
|
|
|
|
|
assert.equal(moveStub.lastCall.args[1], detail.side);
|
|
|
|
|
|
|
|
|
|
assert.isTrue(replaceStateStub.called);
|
|
|
|
|
});
|
2016-11-01 16:11:07 -07:00
|
|
|
|
2017-05-16 14:38:48 -07:00
|
|
|
test('_getDiffURL encodes special characters', () => {
|
|
|
|
|
const changeNum = 123;
|
|
|
|
|
const patchRange = {basePatchNum: 123, patchNum: 456};
|
|
|
|
|
const path = 'c++/cpp.cpp';
|
2016-11-01 16:11:07 -07:00
|
|
|
assert.equal(element._getDiffURL(changeNum, patchRange, path),
|
|
|
|
|
'/c/123/123..456/c%252B%252B/cpp.cpp');
|
|
|
|
|
});
|
2016-12-09 16:58:31 -08:00
|
|
|
|
2017-05-16 14:38:48 -07:00
|
|
|
test('_getDiffViewMode', () => {
|
2016-12-09 16:58:31 -08:00
|
|
|
// No user prefs or change view state set.
|
|
|
|
|
assert.equal(element._getDiffViewMode(), 'SIDE_BY_SIDE');
|
|
|
|
|
|
|
|
|
|
// User prefs but no change view state set.
|
|
|
|
|
element._userPrefs = {default_diff_view: 'UNIFIED_DIFF'};
|
|
|
|
|
assert.equal(element._getDiffViewMode(), 'UNIFIED_DIFF');
|
|
|
|
|
|
|
|
|
|
// User prefs and change view state set.
|
|
|
|
|
element.changeViewState = {diffMode: 'SIDE_BY_SIDE'};
|
|
|
|
|
assert.equal(element._getDiffViewMode(), 'SIDE_BY_SIDE');
|
|
|
|
|
});
|
2017-01-18 17:10:51 -08:00
|
|
|
|
2017-05-16 14:38:48 -07:00
|
|
|
suite('_loadCommentMap', () => {
|
|
|
|
|
test('empty', done => {
|
2017-01-18 17:10:51 -08:00
|
|
|
stub('gr-rest-api-interface', {
|
2017-05-16 14:38:48 -07:00
|
|
|
getDiffRobotComments() { return Promise.resolve({}); },
|
|
|
|
|
getDiffComments() { return Promise.resolve({}); },
|
2017-01-18 17:10:51 -08:00
|
|
|
});
|
2017-05-16 14:38:48 -07:00
|
|
|
element._loadCommentMap().then(map => {
|
2017-01-18 17:10:51 -08:00
|
|
|
assert.equal(Object.keys(map).length, 0);
|
|
|
|
|
done();
|
|
|
|
|
});
|
|
|
|
|
});
|
|
|
|
|
|
2017-05-16 14:38:48 -07:00
|
|
|
test('paths in patch range', done => {
|
2017-01-18 17:10:51 -08:00
|
|
|
stub('gr-rest-api-interface', {
|
2017-05-16 14:38:48 -07:00
|
|
|
getDiffRobotComments() { return Promise.resolve({}); },
|
|
|
|
|
getDiffComments() {
|
2017-01-18 17:10:51 -08:00
|
|
|
return Promise.resolve({
|
|
|
|
|
'path/to/file/one.cpp': [{patch_set: 3, message: 'lorem'}],
|
|
|
|
|
'path-to/file/two.py': [{patch_set: 5, message: 'ipsum'}],
|
|
|
|
|
});
|
|
|
|
|
},
|
|
|
|
|
});
|
|
|
|
|
element._changeNum = '42';
|
|
|
|
|
element._patchRange = {
|
|
|
|
|
basePatchNum: '3',
|
|
|
|
|
patchNum: '5',
|
|
|
|
|
};
|
2017-05-16 14:38:48 -07:00
|
|
|
element._loadCommentMap().then(map => {
|
2017-01-18 17:10:51 -08:00
|
|
|
assert.deepEqual(Object.keys(map),
|
|
|
|
|
['path/to/file/one.cpp', 'path-to/file/two.py']);
|
|
|
|
|
done();
|
|
|
|
|
});
|
|
|
|
|
});
|
|
|
|
|
|
2017-05-16 14:38:48 -07:00
|
|
|
test('empty for paths outside patch range', done => {
|
2017-01-18 17:10:51 -08:00
|
|
|
stub('gr-rest-api-interface', {
|
2017-05-16 14:38:48 -07:00
|
|
|
getDiffRobotComments() { return Promise.resolve({}); },
|
|
|
|
|
getDiffComments() {
|
2017-01-18 17:10:51 -08:00
|
|
|
return Promise.resolve({
|
|
|
|
|
'path/to/file/one.cpp': [{patch_set: 'PARENT', message: 'lorem'}],
|
|
|
|
|
'path-to/file/two.py': [{patch_set: 2, message: 'ipsum'}],
|
|
|
|
|
});
|
|
|
|
|
},
|
|
|
|
|
});
|
|
|
|
|
element._changeNum = '42';
|
|
|
|
|
element._patchRange = {
|
|
|
|
|
basePatchNum: '3',
|
|
|
|
|
patchNum: '5',
|
|
|
|
|
};
|
2017-05-16 14:38:48 -07:00
|
|
|
element._loadCommentMap().then(map => {
|
2017-01-18 17:10:51 -08:00
|
|
|
assert.equal(Object.keys(map).length, 0);
|
|
|
|
|
done();
|
|
|
|
|
});
|
|
|
|
|
});
|
|
|
|
|
});
|
|
|
|
|
|
2017-05-16 14:38:48 -07:00
|
|
|
suite('_computeCommentSkips', () => {
|
|
|
|
|
test('empty file list', () => {
|
|
|
|
|
const commentMap = {
|
2017-01-18 17:10:51 -08:00
|
|
|
'path/one.jpg': true,
|
|
|
|
|
'path/three.wav': true,
|
|
|
|
|
};
|
2017-05-16 14:38:48 -07:00
|
|
|
const path = 'path/two.m4v';
|
|
|
|
|
const fileList = [];
|
|
|
|
|
const result = element._computeCommentSkips(commentMap, fileList, path);
|
2017-01-18 17:10:51 -08:00
|
|
|
assert.isNull(result.previous);
|
|
|
|
|
assert.isNull(result.next);
|
|
|
|
|
});
|
|
|
|
|
|
2017-05-16 14:38:48 -07:00
|
|
|
test('finds skips', () => {
|
|
|
|
|
const fileList = ['path/one.jpg', 'path/two.m4v', 'path/three.wav'];
|
|
|
|
|
let path = fileList[1];
|
|
|
|
|
const commentMap = {};
|
2017-01-18 17:10:51 -08:00
|
|
|
commentMap[fileList[0]] = true;
|
|
|
|
|
commentMap[fileList[1]] = false;
|
|
|
|
|
commentMap[fileList[2]] = true;
|
|
|
|
|
|
2017-05-16 14:38:48 -07:00
|
|
|
let result = element._computeCommentSkips(commentMap, fileList, path);
|
2017-01-18 17:10:51 -08:00
|
|
|
assert.equal(result.previous, fileList[0]);
|
|
|
|
|
assert.equal(result.next, fileList[2]);
|
|
|
|
|
|
|
|
|
|
commentMap[fileList[1]] = true;
|
|
|
|
|
|
|
|
|
|
result = element._computeCommentSkips(commentMap, fileList, path);
|
|
|
|
|
assert.equal(result.previous, fileList[0]);
|
|
|
|
|
assert.equal(result.next, fileList[2]);
|
|
|
|
|
|
|
|
|
|
path = fileList[0];
|
|
|
|
|
|
|
|
|
|
result = element._computeCommentSkips(commentMap, fileList, path);
|
|
|
|
|
assert.isNull(result.previous);
|
|
|
|
|
assert.equal(result.next, fileList[1]);
|
|
|
|
|
|
|
|
|
|
path = fileList[2];
|
|
|
|
|
|
|
|
|
|
result = element._computeCommentSkips(commentMap, fileList, path);
|
|
|
|
|
assert.equal(result.previous, fileList[1]);
|
|
|
|
|
assert.isNull(result.next);
|
|
|
|
|
});
|
|
|
|
|
});
|
2015-11-14 15:40:47 -05:00
|
|
|
});
|
|
|
|
|
</script>
|