Skip to content

Commit ef563aa

Browse files
author
Murat
committed
refactor(upgrade): renamed importers names
1 parent d4c4d3e commit ef563aa

29 files changed

+161
-131
lines changed

‎src/__tests__/unit/utils/upgrade/android/importAndroidAppId.spec.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ const mockSearchReplaceAllFiles = jest.spyOn(
66
import path from 'path';
77
import { ImportGetter } from '../../../../../types/upgrade.types';
88
import { getProjectPath } from '../../../../../utils/getProjectPath';
9-
import { getAndroidAppId } from '../../../../../utils/upgrade/android/importAndroidAppId';
9+
import { importAndroidAppId } from '../../../../../utils/upgrade/android/importAndroidAppId';
1010
import { mockFs } from '../../../../mocks/mockFs';
1111

1212
describe('importAndroidAppId', () => {
@@ -37,12 +37,12 @@ describe('importAndroidAppId', () => {
3737
targetSdkVersion rootProject.ext.targetSdkVersion
3838
...`
3939
);
40-
const importGetter = getAndroidAppId('/oldProject') as ImportGetter;
40+
const importGetter = importAndroidAppId('/oldProject') as ImportGetter;
4141
expect(importGetter).toBeTruthy();
4242
expect(importGetter.value).toEqual('com.testapp');
4343

4444
mockSearchReplaceAllFiles.mockImplementationOnce(() => 1);
45-
await importGetter.setter();
45+
await importGetter.apply();
4646

4747
expect(mockSearchReplaceAllFiles).toHaveBeenCalledWith(
4848
path.join(getProjectPath(), 'android'),
@@ -55,7 +55,7 @@ describe('importAndroidAppId', () => {
5555
it('should handle errors', () => {
5656
mockFs.setReadPermission(false);
5757

58-
const importGetter = getAndroidAppId('/oldProject') as ImportGetter;
58+
const importGetter = importAndroidAppId('/oldProject') as ImportGetter;
5959
expect(importGetter).toBeNull();
6060
});
6161
it('should handle not finding app id', () => {
@@ -67,7 +67,7 @@ describe('importAndroidAppId', () => {
6767
path.join(getProjectPath(), 'android/app/build.gradle'),
6868
'random'
6969
);
70-
const importGetter = getAndroidAppId('/oldProject') as ImportGetter;
70+
const importGetter = importAndroidAppId('/oldProject') as ImportGetter;
7171
expect(importGetter).toBeNull();
7272
});
7373
it('should not replace when app ids are same', async () => {
@@ -79,11 +79,11 @@ describe('importAndroidAppId', () => {
7979
path.join(getProjectPath(), 'android/app/build.gradle'),
8080
'applicationId "com.testapp"'
8181
);
82-
const importGetter = getAndroidAppId('/oldProject') as ImportGetter;
82+
const importGetter = importAndroidAppId('/oldProject') as ImportGetter;
8383
expect(importGetter).not.toBeFalsy();
8484
expect(importGetter.value).toEqual('com.testapp');
8585

86-
await importGetter.setter();
86+
await importGetter.apply();
8787

8888
expect(mockSearchReplaceAllFiles).not.toHaveBeenCalled();
8989
});

‎src/__tests__/unit/utils/upgrade/android/importAndroidDisplayName.spec.ts‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ require('../../../../mocks/mockAll');
22
import path from 'path';
33
import { ImportGetter } from '../../../../../types/upgrade.types';
44
import { getProjectPath } from '../../../../../utils/getProjectPath';
5-
import { getAndroidDisplayName } from '../../../../../utils/upgrade/android/importAndroidDisplayName';
5+
import { importAndroidDisplayName } from '../../../../../utils/upgrade/android/importAndroidDisplayName';
66
import { mockFs } from '../../../../mocks/mockFs';
77

88
describe('importAndroidDisplayName', () => {
@@ -26,11 +26,13 @@ describe('importAndroidDisplayName', () => {
2626
</resources>
2727
`
2828
);
29-
const importGetter = getAndroidDisplayName('/oldProject') as ImportGetter;
29+
const importGetter = importAndroidDisplayName(
30+
'/oldProject'
31+
) as ImportGetter;
3032
expect(importGetter).toBeTruthy();
3133
expect(importGetter.value).toEqual('test app');
3234

33-
await importGetter.setter();
35+
await importGetter.apply();
3436

3537
expect(
3638
mockFs.readFileSync(
@@ -44,15 +46,19 @@ describe('importAndroidDisplayName', () => {
4446
it('should handle errors', () => {
4547
mockFs.setReadPermission(false);
4648

47-
const importGetter = getAndroidDisplayName('/oldProject') as ImportGetter;
49+
const importGetter = importAndroidDisplayName(
50+
'/oldProject'
51+
) as ImportGetter;
4852
expect(importGetter).toBeNull();
4953
});
5054
it('should handle not finding display name', () => {
5155
mockFs.writeFileSync(
5256
'/oldProject/android/app/src/main/res/values/strings.xml',
5357
'random'
5458
);
55-
const importGetter = getAndroidDisplayName('/oldProject') as ImportGetter;
59+
const importGetter = importAndroidDisplayName(
60+
'/oldProject'
61+
) as ImportGetter;
5662
expect(importGetter).toBeNull();
5763
});
5864
});

‎src/__tests__/unit/utils/upgrade/android/importAndroidLaunchIcon.spec.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ require('../../../../mocks/mockAll');
22
import path from 'path';
33
import { ImportGetter } from '../../../../../types/upgrade.types';
44
import { getProjectPath } from '../../../../../utils/getProjectPath';
5-
import { getAndroidLaunchIcon } from '../../../../../utils/upgrade/android/importAndroidLaunchIcon';
5+
import { importAndroidLaunchIcon } from '../../../../../utils/upgrade/android/importAndroidLaunchIcon';
66
import { mockFs } from '../../../../mocks/mockFs';
77

88
describe('importAndroidLaunchIcon', () => {
@@ -34,11 +34,11 @@ describe('importAndroidLaunchIcon', () => {
3434
android:allowBackup="false"`
3535
);
3636

37-
const importGetter = getAndroidLaunchIcon('/oldProject') as ImportGetter;
37+
const importGetter = importAndroidLaunchIcon('/oldProject') as ImportGetter;
3838
expect(importGetter).toBeTruthy();
3939
expect(importGetter.value).toEqual('@mipmap/test_ic_launcher');
4040

41-
await importGetter.setter();
41+
await importGetter.apply();
4242

4343
expect(
4444
mockFs.readFileSync(
@@ -57,8 +57,8 @@ describe('importAndroidLaunchIcon', () => {
5757
android:roundIcon="@mipmap/ic_launcher_round"`
5858
);
5959

60-
const importGetter = getAndroidLaunchIcon('/oldProject') as ImportGetter;
61-
await importGetter.setter();
60+
const importGetter = importAndroidLaunchIcon('/oldProject') as ImportGetter;
61+
await importGetter.apply();
6262

6363
expect(
6464
mockFs.readFileSync(
@@ -69,15 +69,15 @@ describe('importAndroidLaunchIcon', () => {
6969
it('should handle errors', () => {
7070
mockFs.setReadPermission(false);
7171

72-
const importGetter = getAndroidLaunchIcon('/oldProject') as ImportGetter;
72+
const importGetter = importAndroidLaunchIcon('/oldProject') as ImportGetter;
7373
expect(importGetter).toBeNull();
7474
});
7575
it('should handle not finding icon', () => {
7676
mockFs.writeFileSync(
7777
'/oldProject/android/app/src/main/AndroidManifest.xml',
7878
'random'
7979
);
80-
const importGetter = getAndroidLaunchIcon('/oldProject') as ImportGetter;
80+
const importGetter = importAndroidLaunchIcon('/oldProject') as ImportGetter;
8181
expect(importGetter).toBeNull();
8282
});
8383
});

‎src/__tests__/unit/utils/upgrade/android/importAndroidVersionCode.spec.ts‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ require('../../../../mocks/mockAll');
22
import path from 'path';
33
import { ImportGetter } from '../../../../../types/upgrade.types';
44
import { getProjectPath } from '../../../../../utils/getProjectPath';
5-
import { getAndroidVersionCode } from '../../../../../utils/upgrade/android/importAndroidVersionCode';
5+
import { importAndroidVersionCode } from '../../../../../utils/upgrade/android/importAndroidVersionCode';
66
import { mockFs } from '../../../../mocks/mockFs';
77

88
describe('importAndroidVersionCode', () => {
@@ -23,11 +23,13 @@ describe('importAndroidVersionCode', () => {
2323
versionName "1.0"
2424
...`
2525
);
26-
const importGetter = getAndroidVersionCode('/oldProject') as ImportGetter;
26+
const importGetter = importAndroidVersionCode(
27+
'/oldProject'
28+
) as ImportGetter;
2729
expect(importGetter).toBeTruthy();
2830
expect(importGetter.value).toEqual('5');
2931

30-
await importGetter.setter();
32+
await importGetter.apply();
3133

3234
expect(
3335
mockFs.readFileSync(
@@ -38,12 +40,16 @@ describe('importAndroidVersionCode', () => {
3840
it('should handle errors', () => {
3941
mockFs.setReadPermission(false);
4042

41-
const importGetter = getAndroidVersionCode('/oldProject') as ImportGetter;
43+
const importGetter = importAndroidVersionCode(
44+
'/oldProject'
45+
) as ImportGetter;
4246
expect(importGetter).toBeNull();
4347
});
4448
it('should handle not finding version code', () => {
4549
mockFs.writeFileSync('/oldProject/android/app/build.gradle', 'random');
46-
const importGetter = getAndroidVersionCode('/oldProject') as ImportGetter;
50+
const importGetter = importAndroidVersionCode(
51+
'/oldProject'
52+
) as ImportGetter;
4753
expect(importGetter).toBeNull();
4854
});
4955
});

‎src/__tests__/unit/utils/upgrade/android/importAndroidVersionName.spec.ts‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ require('../../../../mocks/mockAll');
22
import path from 'path';
33
import { ImportGetter } from '../../../../../types/upgrade.types';
44
import { getProjectPath } from '../../../../../utils/getProjectPath';
5-
import { getAndroidVersionName } from '../../../../../utils/upgrade/android/importAndroidVersionName';
5+
import { importAndroidVersionName } from '../../../../../utils/upgrade/android/importAndroidVersionName';
66
import { mockFs } from '../../../../mocks/mockFs';
77

88
describe('importAndroidVersionName', () => {
@@ -23,11 +23,13 @@ describe('importAndroidVersionName', () => {
2323
versionName "1.0"
2424
...`
2525
);
26-
const importGetter = getAndroidVersionName('/oldProject') as ImportGetter;
26+
const importGetter = importAndroidVersionName(
27+
'/oldProject'
28+
) as ImportGetter;
2729
expect(importGetter).toBeTruthy();
2830
expect(importGetter.value).toEqual('"5.5"');
2931

30-
await importGetter.setter();
32+
await importGetter.apply();
3133

3234
expect(
3335
mockFs.readFileSync(
@@ -38,12 +40,16 @@ describe('importAndroidVersionName', () => {
3840
it('should handle errors', () => {
3941
mockFs.setReadPermission(false);
4042

41-
const importGetter = getAndroidVersionName('/oldProject') as ImportGetter;
43+
const importGetter = importAndroidVersionName(
44+
'/oldProject'
45+
) as ImportGetter;
4246
expect(importGetter).toBeNull();
4347
});
4448
it('should handle not finding version name', () => {
4549
mockFs.writeFileSync('/oldProject/android/app/build.gradle', 'random');
46-
const importGetter = getAndroidVersionName('/oldProject') as ImportGetter;
50+
const importGetter = importAndroidVersionName(
51+
'/oldProject'
52+
) as ImportGetter;
4753
expect(importGetter).toBeNull();
4854
});
4955
});

0 commit comments

Comments
 (0)