[Tests] exclude nonboundary nodes with nonboundary reacts

enzymejs · Mar 17, 2019 · 597fb19 · 597fb19
1 parent bd62f3a
commit 597fb19
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 44 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,8 +1,6 @@
 language: node_js
 node_js:
   - "10"
-  - "8"
-  - "6"
   - "4"
 before_install:
   - 'nvm install-latest-npm'
@@ -24,6 +22,10 @@ matrix:
   include:
     - node_js: "lts/*"
       env: LINT=true
+    - node_js: "8"
+      env: REACT=16
+    - node_js: "6"
+      env: REACT=16
     - node_js: "lts/*"
       env: REACT=16.7
     - node_js: "lts/*"
@@ -58,40 +60,6 @@ matrix:
   exclude:
     - node_js: "6"
       env: REACT=0.13
-    - node_js: "8"
-      env: REACT=0.13
-    - node_js: "6"
-      env: REACT=0.14
-    - node_js: "8"
-      env: REACT=0.14
-    - node_js: "6"
-      env: REACT=15.4
-    - node_js: "8"
-      env: REACT=15.4
-    - node_js: "6"
-      env: REACT=15.5
-    - node_js: "8"
-      env: REACT=15.5
-    - node_js: "6"
-      env: REACT=16.0
-    - node_js: "8"
-      env: REACT=16.0
-    - node_js: "6"
-      env: REACT=16.1
-    - node_js: "8"
-      env: REACT=16.1
-    - node_js: "6"
-      env: REACT=16.2
-    - node_js: "8"
-      env: REACT=16.2
-    - node_js: "6"
-      env: REACT=16.3
-    - node_js: "8"
-      env: REACT=16.3
-    - node_js: "6"
-      env: REACT=16.4
-    - node_js: "8"
-      env: REACT=16.4
 env:
   - REACT=16.8
   - REACT=16.7

diff --git a/env.js b/env.js
@@ -67,22 +67,24 @@ function getAdapter(reactVersion) {
     return '14';
   }
   if (semver.intersects(reactVersion, '^15.0.0-0')) {
-    if (semver.intersects(reactVersion, '< 15.5')) {
-      return '15.4';
+    if (semver.intersects(reactVersion, '>= 15.5')) {
+      return '15';
     }
-    return '15';
+    return '15.4';
   }
   if (semver.intersects(reactVersion, '^16.0.0-0')) {
-    if (semver.intersects(reactVersion, '~16.0 || ~16.1')) {
-      return '16.1';
+    if (semver.intersects(reactVersion, '>= 16.4')) {
+      return '16';
+    }
+    if (semver.intersects(reactVersion, '~16.3')) {
+      return '16.3';
     }
     if (semver.intersects(reactVersion, '~16.2')) {
       return '16.2';
     }
-    if (semver.intersects(reactVersion, '~16.3')) {
-      return '16.3';
+    if (semver.intersects(reactVersion, '~16.0 || ~16.1')) {
+      return '16.1';
     }
-    return '16';
   }
   return null;
 }