gerrit/polygerrit-ui/app/elements/diff/gr-diff/gr-diff_test.html

<!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>

<script src="../../../bower_components/webcomponentsjs/webcomponents.min.js"></script>
<script src="../../../bower_components/web-component-tester/browser.js"></script>
<script src="../../../scripts/util.js"></script>

<link rel="import" href="../../../bower_components/iron-test-helpers/iron-test-helpers.html">
<link rel="import" href="gr-diff.html">

<test-fixture id="basic">
  <template>
    <gr-diff></gr-diff>
  </template>
</test-fixture>

<script>
  suite('gr-diff tests', function() {
    var element;

    setup(function() {
      stub('gr-rest-api-interface', {
        getLoggedIn: function() { return Promise.resolve(false); },
      });
      element = fixture('basic');
    });

    test('get drafts logged out', function(done) {
      element.patchRange = {basePatchNum: 0, patchNum: 0};

      var getDraftsStub = sinon.stub(element.$.restAPI, 'getDiffDrafts');
      var loggedInStub = sinon.stub(element, '_getLoggedIn',
          function() { return Promise.resolve(false); });
      element._getDiffDrafts().then(function(result) {
        assert.deepEqual(result, {baseComments: [], comments: []});
        sinon.assert.notCalled(getDraftsStub);
        loggedInStub.restore();
        getDraftsStub.restore();
        done();
      });
    });

    test('get drafts logged in', function(done) {
      element.patchRange = {basePatchNum: 0, patchNum: 0};
      var draftsResponse = {
        baseComments: [{id: 'foo'}],
        comments: [{id: 'bar'}],
      };
      var getDraftsStub = sinon.stub(element.$.restAPI, 'getDiffDrafts',
          function() { return Promise.resolve(draftsResponse); });
      var loggedInStub = sinon.stub(element, '_getLoggedIn',
          function() { return Promise.resolve(true); });
      element._getDiffDrafts().then(function(result) {
        assert.deepEqual(result, draftsResponse);
        loggedInStub.restore();
        getDraftsStub.restore();
        done();
      });
    });

    test('get comments and drafts', function(done) {
      var loggedInStub = sinon.stub(element, '_getLoggedIn',
          function() { return Promise.resolve(true); });
      var comments = {
        baseComments: [
          {id: 'bc1'},
          {id: 'bc2'},
        ],
        comments: [
          {id: 'c1'},
          {id: 'c2'},
        ],
      };
      var diffCommentsStub = sinon.stub(element, '_getDiffComments',
          function() { return Promise.resolve(comments); });

      var drafts = {
        baseComments: [
          {id: 'bd1'},
          {id: 'bd2'},
        ],
        comments: [
          {id: 'd1'},
          {id: 'd2'},
        ],
      };
      var diffDraftsStub = sinon.stub(element, '_getDiffDrafts',
          function() { return Promise.resolve(drafts); });

      element.changeNum = '42';
      element.patchRange = {
        basePatchNum: 'PARENT',
        patchNum: 3,
      };
      element.path = '/path/to/foo';
      element.projectConfig = {foo: 'bar'};

      element._getDiffCommentsAndDrafts().then(function(result) {
        assert.deepEqual(result, {
          meta: {
            changeNum: '42',
            patchRange: {
              basePatchNum: 'PARENT',
              patchNum: 3,
            },
            path: '/path/to/foo',
            projectConfig: {foo: 'bar'},
          },
          left: [
            {id: 'bc1'},
            {id: 'bc2'},
            {id: 'bd1', __draft: true},
            {id: 'bd2', __draft: true},
          ],
          right: [
            {id: 'c1'},
            {id: 'c2'},
            {id: 'd1', __draft: true},
            {id: 'd2', __draft: true},
          ],
        });

        diffCommentsStub.restore();
        diffDraftsStub.restore();
        loggedInStub.restore();
        done();
      });
    });

    test('remove comment', function() {
      element._comments = {
        meta: {
          changeNum: '42',
          patchRange: {
            basePatchNum: 'PARENT',
            patchNum: 3,
          },
          path: '/path/to/foo',
          projectConfig: {foo: 'bar'},
        },
        left: [
          {id: 'bc1'},
          {id: 'bc2'},
          {id: 'bd1', __draft: true},
          {id: 'bd2', __draft: true},
        ],
        right: [
          {id: 'c1'},
          {id: 'c2'},
          {id: 'd1', __draft: true},
          {id: 'd2', __draft: true},
        ],
      };

      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: [
          {id: 'bc1'},
          {id: 'bc2'},
          {id: 'bd1', __draft: true},
          {id: 'bd2', __draft: true},
        ],
        right: [
          {id: 'c1'},
          {id: 'c2'},
          {id: 'd1', __draft: true},
          {id: 'd2', __draft: true},
        ],
      }));

      element._removeComment({id: 'bc2'});
      assert.equal(JSON.stringify(element._comments), JSON.stringify({
        meta: {
          changeNum: '42',
          patchRange: {
            basePatchNum: 'PARENT',
            patchNum: 3,
          },
          path: '/path/to/foo',
          projectConfig: {foo: 'bar'},
        },
        left: [
          {id: 'bc1'},
          {id: 'bd1', __draft: true},
          {id: 'bd2', __draft: true},
        ],
        right: [
          {id: 'c1'},
          {id: 'c2'},
          {id: 'd1', __draft: true},
          {id: 'd2', __draft: true},
        ],
      }));

      element._removeComment({id: 'd2'});
      assert.deepEqual(JSON.stringify(element._comments), JSON.stringify({
        meta: {
          changeNum: '42',
          patchRange: {
            basePatchNum: 'PARENT',
            patchNum: 3,
          },
          path: '/path/to/foo',
          projectConfig: {foo: 'bar'},
        },
        left: [
          {id: 'bc1'},
          {id: 'bd1', __draft: true},
          {id: 'bd2', __draft: true},
        ],
        right: [
          {id: 'c1'},
          {id: 'c2'},
          {id: 'd1', __draft: true},
        ],
      }));
    });

    test('renders image diffs', function(done) {
      var mockDiff = {
        meta_a: {name: 'carrot.jpg', content_type: 'image/jpeg', lines: 66},
        meta_b: {name: 'carrot.jpg', content_type: 'image/jpeg', lines: 560},
        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,
      };
      var mockFile1 = {
        body: 'Qk06AAAAAAAAADYAAAAoAAAAAQAAAP////8BACAAAAAAAAAAAAATCwAAEwsAAA' +
            'AAAAAAAAAAAAAA/w==',
        type: 'image/bmp',
      };
      var mockFile2 = {
        body: 'Qk06AAAAAAAAADYAAAAoAAAAAQAAAP////8BACAAAAAAAAAAAAATCwAAEwsAAA' +
            'AAAAAAAAAA/////w==',
        type: 'image/bmp'
      };
      var mockCommit = {
        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',
      };
      var mockComments = {baseComments: [], comments: []};

      var stubs = [];
      stubs.push(sinon.stub(element, '_getDiff',
          function() { return Promise.resolve(mockDiff); }));
      stubs.push(sinon.stub(element.$.restAPI, 'getCommitInfo',
          function() { return Promise.resolve(mockCommit); }));
      stubs.push(sinon.stub(element.$.restAPI,
          'getCommitFileContents',
          function() { return Promise.resolve(mockFile1); }));
      stubs.push(sinon.stub(element.$.restAPI,
          'getChangeFileContents',
          function() { return Promise.resolve(mockFile2); }));
      stubs.push(sinon.stub(element.$.restAPI, '_getDiffComments',
          function() { return Promise.resolve(mockComments); }));
      stubs.push(sinon.stub(element.$.restAPI, 'getDiffDrafts',
          function() { return Promise.resolve(mockComments); }));

      element.patchRange = {basePatchNum: 'PARENT', patchNum: 1};

      var rendered = function() {
        // Recognizes that it should be an image diff.
        assert.isTrue(element.isImageDiff);
        assert.instanceOf(element._getDiffBuilder(element._diff,
            element._comments, element.prefs), GrDiffBuilderImage);

        // The left image rendered with the parent commit's version of the file.
        var leftInmage = element.$.diffTable.querySelector('td.left img');
        assert.isOk(leftInmage);
        assert.equal(leftInmage.getAttribute('src'),
            'data:image/bmp;base64, ' + mockFile1.body);

        // The right image rendered with this change's revision of the image.
        var rightInmage = element.$.diffTable.querySelector('td.right img');
        assert.isOk(rightInmage);
        assert.equal(rightInmage.getAttribute('src'),
            'data:image/bmp;base64, ' + mockFile2.body);

        // Cleanup.
        element.removeEventListener('render', rendered);
        stubs.forEach(function(stub) { stub.restore(); });

        done();
      };

      element.addEventListener('render', rendered);

      element.$.restAPI.getDiffPreferences().then(function(prefs) {
        element.prefs = prefs;
        element.reload();
      });
    });

    suite('renderDiff', function() {
      setup(function(done) {
        sinon.stub(element, 'fire');
        element._builder = {
          emitDiff: sinon.stub(),
        };
        element._renderDiff();
        flush(function() {
          done();
        });
      });

      teardown(function() {
        element.fire.restore();
      });

      test('fires render', function() {
        assert(element.fire.calledWithExactly(
            'render', null, {bubbles: false}));
      });
      test('calls emitDiff on builder', function() {
        assert(element._builder.emitDiff.calledOnce);
      });
    });
  });
