Merge pull request #3299 from ethereum/pri/testing-gaps

Add websocket / misc tests (#3190)

packages/web3-providers-ws/src/index.js

@@ -178,7 +178,7 @@ WebsocketProvider.prototype._onClose = function (event) {
 
     if (this.requestQueue.size > 0) {
         this.requestQueue.forEach(function (request, key) {
-            request.callback(errors.ConnectionClosedError(event));
+            request.callback(errors.ConnectionNotOpenError());
             _this.requestQueue.delete(key);
         });
     }
@@ -251,7 +251,6 @@ WebsocketProvider.prototype._parseResponse = function (data) {
 
         try {
             result = JSON.parse(data);
-
         } catch (e) {
 
             _this.lastChunk = data;
@@ -265,6 +264,7 @@ WebsocketProvider.prototype._parseResponse = function (data) {
                     return;
                 }
 
+
                 _this.emit(_this.ERROR, errors.ConnectionTimeout(_this._customTimeout));
 
                 if (_this.requestQueue.size > 0) {
@@ -344,7 +344,7 @@ WebsocketProvider.prototype.send = function (payload, callback) {
 WebsocketProvider.prototype.reset = function () {
     this.responseQueue.clear();
     this.requestQueue.clear();
-    
+
     this.removeAllListeners();
 
     this._removeSocketListeners();

scripts/e2e.npm.publish.sh

@@ -21,7 +21,7 @@ fi
 # To model publication correctly, this script needs to run
 # without web3's dev deps being installed. It installs
 # what it needs here.
-npm install -g verdaccio@4.3.4
+npm install -g verdaccio@4.4.2
 npm install -g npm-auth-to-token@1.0.0
 npm install -g lerna@3.18.3
 

test/contract.js

@@ -3130,6 +3130,31 @@ describe('typical usage', function () {
         assert.deepEqual(eth.currentProvider, provider2);
     });
 
+    it('should update contract instance provider when calling setProvider on itself', function () {
+        var provider1 = new FakeIpcProvider();
+        var provider2 = new FakeHttpProvider();
+
+        var eth = new Eth(provider1);
+        var contract = new eth.Contract(abi, address);
+        assert.deepEqual(contract.currentProvider, provider1);
+
+        contract.setProvider(provider2);
+        assert.deepEqual(contract.currentProvider, provider2);
+    });
+
+    it('errors when invoked without the "new" operator', function () {
+        try {
+            var provider = new FakeHttpProvider();
+            var eth = new Eth(provider);
+
+            eth.Contract(abi, address);
+
+            assert.fail();
+        } catch(err) {
+            assert(err.message.includes('the "new" keyword'));
+        }
+    });
+
     it('should deploy a contract, sign transaction, and return contract instance', function (done) {
         var provider = new FakeIpcProvider();
         var eth = new Eth(provider);