Merge "Align reply dialog account list titles"
diff --git a/javatests/com/google/gerrit/server/query/account/AbstractQueryAccountsTest.java b/javatests/com/google/gerrit/server/query/account/AbstractQueryAccountsTest.java
index e3dcbc5..6b4c5ea 100644
--- a/javatests/com/google/gerrit/server/query/account/AbstractQueryAccountsTest.java
+++ b/javatests/com/google/gerrit/server/query/account/AbstractQueryAccountsTest.java
@@ -129,6 +129,12 @@
setUpDatabase();
}
+ @After
+ public void cleanUp() {
+ lifecycle.stop();
+ db.close();
+ }
+
protected void setUpDatabase() throws Exception {
db = schemaFactory.open();
schemaCreator.create(db);
diff --git a/javatests/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java b/javatests/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java
index b47c3b1..ee3097e 100644
--- a/javatests/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java
+++ b/javatests/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java
@@ -217,6 +217,12 @@
setUpDatabase();
}
+ @After
+ public void cleanUp() {
+ lifecycle.stop();
+ db.close();
+ }
+
protected void setUpDatabase() throws Exception {
try (ReviewDb underlyingDb = inMemoryDatabase.getDatabase().open()) {
schemaCreator.create(underlyingDb);
diff --git a/javatests/com/google/gerrit/server/query/group/AbstractQueryGroupsTest.java b/javatests/com/google/gerrit/server/query/group/AbstractQueryGroupsTest.java
index bce151b..b55eee6 100644
--- a/javatests/com/google/gerrit/server/query/group/AbstractQueryGroupsTest.java
+++ b/javatests/com/google/gerrit/server/query/group/AbstractQueryGroupsTest.java
@@ -126,6 +126,12 @@
setUpDatabase();
}
+ @After
+ public void cleanUp() {
+ lifecycle.stop();
+ db.close();
+ }
+
protected void setUpDatabase() throws Exception {
db = schemaFactory.open();
schemaCreator.create(db);
diff --git a/javatests/com/google/gerrit/server/query/project/AbstractQueryProjectsTest.java b/javatests/com/google/gerrit/server/query/project/AbstractQueryProjectsTest.java
index 5c8114d..dfabd55 100644
--- a/javatests/com/google/gerrit/server/query/project/AbstractQueryProjectsTest.java
+++ b/javatests/com/google/gerrit/server/query/project/AbstractQueryProjectsTest.java
@@ -113,6 +113,12 @@
setUpDatabase();
}
+ @After
+ public void cleanUp() {
+ lifecycle.stop();
+ db.close();
+ }
+
protected void setUpDatabase() throws Exception {
db = schemaFactory.open();
schemaCreator.create(db);
diff --git a/polygerrit-ui/app/elements/change/gr-change-actions/gr-change-actions.js b/polygerrit-ui/app/elements/change/gr-change-actions/gr-change-actions.js
index 299612e..9b0e458 100644
--- a/polygerrit-ui/app/elements/change/gr-change-actions/gr-change-actions.js
+++ b/polygerrit-ui/app/elements/change/gr-change-actions/gr-change-actions.js
@@ -323,7 +323,7 @@
observers: [
'_actionsChanged(actions.*, revisionActions.*, _additionalActions.*, ' +
'editLoaded, editBasedOnCurrentPatchSet, change)',
- '_changeOrPatchNumChanged(changeNum, patchNum)',
+ '_changeChanged(change)',
],
listeners: {
@@ -354,7 +354,7 @@
});
},
- _changeOrPatchNumChanged() {
+ _changeChanged() {
this.reload();
},
diff --git a/polygerrit-ui/app/elements/change/gr-change-actions/gr-change-actions_test.html b/polygerrit-ui/app/elements/change/gr-change-actions/gr-change-actions_test.html
index a8587c0..31ec02d 100644
--- a/polygerrit-ui/app/elements/change/gr-change-actions/gr-change-actions_test.html
+++ b/polygerrit-ui/app/elements/change/gr-change-actions/gr-change-actions_test.html
@@ -1150,6 +1150,14 @@
assert.isTrue(handler.called);
});
+ test('changing changeNum or patchNum does not reload', () => {
+ const reloadStub = sandbox.stub(element, 'reload');
+ element.changeNum = 123;
+ assert.isFalse(reloadStub.called);
+ element.patchNum = 456;
+ assert.isFalse(reloadStub.called);
+ });
+
suite('setActionOverflow', () => {
test('move action from overflow', () => {
assert.isNotOk(element.$$('[data-action-key="cherrypick"]'));
diff --git a/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.html b/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.html
index 8b15880..ba6dbd3 100644
--- a/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.html
+++ b/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.html
@@ -445,7 +445,6 @@
patch-num="{{_patchRange.patchNum}}"
base-patch-num="{{_patchRange.basePatchNum}}"
files-expanded="[[_filesExpanded]]"
- revisions="[[_sortedRevisions]]"
on-open-diff-prefs="_handleOpenDiffPrefs"
on-open-download-dialog="_handleOpenDownloadDialog"
on-expand-diffs="_expandAllDiffs"
@@ -458,7 +457,7 @@
patch-range="{{_patchRange}}"
comments="[[_comments]]"
drafts="[[_diffDrafts]]"
- revisions="[[_sortedRevisions]]"
+ revisions="[[_change.revisions]]"
project-config="[[_projectConfig]]"
selected-index="{{viewState.selectedFileIndex}}"
diff-view-mode="[[viewState.diffMode]]"
diff --git a/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.js b/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.js
index c658e8d..21cd100 100644
--- a/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.js
+++ b/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.js
@@ -201,7 +201,6 @@
},
/** @type {?number} */
_updateCheckTimerHandle: Number,
- _sortedRevisions: Array,
_editLoaded: {
type: Boolean,
computed: '_computeEditLoaded(_patchRange.*)',
@@ -227,7 +226,6 @@
observers: [
'_labelsChanged(_change.labels.*)',
'_paramsAndChangeChanged(params, _change)',
- '_updateSortedRevisions(_change.revisions.*)',
],
keyBindings: {
@@ -294,11 +292,6 @@
});
},
- _updateSortedRevisions(revisionsRecord) {
- const revisions = revisionsRecord.base;
- this._sortedRevisions = this.sortRevisions(Object.values(revisions));
- },
-
_handleEditCommitMessage(e) {
this._editingCommitMessage = true;
this.$.commitMessageEditor.focusTextarea();
diff --git a/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view_test.html b/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view_test.html
index 129b4b3..6c95046 100644
--- a/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view_test.html
+++ b/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view_test.html
@@ -67,10 +67,6 @@
});
suite('keyboard shortcuts', () => {
- setup(() => {
- sandbox.stub(element, '_updateSortedRevisions');
- });
-
test('S should toggle the CL star', () => {
const starStub = sandbox.stub(element.$.changeStar, 'toggleStar');
MockInteractions.pressAndReleaseKeyOn(element, 83, null, 's');
@@ -447,7 +443,6 @@
});
test('change num change', () => {
- sandbox.stub(element, '_updateSortedRevisions');
element._changeNum = null;
element._patchRange = {
basePatchNum: 'PARENT',
@@ -885,7 +880,6 @@
suite('reply dialog tests', () => {
setup(() => {
sandbox.stub(element.$.replyDialog, '_draftChanged');
- sandbox.stub(element, '_updateSortedRevisions');
sandbox.stub(element.$.replyDialog, 'fetchIsLatestKnown',
() => { return Promise.resolve(true); });
element._change = {labels: {}};
diff --git a/polygerrit-ui/app/elements/change/gr-file-list-header/gr-file-list-header.js b/polygerrit-ui/app/elements/change/gr-file-list-header/gr-file-list-header.js
index 36cfe06..07db340 100644
--- a/polygerrit-ui/app/elements/change/gr-file-list-header/gr-file-list-header.js
+++ b/polygerrit-ui/app/elements/change/gr-file-list-header/gr-file-list-header.js
@@ -41,7 +41,6 @@
patchNum: String,
basePatchNum: String,
filesExpanded: String,
- revisions: Array,
// Caps the number of files that can be shown and have the 'show diffs' /
// 'hide diffs' buttons still be functional.
_maxFilesForBulkActions: {
@@ -144,11 +143,6 @@
});
},
- _computeBasePatchDisabled(patchNum, currentPatchNum) {
- return this.findSortedIndex(patchNum, this.revisions) >=
- this.findSortedIndex(currentPatchNum, this.revisions);
- },
-
_computePrefsButtonHidden(prefs, loggedIn) {
return !loggedIn || !prefs;
},
@@ -158,20 +152,6 @@
return shownFileCount <= maxFilesForBulkActions;
},
- /**
- * Determines if a patch number should be disabled based on value of the
- * basePatchNum from gr-file-list.
- * @param {number} patchNum Patch number available in dropdown
- * @param {number|string} basePatchNum Base patch number from file list
- * @return {boolean}
- */
- _computePatchSetDisabled(patchNum, basePatchNum) {
- if (basePatchNum === 'PARENT') { return false; }
-
- return this.findSortedIndex(patchNum, this.revisions) <=
- this.findSortedIndex(basePatchNum, this.revisions);
- },
-
_handlePatchChange(e) {
const {basePatchNum, patchNum} = e.detail;
if (this.patchNumEquals(basePatchNum, this.basePatchNum) &&
diff --git a/polygerrit-ui/app/elements/change/gr-file-list-header/gr-file-list-header_test.html b/polygerrit-ui/app/elements/change/gr-file-list-header/gr-file-list-header_test.html
index 3a2fd63..1e82984 100644
--- a/polygerrit-ui/app/elements/change/gr-file-list-header/gr-file-list-header_test.html
+++ b/polygerrit-ui/app/elements/change/gr-file-list-header/gr-file-list-header_test.html
@@ -96,31 +96,6 @@
'Add patchset description');
});
- test('_computePatchSetDisabled', () => {
- element.revisions = [
- {_number: 1},
- {_number: 2},
- {_number: element.EDIT_NAME, basePatchNum: 2},
- {_number: 3},
- ];
- let basePatchNum = 'PARENT';
- let patchNum = 1;
- assert.equal(element._computePatchSetDisabled(patchNum, basePatchNum),
- false);
- basePatchNum = 1;
- assert.equal(element._computePatchSetDisabled(patchNum, basePatchNum),
- true);
- patchNum = 2;
- assert.equal(element._computePatchSetDisabled(patchNum, basePatchNum),
- false);
- basePatchNum = element.EDIT_NAME;
- assert.equal(element._computePatchSetDisabled(patchNum, basePatchNum),
- true);
- patchNum = '3';
- assert.equal(element._computePatchSetDisabled(patchNum, basePatchNum),
- false);
- });
-
test('_handleDescriptionChanged', () => {
const putDescStub = sandbox.stub(element.$.restAPI, 'setDescription')
.returns(Promise.resolve({ok: true}));
diff --git a/polygerrit-ui/app/elements/change/gr-file-list/gr-file-list.js b/polygerrit-ui/app/elements/change/gr-file-list/gr-file-list.js
index f7b1af9..054f0f1 100644
--- a/polygerrit-ui/app/elements/change/gr-file-list/gr-file-list.js
+++ b/polygerrit-ui/app/elements/change/gr-file-list/gr-file-list.js
@@ -39,7 +39,6 @@
changeNum: String,
comments: Object,
drafts: Object,
- // Already sorted by the change-view.
revisions: Array,
projectConfig: Object,
selectedIndex: {
@@ -119,7 +118,6 @@
type: Boolean,
observer: '_loadingChanged',
},
- _sortedRevisions: Array,
},
behaviors: [
