Assign correct type to patchNum in tests

PatchSetNum is number | 'edit' | 'parent' Assign number to patchRange instead of string. Change-Id: I06e6e2dde26a5827e1750c735076a4b0572e5abd
2020-10-27 18:28:22 +01:00
parent 2cda8c655a
commit 6a641671e4
4 changed files with 84 additions and 84 deletions
--- a/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view_test.js
+++ b/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view_test.js
@@ -1316,7 +1316,7 @@ suite('gr-change-view tests', () => {

    const value = {
      view: GerritNav.View.CHANGE,
-      patchNum: '1',
+      patchNum: 1,
    };
    element._paramsChanged(value);
    assert.isTrue(reloadStub.calledOnce);
@@ -2285,7 +2285,7 @@ suite('gr-change-view tests', () => {
        }));
    sinon.stub(element, '_getEdit').returns(Promise.resolve());
    sinon.stub(element, '_getPreferences').returns(Promise.resolve({}));
-    element._patchRange = {patchNum: '2'};
+    element._patchRange = {patchNum: 2};
    return element._getChangeDetail().then(() => {
      assert.strictEqual(element._selectedRevision, revision2);

--- a/polygerrit-ui/app/elements/change/gr-file-list/gr-file-list_test.js
+++ b/polygerrit-ui/app/elements/change/gr-file-list/gr-file-list_test.js
@@ -114,7 +114,7 @@ suite('gr-file-list tests', () => {
      element.numFilesShown = 200;
      element.patchRange = {
        basePatchNum: 'PARENT',
-        patchNum: '2',
+        patchNum: 2,
      };
      saveStub = sinon.stub(element, '_saveReviewedState').callsFake(
          () => Promise.resolve());
@@ -419,17 +419,17 @@ suite('gr-file-list tests', () => {

      const parentTo1 = {
        basePatchNum: 'PARENT',
-        patchNum: '1',
+        patchNum: 1,
      };

      const parentTo2 = {
        basePatchNum: 'PARENT',
-        patchNum: '2',
+        patchNum: 2,
      };

      const _1To2 = {
-        basePatchNum: '1',
-        patchNum: '2',
+        basePatchNum: 1,
+        patchNum: 2,
      };

      assert.equal(
@@ -593,7 +593,7 @@ suite('gr-file-list tests', () => {
        element.changeNum = '42';
        element.patchRange = {
          basePatchNum: 'PARENT',
-          patchNum: '2',
+          patchNum: 2,
        };
        element.change = {_number: 42};
        element.$.fileCursor.setCursorAtIndex(0);
@@ -650,7 +650,7 @@ suite('gr-file-list tests', () => {
        MockInteractions.pressAndReleaseKeyOn(element, 79, null, 'o');

        assert(navStub.lastCall.calledWith(element.change,
-            'file_added_in_rev2.txt', '2'),
+            'file_added_in_rev2.txt', 2),
        'Should navigate to /c/42/2/file_added_in_rev2.txt');

        MockInteractions.pressAndReleaseKeyOn(element, 75, null, 'k');
@@ -826,7 +826,7 @@ suite('gr-file-list tests', () => {
      element.changeNum = '42';
      element.patchRange = {
        basePatchNum: 'PARENT',
-        patchNum: '2',
+        patchNum: 2,
      };
      element.$.fileCursor.setCursorAtIndex(0);
      const reviewSpy = sinon.spy(element, '_reviewFile');
@@ -881,7 +881,7 @@ suite('gr-file-list tests', () => {
      element.changeNum = '42';
      element.patchRange = {
        basePatchNum: 'PARENT',
-        patchNum: '2',
+        patchNum: 2,
      };

      const clickSpy = sinon.spy(element, '_handleFileListClick');
@@ -916,7 +916,7 @@ suite('gr-file-list tests', () => {
      element.changeNum = '42';
      element.patchRange = {
        basePatchNum: 'PARENT',
-        patchNum: '2',
+        patchNum: 2,
      };
      element.editMode = true;
      flush();
@@ -937,7 +937,7 @@ suite('gr-file-list tests', () => {
      element.changeNum = '42';
      element.patchRange = {
        basePatchNum: 'PARENT',
-        patchNum: '2',
+        patchNum: 2,
      };
      element.$.fileCursor.setCursorAtIndex(0);
      sinon.stub(element, '_expandedFilesChanged');
@@ -964,7 +964,7 @@ suite('gr-file-list tests', () => {
      element.changeNum = '42';
      element.patchRange = {
        basePatchNum: 'PARENT',
-        patchNum: '2',
+        patchNum: 2,
      };
      sinon.spy(element, '_updateDiffPreferences');
      element.$.fileCursor.setCursorAtIndex(0);
@@ -998,7 +998,7 @@ suite('gr-file-list tests', () => {
      element.changeNum = '42';
      element.patchRange = {
        basePatchNum: 'PARENT',
-        patchNum: '2',
+        patchNum: 2,
      };
      sinon.stub(element, '_expandedFilesChanged');
      flush();
@@ -1593,7 +1593,7 @@ suite('gr-file-list tests', () => {
      element.changeNum = '42';
      element.patchRange = {
        basePatchNum: 'PARENT',
-        patchNum: '2',
+        patchNum: 2,
      };
      sinon.stub(window, 'fetch').callsFake(() => Promise.resolve());
      flush();
--- a/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view_test.js
+++ b/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view_test.js
@@ -168,8 +168,8 @@ suite('gr-diff-view tests', () => {
      element.params = {
        view: GerritNav.View.DIFF,
        changeNum: '42',
-        patchNum: '2',
-        basePatchNum: '1',
+        patchNum: 2,
+        basePatchNum: 1,
        path: '/COMMIT_MSG',
      };
      return element._paramsChanged.returnValues[0].then(() => {
@@ -219,8 +219,8 @@ suite('gr-diff-view tests', () => {
      element.params = {
        view: GerritNav.View.DIFF,
        changeNum: '42',
-        patchNum: '2',
-        basePatchNum: '1',
+        patchNum: 2,
+        basePatchNum: 1,
        path: '/COMMIT_MSG',
      };
      return element._paramsChanged.returnValues[0].then(() => {
@@ -319,8 +319,8 @@ suite('gr-diff-view tests', () => {
          .returns(
              Promise.resolve(generateChange({revisionsCount: 11})));
      element._patchRange = {
-        patchNum: '2',
-        basePatchNum: '1',
+        patchNum: 2,
+        basePatchNum: 1,
      };
      sinon.stub(element, '_isFileUnchanged').returns(false);
      const toastStub =
@@ -347,7 +347,7 @@ suite('gr-diff-view tests', () => {
      element._changeNum = '42';
      element._patchRange = {
        basePatchNum: PARENT,
-        patchNum: '10',
+        patchNum: 10,
      };
      element._change = {
        _number: 42,
@@ -370,20 +370,20 @@ suite('gr-diff-view tests', () => {

      MockInteractions.pressAndReleaseKeyOn(element, 221, null, ']');
      assert(diffNavStub.lastCall.calledWith(element._change, 'wheatley.md',
-          '10', PARENT), 'Should navigate to /c/42/10/wheatley.md');
+          10, PARENT), 'Should navigate to /c/42/10/wheatley.md');
      element._path = 'wheatley.md';
      assert.equal(element.changeViewState.selectedFileIndex, 2);
      assert.isTrue(element._loading);

      MockInteractions.pressAndReleaseKeyOn(element, 219, null, '[');
      assert(diffNavStub.lastCall.calledWith(element._change, 'glados.txt',
-          '10', PARENT), 'Should navigate to /c/42/10/glados.txt');
+          10, PARENT), 'Should navigate to /c/42/10/glados.txt');
      element._path = 'glados.txt';
      assert.equal(element.changeViewState.selectedFileIndex, 1);
      assert.isTrue(element._loading);

      MockInteractions.pressAndReleaseKeyOn(element, 219, null, '[');
-      assert(diffNavStub.lastCall.calledWith(element._change, 'chell.go', '10',
+      assert(diffNavStub.lastCall.calledWith(element._change, 'chell.go', 10,
          PARENT), 'Should navigate to /c/42/10/chell.go');
      element._path = 'chell.go';
      assert.equal(element.changeViewState.selectedFileIndex, 0);
@@ -460,8 +460,8 @@ suite('gr-diff-view tests', () => {

    test('diff against base', () => {
      element._patchRange = {
-        basePatchNum: '5',
-        patchNum: '10',
+        basePatchNum: 5,
+        patchNum: 10,
      };
      sinon.stub(element, 'shouldSuppressKeyboardShortcut').returns(false);
      const diffNavStub = sinon.stub(GerritNav, 'navigateToDiff');
@@ -474,8 +474,8 @@ suite('gr-diff-view tests', () => {
    test('diff against latest', () => {
      element._change = generateChange({revisionsCount: 12});
      element._patchRange = {
-        basePatchNum: '5',
-        patchNum: '10',
+        basePatchNum: 5,
+        patchNum: 10,
      };
      sinon.stub(element, 'shouldSuppressKeyboardShortcut').returns(false);
      const diffNavStub = sinon.stub(GerritNav, 'navigateToDiff');
@@ -555,8 +555,8 @@ suite('gr-diff-view tests', () => {
    test('keyboard shortcuts with patch range', () => {
      element._changeNum = '42';
      element._patchRange = {
-        basePatchNum: '5',
-        patchNum: '10',
+        basePatchNum: 5,
+        patchNum: 10,
      };
      element._change = {
        _number: 42,
@@ -582,24 +582,24 @@ suite('gr-diff-view tests', () => {
      MockInteractions.pressAndReleaseKeyOn(element, 65, null, 'a');
      assert.isTrue(element.changeViewState.showReplyDialog);

-      assert(changeNavStub.lastCall.calledWithExactly(element._change, '10',
-          '5'), 'Should navigate to /c/42/5..10');
+      assert(changeNavStub.lastCall.calledWithExactly(element._change, 10,
+          5), 'Should navigate to /c/42/5..10');

      MockInteractions.pressAndReleaseKeyOn(element, 85, null, 'u');
-      assert(changeNavStub.lastCall.calledWithExactly(element._change, '10',
-          '5'), 'Should navigate to /c/42/5..10');
+      assert(changeNavStub.lastCall.calledWithExactly(element._change, 10,
+          5), 'Should navigate to /c/42/5..10');

      MockInteractions.pressAndReleaseKeyOn(element, 221, null, ']');
      assert.isTrue(element._loading);
      assert(diffNavStub.lastCall.calledWithExactly(element._change,
-          'wheatley.md', '10', '5'),
+          'wheatley.md', 10, 5),
      'Should navigate to /c/42/5..10/wheatley.md');
      element._path = 'wheatley.md';

      MockInteractions.pressAndReleaseKeyOn(element, 219, null, '[');
      assert.isTrue(element._loading);
      assert(diffNavStub.lastCall.calledWithExactly(element._change,
-          'glados.txt', '10', '5'),
+          'glados.txt', 10, 5),
      'Should navigate to /c/42/5..10/glados.txt');
      element._path = 'glados.txt';

@@ -608,15 +608,15 @@ suite('gr-diff-view tests', () => {
      assert(diffNavStub.lastCall.calledWithExactly(
          element._change,
          'chell.go',
-          '10',
-          '5'),
+          10,
+          5),
      'Should navigate to /c/42/5..10/chell.go');
      element._path = 'chell.go';

      MockInteractions.pressAndReleaseKeyOn(element, 219, null, '[');
      assert.isTrue(element._loading);
-      assert(changeNavStub.lastCall.calledWithExactly(element._change, '10',
-          '5'),
+      assert(changeNavStub.lastCall.calledWithExactly(element._change, 10,
+          5),
      'Should navigate to /c/42/5..10');

      assert.isUndefined(element.changeViewState.showDownloadDialog);
@@ -628,7 +628,7 @@ suite('gr-diff-view tests', () => {
      element._changeNum = '42';
      element._patchRange = {
        basePatchNum: PARENT,
-        patchNum: '1',
+        patchNum: 1,
      };
      element._change = {
        _number: 42,
@@ -654,22 +654,22 @@ suite('gr-diff-view tests', () => {
      MockInteractions.pressAndReleaseKeyOn(element, 65, null, 'a');
      assert.isTrue(element.changeViewState.showReplyDialog);

-      assert(changeNavStub.lastCall.calledWithExactly(element._change, '1',
+      assert(changeNavStub.lastCall.calledWithExactly(element._change, 1,
          PARENT), 'Should navigate to /c/42/1');

      MockInteractions.pressAndReleaseKeyOn(element, 85, null, 'u');
-      assert(changeNavStub.lastCall.calledWithExactly(element._change, '1',
+      assert(changeNavStub.lastCall.calledWithExactly(element._change, 1,
          PARENT), 'Should navigate to /c/42/1');

      MockInteractions.pressAndReleaseKeyOn(element, 221, null, ']');
      assert(diffNavStub.lastCall.calledWithExactly(element._change,
-          'wheatley.md', '1', PARENT),
+          'wheatley.md', 1, PARENT),
      'Should navigate to /c/42/1/wheatley.md');
      element._path = 'wheatley.md';

      MockInteractions.pressAndReleaseKeyOn(element, 219, null, '[');
      assert(diffNavStub.lastCall.calledWithExactly(element._change,
-          'glados.txt', '1', PARENT),
+          'glados.txt', 1, PARENT),
      'Should navigate to /c/42/1/glados.txt');
      element._path = 'glados.txt';

@@ -677,13 +677,13 @@ suite('gr-diff-view tests', () => {
      assert(diffNavStub.lastCall.calledWithExactly(
          element._change,
          'chell.go',
-          '1',
+          1,
          PARENT), 'Should navigate to /c/42/1/chell.go');
      element._path = 'chell.go';

      changeNavStub.reset();
      MockInteractions.pressAndReleaseKeyOn(element, 219, null, '[');
-      assert(changeNavStub.lastCall.calledWithExactly(element._change, '1',
+      assert(changeNavStub.lastCall.calledWithExactly(element._change, 1,
          PARENT), 'Should navigate to /c/42/1');
      assert.isTrue(changeNavStub.calledOnce);
    });
@@ -693,7 +693,7 @@ suite('gr-diff-view tests', () => {
      element._path = 't.txt';
      element._patchRange = {
        basePatchNum: PARENT,
-        patchNum: '1',
+        patchNum: 1,
      };
      element._change = {
        _number: 42,
@@ -727,7 +727,7 @@ suite('gr-diff-view tests', () => {
      element._path = 't.txt';
      element._patchRange = {
        basePatchNum: PARENT,
-        patchNum: '1',
+        patchNum: 1,
      };
      element._change = {
        _number: 42,
@@ -764,7 +764,7 @@ suite('gr-diff-view tests', () => {
        element._path = 't.txt';
        element._patchRange = {
          basePatchNum: PARENT,
-          patchNum: '1',
+          patchNum: 1,
        };
        element._change = {
          _number: 42,
@@ -918,7 +918,7 @@ suite('gr-diff-view tests', () => {
        element._changeNum = '42';
        element._patchRange = {
          basePatchNum: PARENT,
-          patchNum: '10',
+          patchNum: 10,
        };
        // computeCommentCount is an empty function hence stubbing function
        // that depends on it's return value
@@ -967,7 +967,7 @@ suite('gr-diff-view tests', () => {
        element._changeNum = '42';
        element._patchRange = {
          basePatchNum: PARENT,
-          patchNum: '10',
+          patchNum: 10,
        };
        element._change = {
          _number: 42,
@@ -1008,8 +1008,8 @@ suite('gr-diff-view tests', () => {
      test('prev/up/next links with patch range', () => {
        element._changeNum = '42';
        element._patchRange = {
-          basePatchNum: '5',
-          patchNum: '10',
+          basePatchNum: 5,
+          patchNum: 10,
        };
        element._change = {
          _number: 42,
@@ -1047,19 +1047,19 @@ suite('gr-diff-view tests', () => {

      element._patchRange = {
        basePatchNum: 'PARENT',
-        patchNum: '3',
+        patchNum: 3,
      };

      const detail = {
        basePatchNum: 'PARENT',
-        patchNum: '1',
+        patchNum: 1,
      };

      element.$.rangeSelect.dispatchEvent(
          new CustomEvent('patch-range-change', {detail, bubbles: false}));

      assert(navigateStub.lastCall.calledWithExactly(element._change,
-          element._path, '1', 'PARENT'));
+          element._path, 1, 'PARENT'));
    });

    test('_prefs.manual_review is respected', () => {
@@ -1073,13 +1073,13 @@ suite('gr-diff-view tests', () => {
      element.params = {
        view: GerritNav.View.DIFF,
        changeNum: '42',
-        patchNum: '2',
-        basePatchNum: '1',
+        patchNum: 2,
+        basePatchNum: 1,
        path: '/COMMIT_MSG',
      };
      element._patchRange = {
-        patchNum: '2',
-        basePatchNum: '1',
+        patchNum: 2,
+        basePatchNum: 1,
      };
      element._prefs = {manual_review: true};
      flush();
@@ -1103,13 +1103,13 @@ suite('gr-diff-view tests', () => {
      element.params = {
        view: GerritNav.View.DIFF,
        changeNum: '42',
-        patchNum: '2',
-        basePatchNum: '1',
+        patchNum: 2,
+        basePatchNum: 1,
        path: '/COMMIT_MSG',
      };
      element._patchRange = {
-        patchNum: '2',
-        basePatchNum: '1',
+        patchNum: 2,
+        basePatchNum: 1,
      };
      element._prefs = {};
      flush();
@@ -1154,8 +1154,8 @@ suite('gr-diff-view tests', () => {
      element.params = {
        view: GerritNav.View.DIFF,
        changeNum: '42',
-        patchNum: '2',
-        basePatchNum: '1',
+        patchNum: 2,
+        basePatchNum: 1,
        path: '/COMMIT_MSG',
        hash: 10,
      };
@@ -1256,8 +1256,8 @@ suite('gr-diff-view tests', () => {
        element.params = {
          view: GerritNav.View.DIFF,
          changeNum: '42',
-          patchNum: '4',
-          basePatchNum: '2',
+          patchNum: 4,
+          basePatchNum: 2,
          path: '/COMMIT_MSG',
        };
        element._change = change;
@@ -1274,7 +1274,7 @@ suite('gr-diff-view tests', () => {
        element.params = {
          view: GerritNav.View.DIFF,
          changeNum: '42',
-          patchNum: '5',
+          patchNum: 5,
          path: '/COMMIT_MSG',
        };
        element._change = change;
@@ -1341,8 +1341,8 @@ suite('gr-diff-view tests', () => {
      element._changeNum = 321;
      element._change = {_number: 321, project: 'foo/bar'};
      element._patchRange = {
-        basePatchNum: '3',
-        patchNum: '5',
+        basePatchNum: 3,
+        patchNum: 5,
      };
      const e = {};
      const detail = {number: 123, side: 'right'};
@@ -1363,8 +1363,8 @@ suite('gr-diff-view tests', () => {
      element._changeNum = 321;
      element._change = {_number: 321, project: 'foo/bar'};
      element._patchRange = {
-        basePatchNum: '3',
-        patchNum: '5',
+        basePatchNum: 3,
+        patchNum: 5,
      };
      const e = {};
      const detail = {number: 123, side: 'left'};
@@ -1410,7 +1410,7 @@ suite('gr-diff-view tests', () => {
        element.params = {
          view: GerritView.DIFF,
          changeNum: '42',
-          patchNum: '3',
+          patchNum: 3,
        };
        await flush();
      });
@@ -1430,8 +1430,8 @@ suite('gr-diff-view tests', () => {
        sinon.stub(element, '_getCommentsForPath').returns({meta: {}});
        element._changeNum = '42';
        element._patchRange = {
-          basePatchNum: '3',
-          patchNum: '5',
+          basePatchNum: 3,
+          patchNum: 5,
        };
        element._initPatchRange();
        assert.deepEqual(Object.keys(element._commentMap),
@@ -1493,7 +1493,7 @@ suite('gr-diff-view tests', () => {
          element._files = getFilesFromFileList([
            'path/one.jpg', 'path/two.m4v', 'path/three.wav',
          ]);
-          element._patchRange = {patchNum: '2', basePatchNum: '1'};
+          element._patchRange = {patchNum: 2, basePatchNum: 1};
        });

        suite('_moveToPreviousFileWithComment', () => {
@@ -1644,7 +1644,7 @@ suite('gr-diff-view tests', () => {

      test('reviewed checkbox', () => {
        sinon.stub(element, '_handlePatchChange');
-        element._patchRange = {patchNum: '1'};
+        element._patchRange = {patchNum: 1};
        // Reviewed checkbox should be shown.
        assert.isTrue(isVisible(element.$.reviewed));
        element.set('_patchRange.patchNum', SPECIAL_PATCH_SET_NUM.EDIT);
@@ -1850,8 +1850,8 @@ suite('gr-diff-view tests', () => {
    test('_getFiles add files with comments without changes', () => {
      const patchChangeRecord = {
        base: {
-          basePatchNum: '5',
-          patchNum: '10',
+          basePatchNum: 5,
+          patchNum: 10,
        },
      };
      const changeComments = {
--- a/polygerrit-ui/app/elements/diff/gr-patch-range-select/gr-patch-range-select_test.js
+++ b/polygerrit-ui/app/elements/diff/gr-patch-range-select/gr-patch-range-select_test.js
@@ -69,7 +69,7 @@ suite('gr-patch-range-select tests', () => {
  test('enabled/disabled options', () => {
    const patchRange = {
      basePatchNum: 'PARENT',
-      patchNum: '3',
+      patchNum: 3,
    };
    const sortedRevisions = [
      {_number: 3},