Upgrade gr-diff-builder_test.html to use sandbox generally
Some sub-suites of the gr-diff-builder tests already used Sinon
sandboxes, but no sandbox had been setup for the tests overall. With
this change all tests in this file are upgraded to use the sandbox.
Change-Id: I778f5e68ee5fb8e73e9b5245252b18f934ebfee1
diff --git a/polygerrit-ui/app/elements/diff/gr-diff-builder/gr-diff-builder_test.html b/polygerrit-ui/app/elements/diff/gr-diff-builder/gr-diff-builder_test.html
index 72f557e..c29d494 100644
--- a/polygerrit-ui/app/elements/diff/gr-diff-builder/gr-diff-builder_test.html
+++ b/polygerrit-ui/app/elements/diff/gr-diff-builder/gr-diff-builder_test.html
@@ -58,8 +58,10 @@
suite('gr-diff-builder tests', () => {
let element;
let builder;
+ let sandbox;
setup(() => {
+ sandbox = sinon.sandbox.create();
stub('gr-rest-api-interface', {
getLoggedIn() { return Promise.resolve(false); },
getProjectConfig() { return Promise.resolve({}); },
@@ -74,6 +76,8 @@
{content: []}, {left: [], right: []}, prefs, projectName);
});
+ teardown(() => { sandbox.restore(); });
+
test('context control buttons', () => {
const section = {};
const line = {contextGroup: {lines: []}};
@@ -141,11 +145,10 @@
const text = (new Array(52)).join('a');
const line = {text, highlights: []};
- const newLineStub = sinon.stub(builder, '_addNewlines');
+ const newLineStub = sandbox.stub(builder, '_addNewlines');
builder._createTextEl(line);
flush(() => {
assert.isFalse(newLineStub.called);
- newLineStub.restore();
done();
});
});
@@ -156,12 +159,11 @@
const text = (new Array(52)).join('a');
const line = {text, highlights: []};
- const newLineStub = sinon.stub(builder, '_addNewlines');
+ const newLineStub = sandbox.stub(builder, '_addNewlines');
builder._createTextEl(line);
flush(() => {
assert.isTrue(newLineStub.called);
- newLineStub.restore();
done();
});
});
@@ -358,15 +360,11 @@
setup(() => {
el = fixture('div-with-text');
str = el.textContent;
- annotateElementSpy = sinon.spy(GrAnnotation, 'annotateElement');
+ annotateElementSpy = sandbox.spy(GrAnnotation, 'annotateElement');
layer = document.createElement('gr-diff-builder')
._createIntralineLayer();
});
- teardown(() => {
- annotateElementSpy.restore();
- });
-
test('annotate no highlights', () => {
const line = {
text: str,
@@ -513,21 +511,15 @@
});
suite('tab indicators', () => {
- let sandbox;
let element;
let layer;
setup(() => {
- sandbox = sinon.sandbox.create();
element = fixture('basic');
element._showTabs = true;
layer = element._createTabIndicatorLayer();
});
- teardown(() => {
- sandbox.restore();
- });
-
test('does nothing with empty line', () => {
const line = {text: ''};
const el = document.createElement('div');
@@ -630,21 +622,15 @@
});
suite('trailing whitespace', () => {
- let sandbox;
let element;
let layer;
setup(() => {
- sandbox = sinon.sandbox.create();
element = fixture('basic');
element._showTrailingWhitespace = true;
layer = element._createTrailingWhitespaceLayer();
});
- teardown(() => {
- sandbox.restore();
- });
-
test('does nothing with empty line', () => {
const line = {text: ''};
const el = document.createElement('div');
@@ -733,10 +719,8 @@
suite('rendering', () => {
let content;
let outputEl;
- let sandbox;
setup(done => {
- sandbox = sinon.sandbox.create();
const prefs = {
line_length: 10,
show_tabs: true,
@@ -779,10 +763,6 @@
element.render({left: [], right: []}, prefs).then(done);
});
- teardown(() => {
- sandbox.restore();
- });
-
test('reporting', done => {
const timeStub = element.$.reporting.time;
const timeEndStub = element.$.reporting.timeEnd;
@@ -828,7 +808,7 @@
});
test('render-start and render are fired', done => {
- const dispatchEventStub = sinon.stub(element, 'dispatchEvent');
+ const dispatchEventStub = sandbox.stub(element, 'dispatchEvent');
element.render({left: [], right: []}, {}).then(() => {
const firedEventTypes = dispatchEventStub.getCalls()
.map(c => { return c.args[0].type; });
@@ -929,7 +909,7 @@
});
test('_renderContentByRange', () => {
- const spy = sinon.spy(builder, '_createTextEl');
+ const spy = sandbox.spy(builder, '_createTextEl');
const start = 9;
const end = 14;
const count = end - start + 1;
@@ -940,8 +920,6 @@
spy.getCalls().forEach((call, i) => {
assert.equal(call.args[0].beforeNumber, start + i);
});
-
- spy.restore();
});
test('_getNextContentOnSide side-by-side left', () => {
