opendev/gerrit
Code Issues Proposed changes

Copy due_to_rebase to subgroups in gr-diff-processor

Browse Source 
We need to preserve the "due_to_rebase" sections to correctly
process the subgroups.

Change-Id: I3d5f8fbd70d50a92e305960cbcecf0d811b4c980
This commit is contained in:
Alice Kober-Sotzek
2017-05-09 13:49:07 +02:00
parent f7ac31baaa
commit 1afa2cb52e
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
polygerrit-ui/app/elements/diff/gr-diff-processor/gr-diff-processor.js
View File

@@ -510,6 +510,9 @@
.map(subgroupLines => { .map(subgroupLines => {
const subGroup = {}; const subGroup = {};
subGroup[key] = subgroupLines; subGroup[key] = subgroupLines;
if (group.due_to_rebase) {
subGroup.due_to_rebase = true;
}
return subGroup; return subGroup;
}); });
}, },

10
polygerrit-ui/app/elements/diff/gr-diff-processor/gr-diff-processor_test.html
View File

@@ -601,6 +601,16 @@ limitations under the License.
assert.isTrue(element._breakdown.called); assert.isTrue(element._breakdown.called);
}); });
test('_breakdownGroup keeps due_to_rebase for broken down additions',
() => {
sandbox.spy(element, '_breakdown');
const chunk = {b: ['blah', 'blah', 'blah'], due_to_rebase: true};
const result = element._breakdownGroup(chunk);
for (const subResult of result) {
assert.isTrue(subResult.due_to_rebase);
}
});
test('_breakdown common case', () => { test('_breakdown common case', () => {
const array = 'Lorem ipsum dolor sit amet, suspendisse inceptos' const array = 'Lorem ipsum dolor sit amet, suspendisse inceptos'
.split(' '); .split(' ');