lzh/noVNC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'upgrade' of https://github.com/CendioOssman/noVNC

Browse Source
This commit is contained in:
Pierre Ossman
2019-08-23 15:08:56 +02:00
parent e5255fc246 4222d72bfe
commit 30ff15a35a
12 changed files with 4059 additions and 3324 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/test.keyboard.js
+4 -4
View File
@@ -437,7 +437,7 @@ describe('Key Event Handling', function () {
expect(kbd.onkeyevent.secondCall).to.have.been.calledWith(0x61, "KeyA", true);
// Check that the timer is properly dead
kbd.onkeyevent.reset();
kbd.onkeyevent.resetHistory();
this.clock.tick(100);
expect(kbd.onkeyevent).to.not.have.been.called;
});
@@ -455,7 +455,7 @@ describe('Key Event Handling', function () {
expect(kbd.onkeyevent.thirdCall).to.have.been.calledWith(0x61, "KeyA", false);
// Check that the timer is properly dead
kbd.onkeyevent.reset();
kbd.onkeyevent.resetHistory();
this.clock.tick(100);
expect(kbd.onkeyevent).to.not.have.been.called;
});
@@ -470,7 +470,7 @@ describe('Key Event Handling', function () {
expect(kbd.onkeyevent).to.have.been.calledWith(0xfe03, 'AltRight', true);
// Check that the timer is properly dead
kbd.onkeyevent.reset();
kbd.onkeyevent.resetHistory();
this.clock.tick(100);
expect(kbd.onkeyevent).to.not.have.been.called;
});
@@ -486,7 +486,7 @@ describe('Key Event Handling', function () {
expect(kbd.onkeyevent.secondCall).to.have.been.calledWith(0xffea, "AltRight", true);
// Check that the timer is properly dead
kbd.onkeyevent.reset();
kbd.onkeyevent.resetHistory();
this.clock.tick(100);
expect(kbd.onkeyevent).to.not.have.been.called;
});
tests/test.rfb.js
+8 -8
View File
@@ -271,7 +271,7 @@ describe('Remote Frame Buffer Protocol Client', function () {
it('should move focus to canvas object', function () {
client._canvas.focus = sinon.spy();
client.focus();
expect(client._canvas.focus).to.have.been.called.once;
expect(client._canvas.focus).to.have.been.calledOnce;
});
});
@@ -279,7 +279,7 @@ describe('Remote Frame Buffer Protocol Client', function () {
it('should remove focus from canvas object', function () {
client._canvas.blur = sinon.spy();
client.blur();
expect(client._canvas.blur).to.have.been.called.once;
expect(client._canvas.blur).to.have.been.calledOnce;
});
});
@@ -353,7 +353,7 @@ describe('Remote Frame Buffer Protocol Client', function () {
client.clipViewport = false;
expect(spy.set).to.have.been.calledOnce;
expect(spy.set).to.have.been.calledWith(false);
spy.set.reset();
spy.set.resetHistory();
client.clipViewport = true;
expect(spy.set).to.have.been.calledOnce;
@@ -438,7 +438,7 @@ describe('Remote Frame Buffer Protocol Client', function () {
client._handleMouseButton(13, 9, 0x000);
expect(RFB.messages.pointerEvent).to.have.been.calledTwice;
RFB.messages.pointerEvent.reset();
RFB.messages.pointerEvent.resetHistory();
// Small movement
client._handleMouseButton(13, 9, 0x001);
@@ -472,7 +472,7 @@ describe('Remote Frame Buffer Protocol Client', function () {
expect(client._display.viewportChangePos).to.have.been.calledOnce;
expect(client._display.viewportChangePos).to.have.been.calledWith(-30, 0);
client._display.viewportChangePos.reset();
client._display.viewportChangePos.resetHistory();
// Now a small movement should move right away
@@ -543,7 +543,7 @@ describe('Remote Frame Buffer Protocol Client', function () {
expect(spy.set).to.have.been.calledOnce;
expect(spy.set).to.have.been.calledWith(true);
spy.set.reset();
spy.set.resetHistory();
client.scaleViewport = true;
expect(spy.set).to.have.been.calledOnce;
@@ -633,7 +633,7 @@ describe('Remote Frame Buffer Protocol Client', function () {
expect(RFB.messages.setDesktopSize).to.have.been.calledOnce;
expect(RFB.messages.setDesktopSize).to.have.been.calledWith(sinon.match.object, 70, 80, 0, 0);
RFB.messages.setDesktopSize.reset();
RFB.messages.setDesktopSize.resetHistory();
// Second message should not trigger a resize
@@ -2056,7 +2056,7 @@ describe('Remote Frame Buffer Protocol Client', function () {
beforeEach(function () {
client.showDotCursor = true;
// Was called when we enabled dot cursor
client._cursor.change.reset();
client._cursor.change.resetHistory();
});
it('should show a standard cursor', function () {