Merge branch 'master' into fix/root-ref

Author: eps1lon

.travis.yml

@@ -28,6 +28,8 @@ matrix:
       env: REACT=16
     - node_js: "lts/*"
       env: REACT=16.8.5 RENDERER=16.8.5
+    - node_js: "lts/*"
+      env: REACT=16.8.5 RENDERER=16.8.3
     - node_js: "lts/*"
       env: REACT=16.8.3
     - node_js: "lts/*"
@@ -65,6 +67,10 @@ matrix:
       env: KARMA=true REACT=15
     - node_js: "6"
       env: KARMA=true REACT=16
+    - node_js: "lts/*"
+      env: REACT=16.8.5 RENDERER=16.8.3
+    - node_js: "lts/*"
+      env: REACT=16.8 RENDERER=16.7
   exclude:
     - node_js: "6"
       env: REACT=0.13

env.js

@@ -129,19 +129,20 @@ Promise.resolve()
       .map(key => `${key}@${key.startsWith('react') ? reactVersion : peerDeps[key]}`);
 
     if (process.env.RENDERER) {
-      installs.push(`react-test-renderer@${process.env.RENDERER}`);
+      // eslint-disable-next-line no-param-reassign
+      adapterJson.dependencies['react-test-renderer'] = process.env.RENDERER;
     }
 
     // eslint-disable-next-line no-param-reassign
     testJson.dependencies[adapterName] = adapterJson.version;
 
-    return Promise.all([
+    return writeJSON(adapterPackageJsonPath, adapterJson, true).then(() => Promise.all([
       // npm install the peer deps at the root
       run('npm', 'i', '--no-save', ...installs),
 
       // add the adapter to the dependencies of the test suite
       writeJSON(testPackageJsonPath, testJson, true),
-    ]);
+    ]));
   })
   .then(() => run('lerna', 'bootstrap', '--hoist=\'react*\''))
   .then(() => getJSON(testPackageJsonPath))