Merge pull request #94 from nut-tree/feature/13/matrix_builds

Feature/13/matrix builds

Author: s1hofmann

.build/run_linux.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+set -e
+
+echo $PWD
+
+docker exec nut-ci bash -c "bash $PWD/.build/build.sh ${PWD} ${NODE_VERSION}"

.build/run_osx.sh

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -e
+
+echo $PWD
+
+npm ci
+npm run compile
+npm test

.build/setup_linux.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+set -e
+
+curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
+sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
+sudo apt-get update
+sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-ce
+docker pull s1hofmann/nut-ci:latest
+docker run -it -d --name nut-ci --user $(id -u):$(id -g) -v ${PWD}:${PWD}:rw s1hofmann/nut-ci:latest bash

.build/setup_osx.sh

@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+set -e

.travis.yml

@@ -1,9 +1,3 @@
-os: linux
-dist: xenial
-
-language: node_js
-node_js:
-  - "lts/dubnium"
 cache: npm
 
 addons:
@@ -17,26 +11,40 @@ services:
 
 matrix:
   include:
-    - name: "Node 10"
+    - name: "Linux Node 10"
+      os: linux
+      dist: xenial
       env: NODE_VERSION=10
-    - name: "Node 11"
+    - name: "Linux Node 11"
+      os: linux
+      dist: xenial
       env: NODE_VERSION=11
-    - name: "Node 12"
+    - name: "Linux Node 12"
+      os: linux
+      dist: xenial
       env: NODE_VERSION=12
+    - name: "macOS Node 10"
+      os: osx
+      osx_image: xcode11
+      language: node_js
+      node_js: "10"
+    - name: "macOS Node 11"
+      os: osx
+      osx_image: xcode11
+      language: node_js
+      node_js: "11"
+    - name: "macOS Node 12"
+      os: osx
+      osx_image: xcode11
+      language: node_js
+      node_js: "12"
 
 before_install:
-  # Update Docker
-  - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
-  - sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
-  - sudo apt-get update
-  - sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-ce
-  - docker pull s1hofmann/nut-ci:latest
-  - docker run -it -d --name nut-ci --user $(id -u):$(id -g) -v ${PWD}:${PWD}:rw s1hofmann/nut-ci:latest bash
-
+  - "bash ./.build/setup_${TRAVIS_OS_NAME}.sh"
 install: true
 
 script:
-  - travis_retry docker exec nut-ci bash -c "bash $PWD/.build/build.sh ${PWD} ${NODE_VERSION}"
+  - "bash ./.build/run_${TRAVIS_OS_NAME}.sh"
 
 after_success:
   - sonar-scanner

appveyor.yml

@@ -0,0 +1,28 @@
+platform:
+  - x64
+
+image:
+  - Visual Studio 2017
+
+init:
+  - git config --global core.autocrlf true
+
+environment:
+  matrix:
+    - nodejs_version: "10"
+    - nodejs_version: "11"
+    - nodejs_version: "12"
+
+clone_folder: c:\projects\nut
+
+install:
+  - ps: Install-Product node $env:nodejs_version x64
+  - node --version
+  - cd c:\projects\nut
+  - npm ci
+  - npm run compile
+
+build: off
+
+test_script:
+  - npm test

lib/expect/matchers/toBeAt.function.spec.ts renamed to lib/expect/matchers/toBeAt.function.e2e.spec.ts

@@ -85,14 +85,14 @@ describe("poll-action", () => {
         // GIVEN
         const updateInterval = 200;
         const maxDuration = 1000;
-        const delay = 2.2 * updateInterval;
+        const delay = 2.5 * updateInterval;
+        const start = Date.now();
         const action = jest.fn(() => {
             const interval = (Date.now() - start);
             return new Promise<boolean>((resolve, reject) => (interval > delay) ? resolve(true) : reject());
         });
 
         // WHEN
-        const start = Date.now();
         await timeout(updateInterval, maxDuration, action);
         const end = Date.now();