</script>
-												Diff view refactor/cleanup

This breaks gr-diff-view into three components:

+ gr-diff-view: manages keyboard shortcuts and fetching
  change information.
+ gr-diff: fetches diff, comment, and draft data. Normalizes
  it for use in rendering via gr-diff-side.
+ gr-diff-side: renders the normalized model constructed in
  gr-diff.

Comments are not implemented using the new model for the
sake of the reviewer's sanity.

Feature: Issue 3648
Feature: Issue 3663

Change-Id: I60b8a61ef4349d0b7e45b105bb704aa1c07cd358

											
										
										
											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>
-												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.min.js"></script>
 								<script src="../../../bower_components/web-component-tester/browser.js"></script>
-												Add support for images in diffs

If gr-diff recognizes that the file difference it's representing is
between images, it uses a different diff-builder that displays images
in a side-by-side-manner. In this case gr-diff will also make requests
for the image data itself, which it can pass down into the image-based
diff-builder.

Adds methods to gr-rest-api-interface to support rendering the data
relevant to image diffs. For images that are revisions of the current
change, provides "getChangeFileContents". For images that come from the
parent tree (i.e. if the basePatchNum is "PARENT") the interface
provides "getCommitInfo" to determine the SHA of the parent commit, and
"getCommitFileContents" which can get file contents for a given commit.

