From a38a14fede9c96f992b8e8c927c73a734585418d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Pierzcha=C5=82a?= Date: Thu, 20 Feb 2020 08:50:19 +0100 Subject: [PATCH] chore: fix windows sdk test --- .../doctor/healthchecks/__tests__/androidSDK.test.ts | 11 +++++++---- .../src/commands/doctor/healthchecks/androidSDK.ts | 1 + packages/cli/src/tools/config/findProjectRoot.ts | 1 - 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/packages/cli/src/commands/doctor/healthchecks/__tests__/androidSDK.test.ts b/packages/cli/src/commands/doctor/healthchecks/__tests__/androidSDK.test.ts index d75f40cc1..380802dc8 100644 --- a/packages/cli/src/commands/doctor/healthchecks/__tests__/androidSDK.test.ts +++ b/packages/cli/src/commands/doctor/healthchecks/__tests__/androidSDK.test.ts @@ -10,16 +10,19 @@ const logSpy = jest.spyOn(common, 'logManualInstallation'); jest.mock('execa', () => jest.fn()); +// TODO remove when androidSDK starts getting gradle.build path from config +jest.mock('../../../../tools/config/findProjectRoot', () => () => '.'); + describe('androidSDK', () => { beforeEach(() => { writeFiles('', { 'android/build.gradle': ` buildscript { ext { - buildToolsVersion = "28.0.3" - minSdkVersion = 16 - compileSdkVersion = 28 - targetSdkVersion = 28 + buildToolsVersion = "28.0.3" + minSdkVersion = 16 + compileSdkVersion = 28 + targetSdkVersion = 28 } } `, diff --git a/packages/cli/src/commands/doctor/healthchecks/androidSDK.ts b/packages/cli/src/commands/doctor/healthchecks/androidSDK.ts index f63105e6a..4d7421e84 100644 --- a/packages/cli/src/commands/doctor/healthchecks/androidSDK.ts +++ b/packages/cli/src/commands/doctor/healthchecks/androidSDK.ts @@ -6,6 +6,7 @@ import {HealthCheckInterface} from '../types'; import findProjectRoot from '../../../tools/config/findProjectRoot'; const getBuildToolsVersion = (): string => { + // TODO use config const projectRoot = findProjectRoot(); const gradleBuildFilePath = path.join(projectRoot, 'android/build.gradle'); diff --git a/packages/cli/src/tools/config/findProjectRoot.ts b/packages/cli/src/tools/config/findProjectRoot.ts index 32b3c2e28..419bebca9 100644 --- a/packages/cli/src/tools/config/findProjectRoot.ts +++ b/packages/cli/src/tools/config/findProjectRoot.ts @@ -7,7 +7,6 @@ import {CLIError} from '@react-native-community/cli-tools'; */ export default function findProjectRoot(cwd = process.cwd()): string { const packageLocation = findUp.sync('package.json', {cwd}); - /** * It is possible that `package.json` doesn't exist * in the tree. In that case, we want to throw an error.