feat: handle edge cases

Author: dominykas

lib/index.js

@@ -23,15 +23,20 @@ internals.detectFromTravisYaml = (travisYaml) => {
 
             const matches = env.match(/(?:NODEJS_VER|TRAVIS_NODE_VERSION|NODE_VER)="?(node\/)?(?<version>[\w./*]+)"?/); /* hack syntax highlighter 🤦‍♂️ */
 
-            raw.add(matches.groups.version);
+            if (matches) {
+                raw.add(matches.groups.version);
+            }
         }
     }
 
     if (travisYaml.matrix && travisYaml.matrix.include) {
 
-        for (const include of travisYaml.matrix.include) {
+        const includes = Array.isArray(travisYaml.matrix.include) ? travisYaml.matrix.include : [travisYaml.matrix.include];
+        for (const include of includes) {
 
-            raw.add(include.node_js);
+            if (include.node_js) {
+                raw.add(include.node_js);
+            }
         }
     }
 

test/fixtures/caolan-async.yml

@@ -0,0 +1,37 @@
+# Source: https://github.com/caolan/async/blob/f9ad468f7b464f5ef88116def2399a5c6e59e21d/.travis.yml
+
+sudo: false
+dist: xenial
+language: node_js
+node_js:
+  - "8"
+  - "10"
+  - "12"
+
+services:
+  - xvfb
+
+matrix:
+  include:
+    - node_js: "10"
+      addons:
+        firefox: "60.0"
+      env: BROWSER=true MAKE_TEST=true
+env:
+  matrix: BROWSER=false MAKE_TEST=false
+
+after_success: npm run coveralls
+
+
+# Needed to run Karma with Firefox on Travis
+# http://karma-runner.github.io/0.13/plus/travis.html
+before_script:
+  - sudo apt-get install -y make
+  - make --version
+
+script:
+  - "[ $BROWSER == true ] || npm test"
+  # ensure buildable
+  - "[ $MAKE_TEST == false ] || make -j 4"
+  # test in firefox
+  - "[ $BROWSER == false ] || npm run mocha-browser-test"

test/fixtures/nodejs-nan.yml

@@ -1,3 +1,5 @@
+# Source: https://github.com/nodejs/nan/blob/60e86a9d4c4536fbbd2a76814470edd66b23114e/.travis.yml
+
 os:
   - linux
   - osx

test/fixtures/nodejs-readable-stream.yml

@@ -1,3 +1,5 @@
+# Source: https://github.com/nodejs/readable-stream/blob/ed213f0dfdc0da6ed94f1aefc54808cc1f74da7c/.travis.yml
+
 language: node_js
 notifications:
   email: false

test/fixtures/postcss-autoprefixer.yml

@@ -0,0 +1,15 @@
+# Source: https://github.com/postcss/autoprefixer/blob/0ee84d70f3f474e6f408c3078fe61db65a26ee0a/.travis.yml
+
+language: node_js
+cache: yarn
+node_js:
+  - node
+  - "10"
+  - "12"
+  - "8"
+install:
+  - yarn install --ignore-engines
+matrix:
+  include:
+    node_js: "6"
+    script: yarn run jest

test/fixtures/shinn-is-resolvable.yml

@@ -0,0 +1,10 @@
+# Source: https://github.com/shinnn/is-resolvable/blob/ad414e366d58ab47ae44099415fffac5d14b627a/.travis.yml#L1
+
+if: branch !~ ^v\d
+language: node_js
+node_js: node
+matrix:
+  include:
+  - after_script: node_modules/.bin/nyc report | npx coveralls
+  - os: windows
+    script: node test.js

test/index.js

@@ -152,6 +152,21 @@ describe('node-support', () => {
                 });
             });
 
+            it('handles non-matching matrix env vars', async () => {
+
+                const path = internals.prepareFixture('caolan-async.yml');
+
+                const result = await NodeSupport.detect({ path });
+
+                expect(result).to.equal({
+                    name: 'test-module',
+                    version: '0.0.0-development',
+                    travis: {
+                        raw: ['8', '10', '12']
+                    }
+                });
+            });
+
             it('returns node versions from matrix include', async () => {
 
                 const path = internals.prepareFixture('nodejs-readable-stream.yml');
@@ -167,6 +182,36 @@ describe('node-support', () => {
                 });
             });
 
+            it('handles single matrix include', async () => {
+
+                const path = internals.prepareFixture('postcss-autoprefixer.yml');
+
+                const result = await NodeSupport.detect({ path });
+
+                expect(result).to.equal({
+                    name: 'test-module',
+                    version: '0.0.0-development',
+                    travis: {
+                        raw: ['node', '10', '12', '8', '6']
+                    }
+                });
+            });
+
+            it('handles matrix includes without node versions', async () => {
+
+                const path = internals.prepareFixture('shinn-is-resolvable.yml');
+
+                const result = await NodeSupport.detect({ path });
+
+                expect(result).to.equal({
+                    name: 'test-module',
+                    version: '0.0.0-development',
+                    travis: {
+                        raw: ['node']
+                    }
+                });
+            });
+
             it('handles missing env.matrix', async () => {
 
                 const path = internals.prepareFixture('_no-env-matrix.yml');