Bug: Issue 3822
Change-Id: I9be025b4e549fca97c87cdbeede6cb64dea5eac0

											
										
										
											2016-05-23 17:18:43 -07:00
+								<script src="../../../scripts/util.js"></script>
-												Diff view refactor/cleanup

This breaks gr-diff-view into three components:

+ gr-diff-view: manages keyboard shortcuts and fetching
  change information.
+ gr-diff: fetches diff, comment, and draft data. Normalizes
  it for use in rendering via gr-diff-side.
+ gr-diff-side: renders the normalized model constructed in
  gr-diff.

Comments are not implemented using the new model for the
sake of the reviewer's sanity.

Feature: Issue 3648
Feature: Issue 3663

Change-Id: I60b8a61ef4349d0b7e45b105bb704aa1c07cd358

											
										
										
											2015-12-11 12:02:57 -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.html">
-												Diff view refactor/cleanup

This breaks gr-diff-view into three components:

+ gr-diff-view: manages keyboard shortcuts and fetching
  change information.
+ gr-diff: fetches diff, comment, and draft data. Normalizes
  it for use in rendering via gr-diff-side.
+ gr-diff-side: renders the normalized model constructed in
  gr-diff.

Comments are not implemented using the new model for the
sake of the reviewer's sanity.

Feature: Issue 3648
Feature: Issue 3663

Change-Id: I60b8a61ef4349d0b7e45b105bb704aa1c07cd358

											
										
										
											2015-12-11 12:02:57 -05:00
 								<test-fixture id="basic">
 								  <template>
-												Fix issue where navigating between files was causing double requests

Because _diffOptionsChanged fired whenever any of the parameters
passed into them changed, it was firing twice when _paramsChanged
was called in gr-diff-view during a keyboard shortcut event to
change files. Switch to a single `reload` function.

Also add a loading indicator when a diff is loading.

Change-Id: I4fbed3ff1bf4e1fc723a7a0abc726ab8b8bc89d6

											
										
										
											2016-01-11 20:43:02 -05:00
