Skip to content

chore: fix windows sdk test #994

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 20, 2020
Merged

chore: fix windows sdk test #994

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions packages/cli/src/commands/doctor/healthchecks/__tests__/androidSDK.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
`,
Expand Down
1 change: 1 addition & 0 deletions packages/cli/src/commands/doctor/healthchecks/androidSDK.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');

Expand Down
1 change: 0 additions & 1 deletion packages/cli/src/tools/config/findProjectRoot.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down