[Fix] version detection: Add tests that verify versioning works for s…

…ibling and child projects

Fixes #2218

lib/util/version.js

@@ -6,6 +6,7 @@
 'use strict';
 
 const resolve = require('resolve');
+const path = require('path');
 const error = require('./error');
 
 let warnedForMissingVersion = false;
@@ -20,13 +21,14 @@ function resetDetectedVersion() {
   cachedDetectedReactVersion = undefined;
 }
 
-function detectReactVersion() {
+// TODO, semver-major: remove context fallback
+function detectReactVersion(context) {
   if (cachedDetectedReactVersion) {
     return cachedDetectedReactVersion;
   }
 
   try {
-    const reactPath = resolve.sync('react', {basedir: process.cwd()});
+    const reactPath = resolve.sync('react', {basedir: context ? path.dirname(context.getFilename()) : process.cwd()});
     const react = require(reactPath); // eslint-disable-line global-require, import/no-dynamic-require
     cachedDetectedReactVersion = react.version;
     return cachedDetectedReactVersion;
@@ -50,7 +52,7 @@ function getReactVersionFromContext(context) {
   if (context.settings && context.settings.react && context.settings.react.version) {
     let settingsVersion = context.settings.react.version;
     if (settingsVersion === 'detect') {
-      settingsVersion = detectReactVersion();
+      settingsVersion = detectReactVersion(context);
     }
     if (typeof settingsVersion !== 'string') {
       error('Warning: React version specified in eslint-plugin-react-settings must be a string; '
@@ -66,9 +68,10 @@ function getReactVersionFromContext(context) {
   return confVer.split('.').map((part) => Number(part));
 }
 
-function detectFlowVersion() {
+// TODO, semver-major: remove context fallback
+function detectFlowVersion(context) {
   try {
-    const flowPackageJsonPath = resolve.sync('flow-bin/package.json', {basedir: process.cwd()});
+    const flowPackageJsonPath = resolve.sync('flow-bin/package.json', {basedir: context ? path.dirname(context.getFilename()) : process.cwd()});
     const flowPackageJson = require(flowPackageJsonPath); // eslint-disable-line global-require, import/no-dynamic-require
     return flowPackageJson.version;
   } catch (e) {
@@ -87,7 +90,7 @@ function getFlowVersionFromContext(context) {
   if (context.settings.react && context.settings.react.flowVersion) {
     let flowVersion = context.settings.react.flowVersion;
     if (flowVersion === 'detect') {
-      flowVersion = detectFlowVersion();
+      flowVersion = detectFlowVersion(context);
     }
     if (typeof flowVersion !== 'string') {
       error('Warning: Flow version specified in eslint-plugin-react-settings must be a string; '

tests/util/version.js

@@ -7,36 +7,54 @@ const versionUtil = require('../../lib/util/version');
 
 describe('Version', () => {
   const base = path.resolve(__dirname, '..', 'fixtures', 'version');
-  let cwd;
   let expectedErrorArgs = [];
 
   beforeEach(() => {
-    cwd = process.cwd();
-    process.chdir(base);
     sinon.stub(console, 'error');
     expectedErrorArgs = [];
     versionUtil.resetWarningFlag();
     versionUtil.resetDetectedVersion();
   });
 
   afterEach(() => {
-    process.chdir(cwd);
-
     const actualArgs = console.error.args; // eslint-disable-line no-console
     console.error.restore(); // eslint-disable-line no-console
     assert.deepEqual(actualArgs, expectedErrorArgs);
   });
 
   describe('Detect version', () => {
-    const context = {settings: {react: {version: 'detect', flowVersion: 'detect'}}};
+    const context = {settings: {react: {version: 'detect', flowVersion: 'detect'}}, getFilename: () => path.resolve(base, 'test.js')};
+
+    afterEach(() => {
+      if (context.getFilename.restore) {
+        context.getFilename.restore();
+      }
+    });
 
     it('matches detected version', () => {
-      process.chdir('detect-version');
+      sinon.stub(context, 'getFilename').callsFake(() => path.resolve(base, 'detect-version', 'test.js'));
+
       assert.equal(versionUtil.testReactVersion(context, '1.2.3'), true);
       assert.equal(versionUtil.testReactVersion(context, '1.2.4'), false);
       assert.equal(versionUtil.testFlowVersion(context, '0.92.0'), true);
     });
 
+    it('matches detected version in sibling project', () => {
+      sinon.stub(context, 'getFilename').callsFake(() => path.resolve(base, 'detect-version-sibling', 'test.js'));
+
+      assert.equal(versionUtil.testReactVersion(context, '2.3.4'), true);
+      assert.equal(versionUtil.testReactVersion(context, '2.3.5'), false);
+      assert.equal(versionUtil.testFlowVersion(context, '2.92.0'), true);
+    });
+
+    it('matches detected version in child project', () => {
+      sinon.stub(context, 'getFilename').callsFake(() => path.resolve(base, 'detect-version', 'detect-version-child', 'test.js'));
+
+      assert.equal(versionUtil.testReactVersion(context, '3.4.5'), true);
+      assert.equal(versionUtil.testReactVersion(context, '3.4.6'), false);
+      assert.equal(versionUtil.testFlowVersion(context, '3.92.0'), true);
+    });
+
     it('assumes latest version if react is not installed', () => {
       assert.equal(versionUtil.testReactVersion(context, '999.999.999'), true);