+								    <gr-diff></gr-diff>
-												Diff view refactor/cleanup

This breaks gr-diff-view into three components:

+ gr-diff-view: manages keyboard shortcuts and fetching
  change information.
+ gr-diff: fetches diff, comment, and draft data. Normalizes
  it for use in rendering via gr-diff-side.
+ gr-diff-side: renders the normalized model constructed in
  gr-diff.

Comments are not implemented using the new model for the
sake of the reviewer's sanity.

Feature: Issue 3648
Feature: Issue 3663

Change-Id: I60b8a61ef4349d0b7e45b105bb704aa1c07cd358

											
										
										
											2015-12-11 12:02:57 -05:00
+								  </template>
 								</test-fixture>
 								<script>
 								  suite('gr-diff tests', function() {
 								    var element;
 								    setup(function() {
-												Move gr-diff-new to gr-diff

Change-Id: Ifaad016f806c31f3df43143b3238b757faa18b20

											
										
										
											2016-03-25 16:48:13 -04:00
+								      stub('gr-rest-api-interface', {
 								        getLoggedIn: function() { return Promise.resolve(false); },
-												Fix issues detected by 'JSHint' and 'JSCS'

Change-Id: Ibee5d0843da5776ab1ad43158227178105467d2e

											
										
										
											2016-04-29 22:25:51 +02:00
+								      });
-												Diff view refactor/cleanup

This breaks gr-diff-view into three components:

+ gr-diff-view: manages keyboard shortcuts and fetching
  change information.
+ gr-diff: fetches diff, comment, and draft data. Normalizes
  it for use in rendering via gr-diff-side.
+ gr-diff-side: renders the normalized model constructed in
  gr-diff.

Comments are not implemented using the new model for the
sake of the reviewer's sanity.

Feature: Issue 3648
Feature: Issue 3663

Change-Id: I60b8a61ef4349d0b7e45b105bb704aa1c07cd358

											
										
										
											2015-12-11 12:02:57 -05:00
+								      element = fixture('basic');
 								    });
-												Move gr-diff-new to gr-diff

Change-Id: Ifaad016f806c31f3df43143b3238b757faa18b20

											
										
										
											2016-03-25 16:48:13 -04:00
+								    test('get drafts logged out', function(done) {
 								      element.patchRange = {basePatchNum: 0, patchNum: 0};
 								      var getDraftsStub = sinon.stub(element.$.restAPI, 'getDiffDrafts');
 								      var loggedInStub = sinon.stub(element, '_getLoggedIn',
 								          function() { return Promise.resolve(false); });
 								      element._getDiffDrafts().then(function(result) {
 								        assert.deepEqual(result, {baseComments: [], comments: []});
 								        sinon.assert.notCalled(getDraftsStub);
 								        loggedInStub.restore();
 								        getDraftsStub.restore();
 								        done();
 								      });
-												Diff view refactor/cleanup

This breaks gr-diff-view into three components:

+ gr-diff-view: manages keyboard shortcuts and fetching
  change information.
+ gr-diff: fetches diff, comment, and draft data. Normalizes
  it for use in rendering via gr-diff-side.
+ gr-diff-side: renders the normalized model constructed in
  gr-diff.

Comments are not implemented using the new model for the
sake of the reviewer's sanity.

Feature: Issue 3648
Feature: Issue 3663

Change-Id: I60b8a61ef4349d0b7e45b105bb704aa1c07cd358

											
										
										
											2015-12-11 12:02:57 -05:00
+								    });
-												Move gr-diff-new to gr-diff

Change-Id: Ifaad016f806c31f3df43143b3238b757faa18b20

											
										
										
											2016-03-25 16:48:13 -04:00
+								    test('get drafts logged in', function(done) {
 								      element.patchRange = {basePatchNum: 0, patchNum: 0};
 								      var draftsResponse = {
 								        baseComments: [{id: 'foo'}],
 								        comments: [{id: 'bar'}],
-												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
+								      };
-												Move gr-diff-new to gr-diff

Change-Id: Ifaad016f806c31f3df43143b3238b757faa18b20

											
										
										
											2016-03-25 16:48:13 -04:00
+								      var getDraftsStub = sinon.stub(element.$.restAPI, 'getDiffDrafts',
 								          function() { return Promise.resolve(draftsResponse); });
 								      var loggedInStub = sinon.stub(element, '_getLoggedIn',
 								          function() { return Promise.resolve(true); });
 								      element._getDiffDrafts().then(function(result) {
 								        assert.deepEqual(result, draftsResponse);
 								        loggedInStub.restore();
 								        getDraftsStub.restore();
 								        done();
-												Remove 'element#async' usages in tests

Tests which are using 'element#async' are wonky in Safari.
'flush' is also the documented way of testing dom manipulations.

Change-Id: I3ea99c7c80c952fa1c15bbd6289690e57bf8414b

											
										
										
											2016-03-06 14:57:02 +01:00
+								      });
-												Fix issues detected by 'JSHint' and 'JSCS'

Change-Id: Ia535be02d19f09e716f00ec8819ba785010798f7

											
										
										
											2016-02-02 21:02:42 +01: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
-												Move gr-diff-new to gr-diff

Change-Id: Ifaad016f806c31f3df43143b3238b757faa18b20

											
										
										
											2016-03-25 16:48:13 -04:00
+								    test('get comments and drafts', function(done) {
 								      var loggedInStub = sinon.stub(element, '_getLoggedIn',
 								          function() { return Promise.resolve(true); });
 								      var comments = {
 								        baseComments: [
 								          {id: 'bc1'},
 								          {id: 'bc2'},
 								        ],
 								        comments: [
 								          {id: 'c1'},
 								          {id: 'c2'},
 								        ],
-												Implement diff view context

Only show N lines of context with a control to set the user's
preferred context length.

TODO in follow-up change: persist the context preference.

Feature: Issue 3675
Change-Id: I7e98651459c80d4894c495f68b6f26f201b587ac

											
										
										
											2015-12-18 19:52:28 -05:00
+								      };
-												Move gr-diff-new to gr-diff

Change-Id: Ifaad016f806c31f3df43143b3238b757faa18b20

											
										
										
											2016-03-25 16:48:13 -04:00
+								      var diffCommentsStub = sinon.stub(element, '_getDiffComments',
 								          function() { return Promise.resolve(comments); });
 								      var drafts = {
 								        baseComments: [
 								          {id: 'bd1'},
 								          {id: 'bd2'},
 								        ],
 								        comments: [
 								          {id: 'd1'},
 								          {id: 'd2'},
 								        ],
-												Add a preferences pane to the diff view

This includes to start:
+ Context
+ Column width
+ Tab size
+ Show tab indicators

Bug: Issue 3841
Change-Id: I3c8292648fd87ac2680d0eb22ce8f9e78d24429e

											
										
										
											2016-01-26 16:30:02 -05:00
+								      };
-												Move gr-diff-new to gr-diff

Change-Id: Ifaad016f806c31f3df43143b3238b757faa18b20

											
										
										
											2016-03-25 16:48:13 -04:00
+								      var diffDraftsStub = sinon.stub(element, '_getDiffDrafts',
 								          function() { return Promise.resolve(drafts); });
-												Persist diff context length on server

This code will eventually live within a diff preference pane
once options other than context are supported.

Change-Id: I3c752a18d163a55cb3398c0a46544593b0a9faed

											
										
										
											2016-01-06 10:43:30 -05:00
-												Move gr-diff-new to gr-diff

Change-Id: Ifaad016f806c31f3df43143b3238b757faa18b20

											
										
										
											2016-03-25 16:48:13 -04:00
+								      element.changeNum = '42';
 								      element.patchRange = {
 								        basePatchNum: 'PARENT',
 								        patchNum: 3,
 								      };
 								      element.path = '/path/to/foo';
 								      element.projectConfig = {foo: 'bar'};
 								      element._getDiffCommentsAndDrafts().then(function(result) {
 								        assert.deepEqual(result, {
 								          meta: {
 								            changeNum: '42',
 								            patchRange: {
 								              basePatchNum: 'PARENT',
 								              patchNum: 3,
 								            },
 								            path: '/path/to/foo',
 								            projectConfig: {foo: 'bar'},
 								          },
 								          left: [
 								            {id: 'bc1'},
 								            {id: 'bc2'},
 								            {id: 'bd1', __draft: true},
 								            {id: 'bd2', __draft: true},
 								          ],
 								          right: [
 								            {id: 'c1'},
 								            {id: 'c2'},
 								            {id: 'd1', __draft: true},
 								            {id: 'd2', __draft: true},
 								          ],
 								        });
-												Persist diff context length on server

This code will eventually live within a diff preference pane
once options other than context are supported.

Change-Id: I3c752a18d163a55cb3398c0a46544593b0a9faed

											
										
										
											2016-01-06 10:43:30 -05:00
-												Move gr-diff-new to gr-diff

Change-Id: Ifaad016f806c31f3df43143b3238b757faa18b20

											
										
										
											2016-03-25 16:48:13 -04:00
+								        diffCommentsStub.restore();
 								        diffDraftsStub.restore();
 								        loggedInStub.restore();
-												Persist diff context length on server

This code will eventually live within a diff preference pane
once options other than context are supported.

Change-Id: I3c752a18d163a55cb3398c0a46544593b0a9faed

											
										
										
											2016-01-06 10:43:30 -05:00
+								        done();
 								      });
 								    });
-												Account for tab width when wrapping in diff view

This change takes the tab width from the users’ prefs (or the default
value) and accounts for it when wrapping lines in diffs. Previously it
was counting tabs as only one character.

Some small cleanup of dead test code in gr-diff-test.html as well.

Bug: Issue 3756
Change-Id: I560fcc530638d3aeee28723d4abab5ec3993fa8f

											
										
										
											2016-01-19 16:55:47 -05:00
-												Move gr-diff-new to gr-diff

Change-Id: Ifaad016f806c31f3df43143b3238b757faa18b20

											
										
										
											2016-03-25 16:48:13 -04:00
+								    test('remove comment', function() {
 								      element._comments = {
 								        meta: {
 								          changeNum: '42',
 								          patchRange: {
 								            basePatchNum: 'PARENT',
 								            patchNum: 3,
 								          },
 								          path: '/path/to/foo',
 								          projectConfig: {foo: 'bar'},
 								        },
 								        left: [
 								          {id: 'bc1'},
 								          {id: 'bc2'},
 								          {id: 'bd1', __draft: true},
 								          {id: 'bd2', __draft: true},
 								        ],
 								        right: [
 								          {id: 'c1'},
 								          {id: 'c2'},
 								          {id: 'd1', __draft: true},
 								          {id: 'd2', __draft: true},
 								        ],
-												Fix bug where code with comments outside context wasn't appearing

Also speed up rendering probably unnoticeably via changing a
delete call to a null assignment.
(https://jsperf.com/delete-vs-undefined-vs-null/3).

Bug: Issue 3755
Change-Id: I9d91cbcb00f045ba622a103b44b3d0f06c3eca9d

											
										
										
											2016-01-21 12:54:05 -05:00
+								      };
-												Move gr-diff-new to gr-diff

Change-Id: Ifaad016f806c31f3df43143b3238b757faa18b20

											
										
										
											2016-03-25 16:48:13 -04: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'},
-												Fix bug where code with comments outside context wasn't appearing

Also speed up rendering probably unnoticeably via changing a
delete call to a null assignment.
(https://jsperf.com/delete-vs-undefined-vs-null/3).

Bug: Issue 3755
Change-Id: I9d91cbcb00f045ba622a103b44b3d0f06c3eca9d

											
										
										
											2016-01-21 12:54:05 -05:00
+								        },
-												Move gr-diff-new to gr-diff

Change-Id: Ifaad016f806c31f3df43143b3238b757faa18b20

											
										
										
											2016-03-25 16:48:13 -04:00
+								        left: [
 								          {id: 'bc1'},
 								          {id: 'bc2'},
 								          {id: 'bd1', __draft: true},
 								          {id: 'bd2', __draft: true},
 								        ],
 								        right: [
 								          {id: 'c1'},
 								          {id: 'c2'},
 								          {id: 'd1', __draft: true},
 								          {id: 'd2', __draft: true},
 								        ],
 								      }));
 								      element._removeComment({id: 'bc2'});
 								      assert.equal(JSON.stringify(element._comments), JSON.stringify({
 								        meta: {
 								          changeNum: '42',
 								          patchRange: {
 								            basePatchNum: 'PARENT',
 								            patchNum: 3,
 								          },
 								          path: '/path/to/foo',
 								          projectConfig: {foo: 'bar'},
-												Fix bug where code with comments outside context wasn't appearing

Also speed up rendering probably unnoticeably via changing a
delete call to a null assignment.
(https://jsperf.com/delete-vs-undefined-vs-null/3).

Bug: Issue 3755
Change-Id: I9d91cbcb00f045ba622a103b44b3d0f06c3eca9d

											
										
										
											2016-01-21 12:54:05 -05:00
+								        },
-												Move gr-diff-new to gr-diff

Change-Id: Ifaad016f806c31f3df43143b3238b757faa18b20

											
										
										
											2016-03-25 16:48:13 -04:00
+								        left: [
 								          {id: 'bc1'},
 								          {id: 'bd1', __draft: true},
 								          {id: 'bd2', __draft: true},
 								        ],
 								        right: [
 								          {id: 'c1'},
 								          {id: 'c2'},
 								          {id: 'd1', __draft: true},
 								          {id: 'd2', __draft: true},
 								        ],
 								      }));
 								      element._removeComment({id: 'd2'});
 								      assert.deepEqual(JSON.stringify(element._comments), JSON.stringify({
 								        meta: {
 								          changeNum: '42',
 								          patchRange: {
 								            basePatchNum: 'PARENT',
 								            patchNum: 3,
 								          },
 								          path: '/path/to/foo',
 								          projectConfig: {foo: 'bar'},
-												Fix bug where code with comments outside context wasn't appearing

Also speed up rendering probably unnoticeably via changing a
delete call to a null assignment.
(https://jsperf.com/delete-vs-undefined-vs-null/3).

Bug: Issue 3755
Change-Id: I9d91cbcb00f045ba622a103b44b3d0f06c3eca9d

											
										
										
											2016-01-21 12:54:05 -05:00
+								        },
-												Move gr-diff-new to gr-diff

Change-Id: Ifaad016f806c31f3df43143b3238b757faa18b20

											
										
										
											2016-03-25 16:48:13 -04:00
+								        left: [
 								          {id: 'bc1'},
 								          {id: 'bd1', __draft: true},
 								          {id: 'bd2', __draft: true},
 								        ],
 								        right: [
 								          {id: 'c1'},
 								          {id: 'c2'},
 								          {id: 'd1', __draft: true},
 								        ],
 								      }));
-												Fix bug where code with comments outside context wasn't appearing

Also speed up rendering probably unnoticeably via changing a
delete call to a null assignment.
(https://jsperf.com/delete-vs-undefined-vs-null/3).

Bug: Issue 3755
Change-Id: I9d91cbcb00f045ba622a103b44b3d0f06c3eca9d

											
										
										
											2016-01-21 12:54:05 -05:00
+								    });
-												Add support for images in diffs

If gr-diff recognizes that the file difference it's representing is
between images, it uses a different diff-builder that displays images
in a side-by-side-manner. In this case gr-diff will also make requests
for the image data itself, which it can pass down into the image-based
diff-builder.

Adds methods to gr-rest-api-interface to support rendering the data
relevant to image diffs. For images that are revisions of the current
change, provides "getChangeFileContents". For images that come from the
parent tree (i.e. if the basePatchNum is "PARENT") the interface
provides "getCommitInfo" to determine the SHA of the parent commit, and
"getCommitFileContents" which can get file contents for a given commit.

Bug: Issue 3822
Change-Id: I9be025b4e549fca97c87cdbeede6cb64dea5eac0

											
										
										
											2016-05-23 17:18:43 -07:00
 								    test('renders image diffs', function(done) {
 								      var mockDiff = {
 								        meta_a: {name: 'carrot.jpg', content_type: 'image/jpeg', lines: 66},
 								        meta_b: {name: 'carrot.jpg', content_type: 'image/jpeg', lines: 560},
 								        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,
 								      };
 								      var mockFile1 = {
 								        body: 'Qk06AAAAAAAAADYAAAAoAAAAAQAAAP////8BACAAAAAAAAAAAAATCwAAEwsAAA' +
 								            'AAAAAAAAAAAAAA/w==',
 								        type: 'image/bmp',
 								      };
 								      var mockFile2 = {
 								        body: 'Qk06AAAAAAAAADYAAAAoAAAAAQAAAP////8BACAAAAAAAAAAAAATCwAAEwsAAA' +
 								            'AAAAAAAAAA/////w==',
 								        type: 'image/bmp'
 								      };
 								      var mockCommit = {
 								        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',
 								      };
 								      var mockComments = {baseComments: [], comments: []};
 								      var stubs = [];
 								      stubs.push(sinon.stub(element, '_getDiff',
 								          function() { return Promise.resolve(mockDiff); }));
 								      stubs.push(sinon.stub(element.$.restAPI, 'getCommitInfo',
 								          function() { return Promise.resolve(mockCommit); }));
 								      stubs.push(sinon.stub(element.$.restAPI,
 								          'getCommitFileContents',
 								          function() { return Promise.resolve(mockFile1); }));
 								      stubs.push(sinon.stub(element.$.restAPI,
 								          'getChangeFileContents',
 								          function() { return Promise.resolve(mockFile2); }));
 								      stubs.push(sinon.stub(element.$.restAPI, '_getDiffComments',
 								          function() { return Promise.resolve(mockComments); }));
 								      stubs.push(sinon.stub(element.$.restAPI, 'getDiffDrafts',
 								          function() { return Promise.resolve(mockComments); }));
 								      element.patchRange = {basePatchNum: 'PARENT', patchNum: 1};
 								      var rendered = function() {
 								        // Recognizes that it should be an image diff.
 								        assert.isTrue(element.isImageDiff);
 								        assert.instanceOf(element._getDiffBuilder(element._diff,
 								            element._comments, element.prefs), GrDiffBuilderImage);
 								        // The left image rendered with the parent commit's version of the file.
 								        var leftInmage = element.$.diffTable.querySelector('td.left img');
 								        assert.isOk(leftInmage);
 								        assert.equal(leftInmage.getAttribute('src'),
 								            'data:image/bmp;base64, ' + mockFile1.body);
 								        // The right image rendered with this change's revision of the image.
 								        var rightInmage = element.$.diffTable.querySelector('td.right img');
 								        assert.isOk(rightInmage);
 								        assert.equal(rightInmage.getAttribute('src'),
 								            'data:image/bmp;base64, ' + mockFile2.body);
 								        // Cleanup.
 								        element.removeEventListener('render', rendered);
 								        stubs.forEach(function(stub) { stub.restore(); });
 								        done();
 								      };
 								      element.addEventListener('render', rendered);
 								      element.$.restAPI.getDiffPreferences().then(function(prefs) {
 								        element.prefs = prefs;
 								        element.reload();
 								      });
 								    });
-												Gr-diff retrofit: implement re-render.

Feature: Issue 3910
Change-Id: Ia85bb2302f8435fd6066873ce87bc9c08b9c63b1

											
										
										
											2016-05-23 14:38:05 -07:00
 								    suite('renderDiff', function() {
 								      setup(function(done) {
 								        sinon.stub(element, 'fire');
 								        element._builder = {
 								          emitDiff: sinon.stub(),
 								        };
 								        element._renderDiff();
 								        flush(function() {
 								          done();
 								        });
 								      });
 								      teardown(function() {
 								        element.fire.restore();
 								      });
 								      test('fires render', function() {
 								        assert(element.fire.calledWithExactly(
 								            'render', null, {bubbles: false}));
 								      });
 								      test('calls emitDiff on builder', function() {
 								        assert(element._builder.emitDiff.calledOnce);
 								      });
 								    });
-												Persist diff context length on server

This code will eventually live within a diff preference pane
once options other than context are supported.

Change-Id: I3c752a18d163a55cb3398c0a46544593b0a9faed

											
										
										
											2016-01-06 10:43:30 -05:00
+								  });
-												Diff view refactor/cleanup

This breaks gr-diff-view into three components:

+ gr-diff-view: manages keyboard shortcuts and fetching
  change information.
+ gr-diff: fetches diff, comment, and draft data. Normalizes
  it for use in rendering via gr-diff-side.
+ gr-diff-side: renders the normalized model constructed in
  gr-diff.

Comments are not implemented using the new model for the
sake of the reviewer's sanity.

Feature: Issue 3648
Feature: Issue 3663

Change-Id: I60b8a61ef4349d0b7e45b105bb704aa1c07cd358

											
										
										
											2015-12-11 12:02:57 -05:00
+								</script>