github/cordova-android
github/cordova-android
4
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2025-03-16 00:11:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: unit-test failure (#1184)

Browse Source
This commit is contained in:
エリス 2021-03-30 18:46:43 +09:00 committed by GitHub
parent cb1cf4dc8e
commit 6dcd67a902
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
spec/unit/check_reqs.spec.js
View File

@ -255,20 +255,20 @@ describe('check_reqs', function () {
}); });
}); });
it('with ANDROID_SDK_ROOT / without ANDROID_HOME', () => { it('with ANDROID_SDK_ROOT / without ANDROID_HOME', async () => {
process.env.ANDROID_SDK_ROOT = '/android/sdk/root'; process.env.ANDROID_SDK_ROOT = '/android/sdk/root';
expectAsync(check_reqs.check_gradle()).toBeResolvedTo('/android/sdk/root/bin/gradle'); await expectAsync(check_reqs.check_gradle()).toBeResolvedTo('/android/sdk/root/bin/gradle');
}); });
it('with ANDROID_SDK_ROOT / with ANDROID_HOME', () => { it('with ANDROID_SDK_ROOT / with ANDROID_HOME', async () => {
process.env.ANDROID_SDK_ROOT = '/android/sdk/root'; process.env.ANDROID_SDK_ROOT = '/android/sdk/root';
process.env.ANDROID_HOME = '/android/sdk/home'; process.env.ANDROID_HOME = '/android/sdk/home';
expectAsync(check_reqs.check_gradle()).toBeResolvedTo('/android/sdk/root/bin/gradle'); await expectAsync(check_reqs.check_gradle()).toBeResolvedTo('/android/sdk/root/bin/gradle');
}); });
it('without ANDROID_SDK_ROOT / with ANDROID_HOME', () => { it('without ANDROID_SDK_ROOT / with ANDROID_HOME', async () => {
process.env.ANDROID_HOME = '/android/sdk/home'; process.env.ANDROID_HOME = '/android/sdk/home';
expectAsync(check_reqs.check_gradle()).toBeResolvedTo('/android/sdk/home/bin/gradle'); await expectAsync(check_reqs.check_gradle()).toBeResolvedTo('/android/sdk/home/bin/gradle');
}); });
it('without ANDROID_SDK_ROOT / without ANDROID_HOME', () => { it('without ANDROID_SDK_ROOT / without ANDROID_HOME', () => {

8
spec/unit/prepare.spec.js
View File

@ -826,17 +826,17 @@ describe('prepare', () => {
api = new Api(); api = new Api();
}); });
it('runs without arguments', () => { it('runs without arguments', async () => {
expectAsync( await expectAsync(
api.prepare(cordovaProject, options).then(() => { api.prepare(cordovaProject, options).then(() => {
expect(gradlePropertiesParserSpy).toHaveBeenCalledWith({}); expect(gradlePropertiesParserSpy).toHaveBeenCalledWith({});
}) })
).toBeResolved(); ).toBeResolved();
}); });
it('runs with jvmargs', () => { it('runs with jvmargs', async () => {
options.options.argv = ['--jvmargs=-Xmx=4096m']; options.options.argv = ['--jvmargs=-Xmx=4096m'];
expectAsync( await expectAsync(
api.prepare(cordovaProject, options).then(() => { api.prepare(cordovaProject, options).then(() => {
expect(gradlePropertiesParserSpy).toHaveBeenCalledWith({ expect(gradlePropertiesParserSpy).toHaveBeenCalledWith({
'org.gradle.jvmargs': '-Xmx=4096m' 'org.gradle.jvmargs': '-Xmx=4096m'