From 5118552088bc5b2ac277793cf6339a4b4b5624f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Andr=C3=A9?= <martin.andre@kvhasia.com>
Date: Thu, 18 Sep 2014 13:47:49 +0900
Subject: [PATCH] Fixed `displayed` chai assertion in test.rfb.js

The implementation of the `displayed` chai assertion from test.rfb.js
was overriding the one from test.display.js, which was the correct one
that took viewport location into consideration.

chai assertions should probably be extracted in order to reduce code
duplication and prevent similar errors in the future.

Call resize() on client._display instead of setting _fb_width and
_fb_height properties directly otherwise _viewportLoc width and height
are not properly set, causing tests to fail with "Disconnected (1
times), because no message in 10000 ms" error.
---
 tests/test.rfb.js | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/tests/test.rfb.js b/tests/test.rfb.js
index 595548e1..d23e7265 100644
--- a/tests/test.rfb.js
+++ b/tests/test.rfb.js
@@ -17,7 +17,7 @@ function make_rfb (extra_opts) {
 chai.use(function (_chai, utils) {
     _chai.Assertion.addMethod('displayed', function (target_data) {
         var obj = this._obj;
-        var data_cl = obj._drawCtx.getImageData(0, 0, obj._fb_width, obj._fb_height).data;
+        var data_cl = obj._drawCtx.getImageData(0, 0, obj._viewportLoc.w, obj._viewportLoc.h).data;
         // NB(directxman12): PhantomJS 1.x doesn't implement Uint8ClampedArray, so work around that
         var data = new Uint8Array(data_cl);
         this.assert(utils.eql(data, target_data),
@@ -1209,8 +1209,7 @@ describe('Remote Frame Buffer Protocol Client', function() {
                     // a really small frame
                     client._fb_width = 4;
                     client._fb_height = 4;
-                    client._display._fb_width = 4;
-                    client._display._fb_height = 4;
+                    client._display.resize(4, 4);
                     client._fb_Bpp = 4;
                 });
 
@@ -1284,8 +1283,7 @@ describe('Remote Frame Buffer Protocol Client', function() {
                         // a really small frame
                         client._fb_width = 4;
                         client._fb_height = 4;
-                        client._display._fb_width = 4;
-                        client._display._fb_height = 4;
+                        client._display.resize(4, 4);
                         client._fb_Bpp = 4;
                     });