Merge pull request #57 from lgeiger/electron-tests

Add Electron tests

Author: rgbkrk

.gitattributes

@@ -1,2 +1 @@
-*.dll filter=lfs diff=lfs merge=lfs -text
 *.lib filter=lfs diff=lfs merge=lfs -text

.travis.yml

@@ -6,6 +6,7 @@ addons:
     sources:
     - ubuntu-toolchain-r-test
     packages:
+    - xvfb
     - gcc-4.9
     - g++-4.9
     - uuid-dev
@@ -17,29 +18,35 @@ os:
 
 env:
   matrix:
-    - NODE_VERSION="6"
+    - NODE_VERSION="6" DEPLOY="true"
+    - NODE_VERSION="5" ELECTRON="0.37.8"
+    - NODE_VERSION="6" ELECTRON="1.1.3"
+    - NODE_VERSION="6" ELECTRON="1.4.3" REBUILD="true"
   global:
     secure: AMY9chDNyNawxPhxAksCREhbQoOmphQKo2hDuYIPXBCUNF6Zik969QlB07TVjo+Bo0KVEbG4ANTdI0FkFIhg4MuJIWUkW30ZDyCSovUx8zyWB/7IN23A4Cx4p4ZnKjezTHUQpZ9InRIZzy9kOR+215IIBP6GfxbUY89eDA6ARElcv1rwDjZqSnLAxfie6v80vIbhWxNK4kQjiEyIez5eWBjRg4//dmb63TvJjc78GFTaqmh6lRIApAyA0uKka14XR/PJw5IpDR+0Q2omHl4t4zbu9MdVNYMSD+c6iNxOq3fqZJwnyJ1ELErbtR8oeKgZX1SOew5QTCUZWQsa+ySYTCzUnhWjhCgN6W0ciVtT2PslS/ZcvnrGGIxJAOmTZwINw8sAp8yYdY9QCJOGdB5ah2oUBLGKElcFGqSblohXUEM1tXeRchmpXiiAxnPNtxc6lkZzz6NxDl2OFXSmjMS4Cr8cA//Bn6gM04xRJyETy86/8KDoL+ENc7gkeiuYUOFqkAn5X8PrqPdsPmF7yA61IF1ru/OgtiuCh+eqnzZKBPImJo2KfUIqVuRi/6eUaDfWLT7d/J84Vbe3p2nPxoFd2pSw60f/lIkzFSRZx3vBjQiW2MVUN7ZTdawMOzE4TpIV7rDOkKe7qJJobquJEjd2X9Z+8JiTYXK2pPN2GceiqAM=
 
 before_install:
- - curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.30.2/install.sh | bash
- - source ~/.nvm/nvm.sh
- - nvm install $NODE_VERSION
- - nvm use $NODE_VERSION
- - node --version
- - npm --version
- - test "$(uname)" = "Darwin"  || export CXX=g++-4.9 CC=gcc-4.9
- - gcc --version
+  - export DISPLAY=':99.0'
+  - Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
+  - curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.30.2/install.sh | bash
+  - source ~/.nvm/nvm.sh
+  - nvm install $NODE_VERSION
+  - nvm use $NODE_VERSION
+  - test "$(uname)" = "Darwin"  || export CXX=g++-4.9 CC=gcc-4.9
 
-install: npm install
+install:
+  - npm install
+  - '[ -z "$ELECTRON" ] || npm install electron-prebuilt@${ELECTRON}'
+  - '[ -z "$REBUILD" ] || npm install -g node-gyp'
+  - '[ -z "$REBUILD" ] || node-gyp rebuild --runtime=electron --target=${ELECTRON} --disturl=https://atom.io/download/atom-shell --build-from-source'
 
-script: travis_retry npm test
+script: if [[ -z "$ELECTRON" ]]; then travis_retry npm test; else travis_retry npm run test:electron; fi
 
 deploy:
   provider: script
   skip_cleanup: true
   # Linking to prebuild directly since it doesn't work inside a npm script.
   script: node_modules/prebuild/bin.js --all -u $GH_TOKEN
   on:
-    condition: "$NODE_VERSION = 6"
+    condition: "$DEPLOY = true"
     tags: true

appveyor.yml

@@ -3,6 +3,13 @@ environment:
     secure: 8CQgwBRBHNwfTcYdno2yTyyHOhRoSyElm2TzWOCpVh4jPA71l8bXQTxjyoSTJQaf
   matrix:
     - nodejs_version: "4"
+      deploy: "true"
+    - nodejs_version: "5"
+      electron: "0.37.8"
+    - nodejs_version: "6"
+      electron: "1.1.3"
+    - nodejs_version: "6"
+      electron: "1.4.3"
 
 platform:
   - x64
@@ -13,11 +20,14 @@ build: off
 install:
   - ps: Install-Product node $env:nodejs_version $env:platform
   - npm install
