Merge "Revert "Do not bold changes with an undefined change.review value""

This commit is contained in:
Ben Rohlfs
2019-07-05 10:03:43 +00:00
committed by Gerrit Code Review
4 changed files with 5 additions and 22 deletions

View File

@@ -79,7 +79,7 @@
}, },
_computeItemNeedsReview(reviewed) { _computeItemNeedsReview(reviewed) {
return reviewed === false; return !reviewed;
}, },
_computeChangeURL(change) { _computeChangeURL(change) {

View File

@@ -274,11 +274,5 @@ limitations under the License.
assert.equal(element._computeRepoDisplay(change, true), assert.equal(element._computeRepoDisplay(change, true),
'…/test/repo'); '…/test/repo');
}); });
test('_computeItemNeedsReview', () => {
assert.isFalse(element._computeItemNeedsReview(undefined));
assert.isFalse(element._computeItemNeedsReview(true));
assert.isTrue(element._computeItemNeedsReview(false));
});
}); });
</script> </script>

View File

@@ -236,7 +236,7 @@
}, },
_computeItemNeedsReview(account, change, showReviewedState) { _computeItemNeedsReview(account, change, showReviewedState) {
return showReviewedState && change.reviewed === false && return showReviewedState && !change.reviewed &&
!change.work_in_progress && !change.work_in_progress &&
this.changeIsOpen(change.status) && this.changeIsOpen(change.status) &&
(!account || account._account_id != change.owner._account_id); (!account || account._account_id != change.owner._account_id);

View File

@@ -221,38 +221,29 @@ limitations under the License.
{ {
_number: 1, _number: 1,
status: 'NEW', status: 'NEW',
reviewed: false,
owner: {_account_id: 0}, owner: {_account_id: 0},
}, },
{ {
_number: 2, _number: 2,
status: 'MERGED', status: 'MERGED',
reviewed: false,
owner: {_account_id: 0}, owner: {_account_id: 0},
}, },
{ {
_number: 3, _number: 3,
status: 'ABANDONED', status: 'ABANDONED',
reviewed: false,
owner: {_account_id: 0}, owner: {_account_id: 0},
}, },
{ {
_number: 4, _number: 4,
status: 'NEW', status: 'NEW',
reviewed: false,
work_in_progress: true, work_in_progress: true,
owner: {_account_id: 0}, owner: {_account_id: 0},
}, },
{
_number: 5,
status: 'NEW',
owner: {_account_id: 0},
},
]; ];
flushAsynchronousOperations(); flushAsynchronousOperations();
let elementItems = Polymer.dom(element.root).querySelectorAll( let elementItems = Polymer.dom(element.root).querySelectorAll(
'gr-change-list-item'); 'gr-change-list-item');
assert.equal(elementItems.length, 6); assert.equal(elementItems.length, 5);
for (let i = 0; i < elementItems.length; i++) { for (let i = 0; i < elementItems.length; i++) {
assert.isFalse(elementItems[i].hasAttribute('needs-review')); assert.isFalse(elementItems[i].hasAttribute('needs-review'));
} }
@@ -260,24 +251,22 @@ limitations under the License.
element.showReviewedState = true; element.showReviewedState = true;
elementItems = Polymer.dom(element.root).querySelectorAll( elementItems = Polymer.dom(element.root).querySelectorAll(
'gr-change-list-item'); 'gr-change-list-item');
assert.equal(elementItems.length, 6); assert.equal(elementItems.length, 5);
assert.isFalse(elementItems[0].hasAttribute('needs-review')); assert.isFalse(elementItems[0].hasAttribute('needs-review'));
assert.isTrue(elementItems[1].hasAttribute('needs-review')); assert.isTrue(elementItems[1].hasAttribute('needs-review'));
assert.isFalse(elementItems[2].hasAttribute('needs-review')); assert.isFalse(elementItems[2].hasAttribute('needs-review'));
assert.isFalse(elementItems[3].hasAttribute('needs-review')); assert.isFalse(elementItems[3].hasAttribute('needs-review'));
assert.isFalse(elementItems[4].hasAttribute('needs-review')); assert.isFalse(elementItems[4].hasAttribute('needs-review'));
assert.isFalse(elementItems[5].hasAttribute('needs-review'));
element.account = {_account_id: 42}; element.account = {_account_id: 42};
elementItems = Polymer.dom(element.root).querySelectorAll( elementItems = Polymer.dom(element.root).querySelectorAll(
'gr-change-list-item'); 'gr-change-list-item');
assert.equal(elementItems.length, 6); assert.equal(elementItems.length, 5);
assert.isFalse(elementItems[0].hasAttribute('needs-review')); assert.isFalse(elementItems[0].hasAttribute('needs-review'));
assert.isTrue(elementItems[1].hasAttribute('needs-review')); assert.isTrue(elementItems[1].hasAttribute('needs-review'));
assert.isFalse(elementItems[2].hasAttribute('needs-review')); assert.isFalse(elementItems[2].hasAttribute('needs-review'));
assert.isFalse(elementItems[3].hasAttribute('needs-review')); assert.isFalse(elementItems[3].hasAttribute('needs-review'));
assert.isFalse(elementItems[4].hasAttribute('needs-review')); assert.isFalse(elementItems[4].hasAttribute('needs-review'));
assert.isFalse(elementItems[5].hasAttribute('needs-review'));
}); });
test('no changes', () => { test('no changes', () => {