Add gr-diff-host shell delegating to gr-diff In this CL, I am simply forwarding the entire API to gr-diff. In follow-up CLs, I will move the restAPI calls over, but I think it will be easier to understand the changes when all the forwarding is already out of the way. I decided not to touch the styling applied to gr-diff from gr-diff-view and gr-file-list because that currently does not hurt anyone and seems less risky. Bug: Issue 9623 Change-Id: Iacc82198b04b048dd33c380876b1c8b3a80fac95
diff --git a/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view_test.html b/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view_test.html index f947d18..00527e4 100644 --- a/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view_test.html +++ b/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view_test.html
@@ -73,7 +73,7 @@ test('params change triggers diffViewDisplayed()', () => { sandbox.stub(element.$.reporting, 'diffViewDisplayed'); - sandbox.stub(element.$.diff, 'reload').returns(Promise.resolve()); + sandbox.stub(element.$.diffHost, 'reload').returns(Promise.resolve()); sandbox.spy(element, '_paramsChanged'); element.params = { view: Gerrit.Nav.View.DIFF, @@ -89,7 +89,8 @@ }); test('toggle left diff with a hotkey', () => { - const toggleLeftDiffStub = sandbox.stub(element.$.diff, 'toggleLeftDiff'); + const toggleLeftDiffStub = sandbox.stub( + element.$.diffHost, 'toggleLeftDiff'); MockInteractions.pressAndReleaseKeyOn(element, 65, 'shift', 'a'); assert.isTrue(toggleLeftDiffStub.calledOnce); }); @@ -168,7 +169,7 @@ MockInteractions.pressAndReleaseKeyOn(element, 80, 'shift', 'p'); assert(scrollStub.calledOnce); - const computeContainerClassStub = sandbox.stub(element.$.diff, + const computeContainerClassStub = sandbox.stub(element.$.diffHost.$.diff, '_computeContainerClass'); MockInteractions.pressAndReleaseKeyOn(element, 74, null, 'j'); assert(computeContainerClassStub.lastCall.calledWithExactly( @@ -189,7 +190,7 @@ }); test('shift+x shortcut expands all diff context', () => { - const expandStub = sandbox.stub(element.$.diff, 'expandAllContext'); + const expandStub = sandbox.stub(element.$.diffHost, 'expandAllContext'); MockInteractions.pressAndReleaseKeyOn(element, 88, 'shift', 'x'); flushAsynchronousOperations(); assert.isTrue(expandStub.called); @@ -550,7 +551,7 @@ const getReviewedStub = sandbox.stub(element, '_getReviewedStatus', () => Promise.resolve()); - sandbox.stub(element.$.diff, 'reload'); + sandbox.stub(element.$.diffHost, 'reload'); element._loggedIn = true; element.params = { view: Gerrit.Nav.View.DIFF, @@ -575,7 +576,7 @@ test('file review status', () => { const saveReviewedStub = sandbox.stub(element, '_saveReviewedState', () => Promise.resolve()); - sandbox.stub(element.$.diff, 'reload'); + sandbox.stub(element.$.diffHost, 'reload'); element._loggedIn = true; element.params = { @@ -621,7 +622,7 @@ }); test('hash is determined from params', done => { - sandbox.stub(element.$.diff, 'reload'); + sandbox.stub(element.$.diffHost, 'reload'); sandbox.stub(element, '_initCursor'); element._loggedIn = true; @@ -642,7 +643,7 @@ test('diff mode selector correctly toggles the diff', () => { const select = element.$.modeSelect; - const diffDisplay = element.$.diff; + const diffDisplay = element.$.diffHost; element._userPrefs = {default_diff_view: 'SIDE_BY_SIDE'}; // The mode selected in the view state reflects the selected option. @@ -687,7 +688,7 @@ suite('_commitRange', () => { setup(() => { - sandbox.stub(element.$.diff, 'reload'); + sandbox.stub(element.$.diffHost, 'reload'); sandbox.stub(element, '_initCursor'); sandbox.stub(element, '_getChangeDetail').returns(Promise.resolve({ _number: 42,