+  - IF DEFINED ELECTRON (npm install electron-prebuilt@%ELECTRON%)
+  - IF DEFINED ELECTRON (npm install -g node-gyp)
+  # We always need to rebuild for electron even for electron <= 1.1.3
+  - IF DEFINED ELECTRON (node-gyp rebuild --runtime=electron --target=%ELECTRON% --disturl=https://atom.io/download/atom-shell --build-from-source)
+
 
 test_script:
-  - node --version
-  - npm --version
-  - appveyor-retry call npm test
+  - IF DEFINED ELECTRON (appveyor-retry call npm run test:electron) ELSE (appveyor-retry call npm test)
 
 deploy_script:
-  - IF "%nodejs_version%;%appveyor_repo_tag%"=="4;true" (npm install prebuild -g & prebuild --all -u %GITHUB_TOKEN%)
+  - IF "%deploy%;%appveyor_repo_tag%"=="true;true" (npm install prebuild -g & prebuild --all -u %GITHUB_TOKEN%)

package.json

@@ -14,6 +14,7 @@
     "prebuild": "^4.2.2"
   },
   "devDependencies": {
+    "electron-mocha": "^3.1.1",
     "mocha": "^3.1.0",
     "semver": "^5.3.0",
     "should": "^11.1.0"
@@ -23,7 +24,8 @@
   },
   "scripts": {
     "install": "prebuild --install",
-    "test": "mocha --expose-gc --slow 300 --timeout 4000"
+    "test": "mocha --expose-gc --slow 300 --timeout 4000",
+    "test:electron": "electron-mocha --slow 300 --timeout 4000"
   },
   "keywords": [
     "zeromq",

test/gc.js

@@ -1,52 +1,55 @@
+if (process.versions['electron'] === undefined) {
+  var zmq = require('..')
+    , should = require('should');
 
-var zmq = require('..')
-  , should = require('should');
+  it('should cooperate with gc', function(done){
+    var a = zmq.socket('dealer')
+      , b = zmq.socket('dealer');
 
-it('should cooperate with gc', function(done){
-  var a = zmq.socket('dealer')
-    , b = zmq.socket('dealer');
+    /**
+     * We create 2 dealer sockets.
+     * One of them (`a`) is not referenced explicitly after the main loop
+     * finishes so it's a pretender for garbage collection.
+     * This test performs gc() explicitly and then tries to send a message
+     * to a dealer socket that could be destroyed and collected.
+     * If a message is delivered, than everything is ok. Otherwise the guard
+     * timeout will make the test fail.
+     */
+    a.on('message', function(msg){
+      msg.should.be.an.instanceof(Buffer);
+      msg.toString().should.equal('hello');
+      this.close();
+      b.close();
+      clearTimeout(timeout);
+      done();
+    });
 
-  /**
-   * We create 2 dealer sockets.
-   * One of them (`a`) is not referenced explicitly after the main loop
-   * finishes so it's a pretender for garbage collection.
-   * This test performs gc() explicitly and then tries to send a message
-   * to a dealer socket that could be destroyed and collected.
-   * If a message is delivered, than everything is ok. Otherwise the guard
-   * timeout will make the test fail.
-   */
-  a.on('message', function(msg){
-    msg.should.be.an.instanceof(Buffer);
-    msg.toString().should.equal('hello');
-    this.close();
-    b.close();
-    clearTimeout(timeout);
-    done();
-  });
+    var bound = false;
 
-  var bound = false;
+    a.bind('tcp://127.0.0.1:5555', function(e){
+      if (e) {
+        clearInterval(interval);
+        done(e);
+      } else {
+        bound = true;
+      }
+    });
 
-  a.bind('tcp://127.0.0.1:5555', function(e){
-    if (e) {
-      clearInterval(interval);
-      done(e);
-    } else {
-      bound = true;
-    }
-  });
+    var interval = setInterval(function(){
+      gc();
+      if (bound) {
+        clearInterval(interval);
+        b.connect('tcp://127.0.0.1:5555');
+        b.send('hello');
+      }
+    }, 100);
 
-  var interval = setInterval(function(){
-    gc();
-    if (bound) {
+    // guard against hanging
+    var timeout = setTimeout(function(){
       clearInterval(interval);
-      b.connect('tcp://127.0.0.1:5555');
-      b.send('hello');
-    }
-  }, 100);
-
-  // guard against hanging
-  var timeout = setTimeout(function(){
-    clearInterval(interval);
-    done(new Error('timeout of 5000ms exceeded (bound: ' + bound + ')'));
-  }, 15000);
-});
+      done(new Error('timeout of 5000ms exceeded (bound: ' + bound + ')'));
+    }, 15000);
+  });
+} else {
+  console.log('Running in electron: GC test skipped.');
+}