miel.truyen/nx
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

chore(expo): update expo plugin unit tests to use "as-provided" (#18900)

Browse Source
This commit is contained in:
Nicholas Cunningham 2023-08-30 01:36:21 -06:00 committed by GitHub
parent db31f3043e
commit 83f2001230
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 133 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

126
packages/expo/src/generators/application/application.spec.ts
View File

@ -12,7 +12,7 @@ describe('app', () => {
let appTree: Tree; let appTree: Tree;
beforeEach(() => { beforeEach(() => {
appTree = createTreeWithEmptyWorkspace({ layout: 'apps-libs' }); appTree = createTreeWithEmptyWorkspace();
appTree.write('.gitignore', ''); appTree.write('.gitignore', '');
}); });
@ -25,10 +25,11 @@ describe('app', () => {
skipFormat: false, skipFormat: false,
js: false, js: false,
unitTestRunner: 'none', unitTestRunner: 'none',
projectNameAndRootFormat: 'as-provided',
}); });
const projects = getProjects(appTree); const projects = getProjects(appTree);
expect(projects.get('my-app').root).toEqual('apps/my-app'); expect(projects.get('my-app').root).toEqual('my-app');
}); });
it('should update nx.json', async () => { it('should update nx.json', async () => {
@ -41,6 +42,7 @@ describe('app', () => {
skipFormat: false, skipFormat: false,
js: false, js: false,
unitTestRunner: 'none', unitTestRunner: 'none',
projectNameAndRootFormat: 'as-provided',
}); });
const projectConfiguration = readProjectConfiguration(appTree, 'my-app'); const projectConfiguration = readProjectConfiguration(appTree, 'my-app');
@ -58,14 +60,15 @@ describe('app', () => {
skipFormat: false, skipFormat: false,
js: false, js: false,
unitTestRunner: 'jest', unitTestRunner: 'jest',
projectNameAndRootFormat: 'as-provided',
}); });
expect(appTree.exists('apps/my-app/src/app/App.tsx')).toBeTruthy(); expect(appTree.exists('my-app/src/app/App.tsx')).toBeTruthy();
expect(appTree.exists('apps/my-app/src/app/App.spec.tsx')).toBeTruthy(); expect(appTree.exists('my-app/src/app/App.spec.tsx')).toBeTruthy();
const tsconfig = readJson(appTree, 'apps/my-app/tsconfig.json'); const tsconfig = readJson(appTree, 'my-app/tsconfig.json');
expect(tsconfig.extends).toEqual('../../tsconfig.base.json'); expect(tsconfig.extends).toEqual('../tsconfig.base.json');
expect(appTree.exists('apps/my-app/.eslintrc.json')).toBe(true); expect(appTree.exists('my-app/.eslintrc.json')).toBe(true);
}); });
it('should generate js files', async () => { it('should generate js files', async () => {
@ -77,14 +80,15 @@ describe('app', () => {
skipFormat: false, skipFormat: false,
js: true, js: true,
unitTestRunner: 'jest', unitTestRunner: 'jest',
projectNameAndRootFormat: 'as-provided',
}); });
expect(appTree.exists('apps/my-app/src/app/App.js')).toBeTruthy(); expect(appTree.exists('my-app/src/app/App.js')).toBeTruthy();
expect(appTree.exists('apps/my-app/src/app/App.spec.js')).toBeTruthy(); expect(appTree.exists('my-app/src/app/App.spec.js')).toBeTruthy();
const tsconfig = readJson(appTree, 'apps/my-app/tsconfig.json'); const tsconfig = readJson(appTree, 'my-app/tsconfig.json');
expect(tsconfig.extends).toEqual('../../tsconfig.base.json'); expect(tsconfig.extends).toEqual('../tsconfig.base.json');
expect(appTree.exists('apps/my-app/.eslintrc.json')).toBe(true); expect(appTree.exists('my-app/.eslintrc.json')).toBe(true);
}); });
describe('detox', () => { describe('detox', () => {
@ -97,18 +101,12 @@ describe('app', () => {
js: false, js: false,
skipFormat: false, skipFormat: false,
unitTestRunner: 'none', unitTestRunner: 'none',
projectNameAndRootFormat: 'as-provided',
}); });
const projects = getProjects(appTree); expect(appTree.exists('my-dir-e2e/.detoxrc.json')).toBeTruthy();
expect(projects.get('my-dir-my-app').root).toEqual('apps/my-dir/my-app'); const detoxrc = appTree.read('my-dir-e2e/.detoxrc.json', 'utf-8');
expect(
appTree.exists('apps/my-dir/my-app-e2e/.detoxrc.json')
).toBeTruthy();
const detoxrc = appTree.read(
'apps/my-dir/my-app-e2e/.detoxrc.json',
'utf-8'
);
// Strip trailing commas // Strip trailing commas
const detoxrcJson = JSON.parse( const detoxrcJson = JSON.parse(
detoxrc.replace(/(?<=(true|false|null|["\d}\]])\s*),(?=\s*[}\]])/g, '') detoxrc.replace(/(?<=(true|false|null|["\d}\]])\s*),(?=\s*[}\]])/g, '')
@ -116,42 +114,42 @@ describe('app', () => {
expect(detoxrcJson.apps).toEqual({ expect(detoxrcJson.apps).toEqual({
'android.debug': { 'android.debug': {
binaryPath: binaryPath:
'../../../apps/my-dir/my-app/android/app/build/outputs/apk/debug/app-debug.apk', '../my-dir/android/app/build/outputs/apk/debug/app-debug.apk',
build: build:
'cd ../../../apps/my-dir/my-app/android && ./gradlew assembleDebug assembleAndroidTest -DtestBuildType=debug', 'cd ../my-dir/android && ./gradlew assembleDebug assembleAndroidTest -DtestBuildType=debug',
type: 'android.apk', type: 'android.apk',
}, },
'android.local': { 'android.local': {
binaryPath: '../../../apps/my-dir/my-app/dist/MyApp.apk', binaryPath: '../my-dir/dist/MyApp.apk',
build: build:
'npx nx run my-app:build --platform android --profile preview --wait --local --no-interactive --output=../../../apps/my-dir/my-app/dist/MyApp.apk', 'npx nx run my-app:build --platform android --profile preview --wait --local --no-interactive --output=../my-dir/dist/MyApp.apk',
type: 'android.apk', type: 'android.apk',
}, },
'android.release': { 'android.release': {
binaryPath: binaryPath:
'../../../apps/my-dir/my-app/android/app/build/outputs/apk/release/app-release.apk', '../my-dir/android/app/build/outputs/apk/release/app-release.apk',
build: build:
'cd ../../../apps/my-dir/my-app/android && ./gradlew assembleRelease assembleAndroidTest -DtestBuildType=release', 'cd ../my-dir/android && ./gradlew assembleRelease assembleAndroidTest -DtestBuildType=release',
type: 'android.apk', type: 'android.apk',
}, },
'ios.debug': { 'ios.debug': {
binaryPath: binaryPath:
'../../../apps/my-dir/my-app/ios/build/Build/Products/Debug-iphonesimulator/MyApp.app', '../my-dir/ios/build/Build/Products/Debug-iphonesimulator/MyApp.app',
build: build:
"cd ../../../apps/my-dir/my-app/ios && xcodebuild -workspace MyApp.xcworkspace -scheme MyApp -configuration Debug -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 14' -derivedDataPath ./build -quiet", "cd ../my-dir/ios && xcodebuild -workspace MyApp.xcworkspace -scheme MyApp -configuration Debug -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 14' -derivedDataPath ./build -quiet",
type: 'ios.app', type: 'ios.app',
}, },
'ios.local': { 'ios.local': {
binaryPath: '../../../apps/my-dir/my-app/dist/MyApp.app', binaryPath: '../my-dir/dist/MyApp.app',
build: build:
'npx nx run my-app:build --platform ios --profile preview --wait --local --no-interactive --output=../../../apps/my-dir/my-app/dist/MyApp.tar.gz', 'npx nx run my-app:build --platform ios --profile preview --wait --local --no-interactive --output=../my-dir/dist/MyApp.tar.gz',
type: 'ios.app', type: 'ios.app',
}, },
'ios.release': { 'ios.release': {
binaryPath: binaryPath:
'../../../apps/my-dir/my-app/ios/build/Build/Products/Release-iphonesimulator/MyApp.app', '../my-dir/ios/build/Build/Products/Release-iphonesimulator/MyApp.app',
build: build:
"cd ../../../apps/my-dir/my-app/ios && xcodebuild -workspace MyApp.xcworkspace -scheme MyApp -configuration Release -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 14' -derivedDataPath ./build -quiet", "cd ../my-dir/ios && xcodebuild -workspace MyApp.xcworkspace -scheme MyApp -configuration Release -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 14' -derivedDataPath ./build -quiet",
type: 'ios.app', type: 'ios.app',
}, },
}); });
@ -165,13 +163,11 @@ describe('app', () => {
js: false, js: false,
skipFormat: false, skipFormat: false,
unitTestRunner: 'none', unitTestRunner: 'none',
projectNameAndRootFormat: 'as-provided',
}); });
const projects = getProjects(appTree); expect(appTree.exists('my-app-e2e/.detoxrc.json')).toBeTruthy();
expect(projects.get('my-app').root).toEqual('apps/my-app'); const detoxrc = appTree.read('my-app-e2e/.detoxrc.json', 'utf-8');
expect(appTree.exists('apps/my-app-e2e/.detoxrc.json')).toBeTruthy();
const detoxrc = appTree.read('apps/my-app-e2e/.detoxrc.json', 'utf-8');
// Strip trailing commas // Strip trailing commas
const detoxrcJson = JSON.parse( const detoxrcJson = JSON.parse(
detoxrc.replace(/(?<=(true|false|null|["\d}\]])\s*),(?=\s*[}\]])/g, '') detoxrc.replace(/(?<=(true|false|null|["\d}\]])\s*),(?=\s*[}\]])/g, '')
@ -179,42 +175,42 @@ describe('app', () => {
expect(detoxrcJson.apps).toEqual({ expect(detoxrcJson.apps).toEqual({
'android.debug': { 'android.debug': {
binaryPath: binaryPath:
'../../apps/my-app/android/app/build/outputs/apk/debug/app-debug.apk', '../my-app/android/app/build/outputs/apk/debug/app-debug.apk',
build: build:
'cd ../../apps/my-app/android && ./gradlew assembleDebug assembleAndroidTest -DtestBuildType=debug', 'cd ../my-app/android && ./gradlew assembleDebug assembleAndroidTest -DtestBuildType=debug',
type: 'android.apk', type: 'android.apk',
}, },
'android.local': { 'android.local': {
binaryPath: '../../apps/my-app/dist/MyApp.apk', binaryPath: '../my-app/dist/MyApp.apk',
build: build:
'npx nx run my-app:build --platform android --profile preview --wait --local --no-interactive --output=../../apps/my-app/dist/MyApp.apk', 'npx nx run my-app:build --platform android --profile preview --wait --local --no-interactive --output=../my-app/dist/MyApp.apk',
type: 'android.apk', type: 'android.apk',
}, },
'android.release': { 'android.release': {
binaryPath: binaryPath:
'../../apps/my-app/android/app/build/outputs/apk/release/app-release.apk', '../my-app/android/app/build/outputs/apk/release/app-release.apk',
build: build:
'cd ../../apps/my-app/android && ./gradlew assembleRelease assembleAndroidTest -DtestBuildType=release', 'cd ../my-app/android && ./gradlew assembleRelease assembleAndroidTest -DtestBuildType=release',
type: 'android.apk', type: 'android.apk',
}, },
'ios.debug': { 'ios.debug': {
binaryPath: binaryPath:
'../../apps/my-app/ios/build/Build/Products/Debug-iphonesimulator/MyApp.app', '../my-app/ios/build/Build/Products/Debug-iphonesimulator/MyApp.app',
build: build:
"cd ../../apps/my-app/ios && xcodebuild -workspace MyApp.xcworkspace -scheme MyApp -configuration Debug -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 14' -derivedDataPath ./build -quiet", "cd ../my-app/ios && xcodebuild -workspace MyApp.xcworkspace -scheme MyApp -configuration Debug -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 14' -derivedDataPath ./build -quiet",
type: 'ios.app', type: 'ios.app',
}, },
'ios.local': { 'ios.local': {
binaryPath: '../../apps/my-app/dist/MyApp.app', binaryPath: '../my-app/dist/MyApp.app',
build: build:
'npx nx run my-app:build --platform ios --profile preview --wait --local --no-interactive --output=../../apps/my-app/dist/MyApp.tar.gz', 'npx nx run my-app:build --platform ios --profile preview --wait --local --no-interactive --output=../my-app/dist/MyApp.tar.gz',
type: 'ios.app', type: 'ios.app',
}, },
'ios.release': { 'ios.release': {
binaryPath: binaryPath:
'../../apps/my-app/ios/build/Build/Products/Release-iphonesimulator/MyApp.app', '../my-app/ios/build/Build/Products/Release-iphonesimulator/MyApp.app',
build: build:
"cd ../../apps/my-app/ios && xcodebuild -workspace MyApp.xcworkspace -scheme MyApp -configuration Release -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 14' -derivedDataPath ./build -quiet", "cd ../my-app/ios && xcodebuild -workspace MyApp.xcworkspace -scheme MyApp -configuration Release -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 14' -derivedDataPath ./build -quiet",
type: 'ios.app', type: 'ios.app',
}, },
}); });
@ -232,10 +228,10 @@ describe('app', () => {
}); });
const projects = getProjects(appTree); const projects = getProjects(appTree);
expect(projects.get('my-app').root).toEqual('apps/my-app'); expect(projects.get('my-app').root).toEqual('my-app');
expect(appTree.exists('apps/my-app-e2e/.detoxrc.json')).toBeTruthy(); expect(appTree.exists('my-app-e2e/.detoxrc.json')).toBeTruthy();
const detoxrc = appTree.read('apps/my-app-e2e/.detoxrc.json', 'utf-8'); const detoxrc = appTree.read('my-app-e2e/.detoxrc.json', 'utf-8');
// Strip trailing commas // Strip trailing commas
const detoxrcJson = JSON.parse( const detoxrcJson = JSON.parse(
detoxrc.replace(/(?<=(true|false|null|["\d}\]])\s*),(?=\s*[}\]])/g, '') detoxrc.replace(/(?<=(true|false|null|["\d}\]])\s*),(?=\s*[}\]])/g, '')
@ -243,42 +239,42 @@ describe('app', () => {
expect(detoxrcJson.apps).toEqual({ expect(detoxrcJson.apps).toEqual({
'android.debug': { 'android.debug': {
binaryPath: binaryPath:
'../../apps/my-app/android/app/build/outputs/apk/debug/app-debug.apk', '../my-app/android/app/build/outputs/apk/debug/app-debug.apk',
build: build:
'cd ../../apps/my-app/android && ./gradlew assembleDebug assembleAndroidTest -DtestBuildType=debug', 'cd ../my-app/android && ./gradlew assembleDebug assembleAndroidTest -DtestBuildType=debug',
type: 'android.apk', type: 'android.apk',
}, },
'android.local': { 'android.local': {
binaryPath: '../../apps/my-app/dist/myappname.apk', binaryPath: '../my-app/dist/myappname.apk',
build: build:
'npx nx run my-app:build --platform android --profile preview --wait --local --no-interactive --output=../../apps/my-app/dist/myappname.apk', 'npx nx run my-app:build --platform android --profile preview --wait --local --no-interactive --output=../my-app/dist/myappname.apk',
type: 'android.apk', type: 'android.apk',
}, },
'android.release': { 'android.release': {
binaryPath: binaryPath:
'../../apps/my-app/android/app/build/outputs/apk/release/app-release.apk', '../my-app/android/app/build/outputs/apk/release/app-release.apk',
build: build:
'cd ../../apps/my-app/android && ./gradlew assembleRelease assembleAndroidTest -DtestBuildType=release', 'cd ../my-app/android && ./gradlew assembleRelease assembleAndroidTest -DtestBuildType=release',
type: 'android.apk', type: 'android.apk',
}, },
'ios.debug': { 'ios.debug': {
binaryPath: binaryPath:
'../../apps/my-app/ios/build/Build/Products/Debug-iphonesimulator/MyApp.app', '../my-app/ios/build/Build/Products/Debug-iphonesimulator/MyApp.app',
build: build:
"cd ../../apps/my-app/ios && xcodebuild -workspace MyApp.xcworkspace -scheme MyApp -configuration Debug -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 14' -derivedDataPath ./build -quiet", "cd ../my-app/ios && xcodebuild -workspace MyApp.xcworkspace -scheme MyApp -configuration Debug -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 14' -derivedDataPath ./build -quiet",
type: 'ios.app', type: 'ios.app',
}, },
'ios.local': { 'ios.local': {
binaryPath: '../../apps/my-app/dist/myappname.app', binaryPath: '../my-app/dist/myappname.app',
build: build:
'npx nx run my-app:build --platform ios --profile preview --wait --local --no-interactive --output=../../apps/my-app/dist/myappname.tar.gz', 'npx nx run my-app:build --platform ios --profile preview --wait --local --no-interactive --output=../my-app/dist/myappname.tar.gz',
type: 'ios.app', type: 'ios.app',
}, },
'ios.release': { 'ios.release': {
binaryPath: binaryPath:
'../../apps/my-app/ios/build/Build/Products/Release-iphonesimulator/MyApp.app', '../my-app/ios/build/Build/Products/Release-iphonesimulator/MyApp.app',
build: build:
"cd ../../apps/my-app/ios && xcodebuild -workspace MyApp.xcworkspace -scheme MyApp -configuration Release -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 14' -derivedDataPath ./build -quiet", "cd ../my-app/ios && xcodebuild -workspace MyApp.xcworkspace -scheme MyApp -configuration Release -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 14' -derivedDataPath ./build -quiet",
type: 'ios.app', type: 'ios.app',
}, },
}); });

31
packages/expo/src/generators/application/lib/nomalize-options.spec.ts
View File

@ -8,7 +8,7 @@ describe('Normalize Options', () => {
let appTree: Tree; let appTree: Tree;
beforeEach(() => { beforeEach(() => {
appTree = createTreeWithEmptyWorkspace({ layout: 'apps-libs' }); appTree = createTreeWithEmptyWorkspace();
}); });
it('should normalize options with name in kebab case', async () => { it('should normalize options with name in kebab case', async () => {
@ -19,17 +19,18 @@ describe('Normalize Options', () => {
skipFormat: false, skipFormat: false,
js: true, js: true,
unitTestRunner: 'jest', unitTestRunner: 'jest',
projectNameAndRootFormat: 'as-provided',
}; };
const options = await normalizeOptions(appTree, schema); const options = await normalizeOptions(appTree, schema);
expect(options).toEqual({ expect(options).toEqual({
appProjectRoot: 'apps/my-app', appProjectRoot: 'my-app',
className: 'MyApp', className: 'MyApp',
displayName: 'MyApp', displayName: 'MyApp',
lowerCaseName: 'myapp', lowerCaseName: 'myapp',
name: 'my-app', name: 'my-app',
parsedTags: [], parsedTags: [],
projectName: 'my-app', projectName: 'my-app',
projectNameAndRootFormat: 'derived', projectNameAndRootFormat: 'as-provided',
linter: Linter.EsLint, linter: Linter.EsLint,
e2eTestRunner: 'none', e2eTestRunner: 'none',
unitTestRunner: 'jest', unitTestRunner: 'jest',
@ -46,17 +47,18 @@ describe('Normalize Options', () => {
skipFormat: false, skipFormat: false,
js: true, js: true,
unitTestRunner: 'jest', unitTestRunner: 'jest',
projectNameAndRootFormat: 'as-provided',
}; };
const options = await normalizeOptions(appTree, schema); const options = await normalizeOptions(appTree, schema);
expect(options).toEqual({ expect(options).toEqual({
appProjectRoot: 'apps/my-app', appProjectRoot: 'my-app',
className: 'MyApp', className: 'MyApp',
displayName: 'MyApp', displayName: 'MyApp',
lowerCaseName: 'myapp', lowerCaseName: 'myapp',
name: 'my-app', name: 'my-app',
parsedTags: [], parsedTags: [],
projectName: 'my-app', projectName: 'my-app',
projectNameAndRootFormat: 'derived', projectNameAndRootFormat: 'as-provided',
linter: Linter.EsLint, linter: Linter.EsLint,
e2eTestRunner: 'none', e2eTestRunner: 'none',
skipFormat: false, skipFormat: false,
@ -74,18 +76,19 @@ describe('Normalize Options', () => {
skipFormat: false, skipFormat: false,
js: true, js: true,
unitTestRunner: 'jest', unitTestRunner: 'jest',
projectNameAndRootFormat: 'as-provided',
}; };
const options = await normalizeOptions(appTree, schema); const options = await normalizeOptions(appTree, schema);
expect(options).toEqual({ expect(options).toEqual({
appProjectRoot: 'apps/directory/my-app', appProjectRoot: 'directory',
className: 'MyApp', className: 'MyApp',
displayName: 'MyApp', displayName: 'MyApp',
lowerCaseName: 'myapp', lowerCaseName: 'myapp',
name: 'my-app', name: 'my-app',
directory: 'directory', directory: 'directory',
parsedTags: [], parsedTags: [],
projectName: 'directory-my-app', projectName: 'my-app',
projectNameAndRootFormat: 'derived', projectNameAndRootFormat: 'as-provided',
e2eTestRunner: 'none', e2eTestRunner: 'none',
unitTestRunner: 'jest', unitTestRunner: 'jest',
linter: Linter.EsLint, linter: Linter.EsLint,
@ -102,17 +105,18 @@ describe('Normalize Options', () => {
skipFormat: false, skipFormat: false,
js: true, js: true,
unitTestRunner: 'jest', unitTestRunner: 'jest',
projectNameAndRootFormat: 'as-provided',
}; };
const options = await normalizeOptions(appTree, schema); const options = await normalizeOptions(appTree, schema);
expect(options).toEqual({ expect(options).toEqual({
appProjectRoot: 'apps/directory/my-app', appProjectRoot: 'directory/my-app',
className: 'DirectoryMyApp', className: 'DirectoryMyApp',
displayName: 'DirectoryMyApp', displayName: 'DirectoryMyApp',
lowerCaseName: 'directorymyapp', lowerCaseName: 'directorymyapp',
name: 'directory/my-app', name: 'directory/my-app',
parsedTags: [], parsedTags: [],
projectName: 'directory-my-app', projectName: 'directory/my-app',
projectNameAndRootFormat: 'derived', projectNameAndRootFormat: 'as-provided',
e2eTestRunner: 'none', e2eTestRunner: 'none',
unitTestRunner: 'jest', unitTestRunner: 'jest',
linter: Linter.EsLint, linter: Linter.EsLint,
@ -130,17 +134,18 @@ describe('Normalize Options', () => {
skipFormat: false, skipFormat: false,
js: true, js: true,
unitTestRunner: 'jest', unitTestRunner: 'jest',
projectNameAndRootFormat: 'as-provided',
}; };
const options = await normalizeOptions(appTree, schema); const options = await normalizeOptions(appTree, schema);
expect(options).toEqual({ expect(options).toEqual({
appProjectRoot: 'apps/my-app', appProjectRoot: 'my-app',
className: 'MyApp', className: 'MyApp',
displayName: 'My App', displayName: 'My App',
lowerCaseName: 'myapp', lowerCaseName: 'myapp',
name: 'my-app', name: 'my-app',
parsedTags: [], parsedTags: [],
projectName: 'my-app', projectName: 'my-app',
projectNameAndRootFormat: 'derived', projectNameAndRootFormat: 'as-provided',
e2eTestRunner: 'none', e2eTestRunner: 'none',
unitTestRunner: 'jest', unitTestRunner: 'jest',
linter: Linter.EsLint, linter: Linter.EsLint,

36
packages/expo/src/generators/component/component.spec.ts
View File

@ -14,7 +14,7 @@ describe('component', () => {
beforeEach(async () => { beforeEach(async () => {
projectName = 'my-lib'; projectName = 'my-lib';
appTree = createTreeWithEmptyWorkspace({ layout: 'apps-libs' }); appTree = createTreeWithEmptyWorkspace();
appTree.write('.gitignore', ''); appTree.write('.gitignore', '');
defaultSchema = { defaultSchema = {
name: 'hello', name: 'hello',
@ -35,6 +35,7 @@ describe('component', () => {
skipFormat: false, skipFormat: false,
js: true, js: true,
unitTestRunner: 'jest', unitTestRunner: 'jest',
projectNameAndRootFormat: 'as-provided',
}); });
await expoLibraryGenerator(appTree, { await expoLibraryGenerator(appTree, {
name: projectName, name: projectName,
@ -44,6 +45,7 @@ describe('component', () => {
unitTestRunner: 'jest', unitTestRunner: 'jest',
strict: true, strict: true,
js: false, js: false,
projectNameAndRootFormat: 'as-provided',
}); });
jest.spyOn(logger, 'warn').mockImplementation(() => {}); jest.spyOn(logger, 'warn').mockImplementation(() => {});
jest.spyOn(logger, 'debug').mockImplementation(() => {}); jest.spyOn(logger, 'debug').mockImplementation(() => {});
@ -56,10 +58,8 @@ describe('component', () => {
it('should generate files', async () => { it('should generate files', async () => {
await expoComponentGenerator(appTree, defaultSchema); await expoComponentGenerator(appTree, defaultSchema);
expect(appTree.exists('libs/my-lib/src/lib/hello/hello.tsx')).toBeTruthy(); expect(appTree.exists('my-lib/src/lib/hello/hello.tsx')).toBeTruthy();
expect( expect(appTree.exists('my-lib/src/lib/hello/hello.spec.tsx')).toBeTruthy();
appTree.exists('libs/my-lib/src/lib/hello/hello.spec.tsx')
).toBeTruthy();
}); });
it('should generate files for an app', async () => { it('should generate files for an app', async () => {
@ -68,10 +68,8 @@ describe('component', () => {
project: 'my-app', project: 'my-app',
}); });
expect(appTree.exists('apps/my-app/src/app/hello/hello.tsx')).toBeTruthy(); expect(appTree.exists('my-app/src/app/hello/hello.tsx')).toBeTruthy();
expect( expect(appTree.exists('my-app/src/app/hello/hello.spec.tsx')).toBeTruthy();
appTree.exists('apps/my-app/src/app/hello/hello.spec.tsx')
).toBeTruthy();
}); });
describe('--export', () => { describe('--export', () => {
@ -81,7 +79,7 @@ describe('component', () => {
export: true, export: true,
}); });
const indexContent = appTree.read('libs/my-lib/src/index.ts', 'utf-8'); const indexContent = appTree.read('my-lib/src/index.ts', 'utf-8');
expect(indexContent).toMatch(/lib\/hello/); expect(indexContent).toMatch(/lib\/hello/);
}); });
@ -93,7 +91,7 @@ describe('component', () => {
export: true, export: true,
}); });
const indexContent = appTree.read('libs/my-lib/src/index.ts', 'utf-8'); const indexContent = appTree.read('my-lib/src/index.ts', 'utf-8');
expect(indexContent).not.toMatch(/lib\/hello/); expect(indexContent).not.toMatch(/lib\/hello/);
}); });
@ -105,11 +103,9 @@ describe('component', () => {
...defaultSchema, ...defaultSchema,
pascalCaseFiles: true, pascalCaseFiles: true,
}); });
expect(appTree.exists('my-lib/src/lib/hello/Hello.tsx')).toBeTruthy();
expect( expect(
appTree.exists('libs/my-lib/src/lib/hello/Hello.tsx') appTree.exists('my-lib/src/lib/hello/Hello.spec.tsx')
).toBeTruthy();
expect(
appTree.exists('libs/my-lib/src/lib/hello/Hello.spec.tsx')
).toBeTruthy(); ).toBeTruthy();
}); });
}); });
@ -121,7 +117,7 @@ describe('component', () => {
directory: 'components', directory: 'components',
}); });
expect(appTree.exists('/libs/my-lib/src/components/hello/hello.tsx')); expect(appTree.exists('my-lib/src/components/hello/hello.tsx'));
}); });
it('should create with nested directories', async () => { it('should create with nested directories', async () => {
@ -131,9 +127,7 @@ describe('component', () => {
directory: 'lib/foo', directory: 'lib/foo',
}); });
expect( expect(appTree.exists('my-lib/src/lib/foo/hello-world/hello-world.tsx'));
appTree.exists('/libs/my-lib/src/lib/foo/hello-world/hello-world.tsx')
);
}); });
}); });
@ -144,7 +138,7 @@ describe('component', () => {
flat: true, flat: true,
}); });
expect(appTree.exists('/libs/my-lib/src/lib/hello.tsx')); expect(appTree.exists('my-lib/src/lib/hello.tsx'));
}); });
it('should work with custom directory path', async () => { it('should work with custom directory path', async () => {
await expoComponentGenerator(appTree, { await expoComponentGenerator(appTree, {
@ -153,7 +147,7 @@ describe('component', () => {
directory: 'components', directory: 'components',
}); });
expect(appTree.exists('/libs/my-lib/src/components/hello.tsx')); expect(appTree.exists('my-lib/src/components/hello.tsx'));
}); });
}); });
}); });

2
packages/expo/src/generators/init/init.spec.ts
View File

@ -6,7 +6,7 @@ describe('init', () => {
let tree: Tree; let tree: Tree;
beforeEach(() => { beforeEach(() => {
tree = createTreeWithEmptyWorkspace({ layout: 'apps-libs' }); tree = createTreeWithEmptyWorkspace();
tree.write('.gitignore', ''); tree.write('.gitignore', '');
}); });

64
packages/expo/src/generators/library/library.spec.ts
View File

@ -22,10 +22,11 @@ describe('lib', () => {
unitTestRunner: 'jest', unitTestRunner: 'jest',
strict: true, strict: true,
js: false, js: false,
projectNameAndRootFormat: 'as-provided',
}; };
beforeEach(() => { beforeEach(() => {
appTree = createTreeWithEmptyWorkspace({ layout: 'apps-libs' }); appTree = createTreeWithEmptyWorkspace();
appTree.write('.gitignore', ''); appTree.write('.gitignore', '');
}); });
@ -36,13 +37,13 @@ describe('lib', () => {
tags: 'one,two', tags: 'one,two',
}); });
const projectConfiguration = readProjectConfiguration(appTree, 'my-lib'); const projectConfiguration = readProjectConfiguration(appTree, 'my-lib');
expect(projectConfiguration.root).toEqual('libs/my-lib'); expect(projectConfiguration.root).toEqual('my-lib');
expect(projectConfiguration.targets.build).toBeUndefined(); expect(projectConfiguration.targets.build).toBeUndefined();
expect(projectConfiguration.targets.lint).toEqual({ expect(projectConfiguration.targets.lint).toEqual({
executor: '@nx/linter:eslint', executor: '@nx/linter:eslint',
outputs: ['{options.outputFile}'], outputs: ['{options.outputFile}'],
options: { options: {
lintFilePatterns: ['libs/my-lib/**/*.{ts,tsx,js,jsx}'], lintFilePatterns: ['my-lib/**/*.{ts,tsx,js,jsx}'],
}, },
}); });
expect(projectConfiguration.tags).toEqual(['one', 'two']); expect(projectConfiguration.tags).toEqual(['one', 'two']);
@ -52,7 +53,7 @@ describe('lib', () => {
await expoLibraryGenerator(appTree, defaultSchema); await expoLibraryGenerator(appTree, defaultSchema);
const tsconfigJson = readJson(appTree, '/tsconfig.base.json'); const tsconfigJson = readJson(appTree, '/tsconfig.base.json');
expect(tsconfigJson.compilerOptions.paths['@proj/my-lib']).toEqual([ expect(tsconfigJson.compilerOptions.paths['@proj/my-lib']).toEqual([
'libs/my-lib/src/index.ts', 'my-lib/src/index.ts',
]); ]);
}); });
@ -65,13 +66,13 @@ describe('lib', () => {
await expoLibraryGenerator(appTree, defaultSchema); await expoLibraryGenerator(appTree, defaultSchema);
const tsconfigJson = readJson(appTree, '/tsconfig.base.json'); const tsconfigJson = readJson(appTree, '/tsconfig.base.json');
expect(tsconfigJson.compilerOptions.paths['@proj/my-lib']).toEqual([ expect(tsconfigJson.compilerOptions.paths['@proj/my-lib']).toEqual([
'libs/my-lib/src/index.ts', 'my-lib/src/index.ts',
]); ]);
}); });
it('should create a local tsconfig.json', async () => { it('should create a local tsconfig.json', async () => {
await expoLibraryGenerator(appTree, defaultSchema); await expoLibraryGenerator(appTree, defaultSchema);
const tsconfigJson = readJson(appTree, 'libs/my-lib/tsconfig.json'); const tsconfigJson = readJson(appTree, 'my-lib/tsconfig.json');
expect(tsconfigJson.references).toEqual([ expect(tsconfigJson.references).toEqual([
{ {
path: './tsconfig.lib.json', path: './tsconfig.lib.json',
@ -92,24 +93,26 @@ describe('lib', () => {
it('should extend the local tsconfig.json with tsconfig.spec.json', async () => { it('should extend the local tsconfig.json with tsconfig.spec.json', async () => {
await expoLibraryGenerator(appTree, defaultSchema); await expoLibraryGenerator(appTree, defaultSchema);
const tsconfigJson = readJson(appTree, 'libs/my-lib/tsconfig.spec.json'); const tsconfigJson = readJson(appTree, 'my-lib/tsconfig.spec.json');
expect(tsconfigJson.extends).toEqual('./tsconfig.json'); expect(tsconfigJson.extends).toEqual('./tsconfig.json');
}); });
it('should extend the local tsconfig.json with tsconfig.lib.json', async () => { it('should extend the local tsconfig.json with tsconfig.lib.json', async () => {
await expoLibraryGenerator(appTree, defaultSchema); await expoLibraryGenerator(appTree, defaultSchema);
const tsconfigJson = readJson(appTree, 'libs/my-lib/tsconfig.lib.json'); const tsconfigJson = readJson(appTree, 'my-lib/tsconfig.lib.json');
expect(tsconfigJson.extends).toEqual('./tsconfig.json'); expect(tsconfigJson.extends).toEqual('./tsconfig.json');
}); });
}); });
describe('nested', () => { describe('nested', () => {
it('should update project.json', async () => { it('should update project.json with two libs', async () => {
await expoLibraryGenerator(appTree, { await expoLibraryGenerator(appTree, {
...defaultSchema, ...defaultSchema,
projectNameAndRootFormat: 'derived',
directory: 'myDir', directory: 'myDir',
tags: 'one', tags: 'one',
}); });
const projectConfiguration = readProjectConfiguration( const projectConfiguration = readProjectConfiguration(
appTree, appTree,
'my-dir-my-lib' 'my-dir-my-lib'
@ -123,6 +126,7 @@ describe('lib', () => {
name: 'myLib2', name: 'myLib2',
directory: 'myDir', directory: 'myDir',
tags: 'one,two', tags: 'one,two',
projectNameAndRootFormat: 'derived',
}); });
const lib2ProjectConfiguration = readProjectConfiguration( const lib2ProjectConfiguration = readProjectConfiguration(
@ -138,6 +142,7 @@ describe('lib', () => {
await expoLibraryGenerator(appTree, { await expoLibraryGenerator(appTree, {
...defaultSchema, ...defaultSchema,
directory: 'myDir', directory: 'myDir',
projectNameAndRootFormat: 'derived',
}); });
const projectConfiguration = readProjectConfiguration( const projectConfiguration = readProjectConfiguration(
appTree, appTree,
@ -147,7 +152,7 @@ describe('lib', () => {
executor: '@nx/linter:eslint', executor: '@nx/linter:eslint',
outputs: ['{options.outputFile}'], outputs: ['{options.outputFile}'],
options: { options: {
lintFilePatterns: ['libs/my-dir/my-lib/**/*.{ts,tsx,js,jsx}'], lintFilePatterns: ['my-dir/my-lib/**/*.{ts,tsx,js,jsx}'],
}, },
}); });
}); });
@ -158,12 +163,10 @@ describe('lib', () => {
directory: 'myDir', directory: 'myDir',
}); });
const tsconfigJson = readJson(appTree, '/tsconfig.base.json'); const tsconfigJson = readJson(appTree, '/tsconfig.base.json');
expect(tsconfigJson.compilerOptions.paths['@proj/my-dir/my-lib']).toEqual( expect(tsconfigJson.compilerOptions.paths['@proj/my-lib']).toEqual([
['libs/my-dir/my-lib/src/index.ts'] 'my-dir/src/index.ts',
); ]);
expect( expect(tsconfigJson.compilerOptions.paths['my-dir/*']).toBeUndefined();
tsconfigJson.compilerOptions.paths['my-dir-my-lib/*']
).toBeUndefined();
}); });
it('should create a local tsconfig.json', async () => { it('should create a local tsconfig.json', async () => {
@ -172,10 +175,7 @@ describe('lib', () => {
directory: 'myDir', directory: 'myDir',
}); });
const tsconfigJson = readJson( const tsconfigJson = readJson(appTree, 'my-dir/tsconfig.json');
appTree,
'libs/my-dir/my-lib/tsconfig.json'
);
expect(tsconfigJson.references).toEqual([ expect(tsconfigJson.references).toEqual([
{ {
path: './tsconfig.lib.json', path: './tsconfig.lib.json',
@ -194,14 +194,14 @@ describe('lib', () => {
unitTestRunner: 'none', unitTestRunner: 'none',
}); });
expect(appTree.exists('libs/my-lib/tsconfig.spec.json')).toBeFalsy(); expect(appTree.exists('my-lib/tsconfig.spec.json')).toBeFalsy();
expect(appTree.exists('libs/my-lib/jest.config.ts')).toBeFalsy(); expect(appTree.exists('my-lib/jest.config.ts')).toBeFalsy();
const projectConfiguration = readProjectConfiguration(appTree, 'my-lib'); const projectConfiguration = readProjectConfiguration(appTree, 'my-lib');
expect(projectConfiguration.targets.test).toBeUndefined(); expect(projectConfiguration.targets.test).toBeUndefined();
expect(projectConfiguration.targets.lint).toMatchObject({ expect(projectConfiguration.targets.lint).toMatchObject({
executor: '@nx/linter:eslint', executor: '@nx/linter:eslint',
options: { options: {
lintFilePatterns: ['libs/my-lib/**/*.{ts,tsx,js,jsx}'], lintFilePatterns: ['my-lib/**/*.{ts,tsx,js,jsx}'],
}, },
outputs: ['{options.outputFile}'], outputs: ['{options.outputFile}'],
}); });
@ -236,10 +236,10 @@ describe('lib', () => {
outputs: ['{options.outputPath}'], outputs: ['{options.outputPath}'],
options: { options: {
external: ['react/jsx-runtime', 'react-native', 'react', 'react-dom'], external: ['react/jsx-runtime', 'react-native', 'react', 'react-dom'],
entryFile: 'libs/my-lib/src/index.ts', entryFile: 'my-lib/src/index.ts',
outputPath: 'dist/libs/my-lib', outputPath: 'dist/my-lib',
project: 'libs/my-lib/package.json', project: 'my-lib/package.json',
tsConfig: 'libs/my-lib/tsconfig.lib.json', tsConfig: 'my-lib/tsconfig.lib.json',
rollupConfig: '@nx/react/plugins/bundle-rollup', rollupConfig: '@nx/react/plugins/bundle-rollup',
}, },
}); });
@ -268,9 +268,9 @@ describe('lib', () => {
importPath: '@proj/my-lib', importPath: '@proj/my-lib',
}); });
const packageJson = readJson(appTree, '/libs/my-lib/package.json'); const packageJson = readJson(appTree, 'my-lib/package.json');
expect(packageJson.name).toEqual('@proj/my-lib'); expect(packageJson.name).toEqual('@proj/my-lib');
expect(appTree.exists('/libs/my-lib/.babelrc')); expect(appTree.exists('my-lib/.babelrc'));
}); });
}); });
@ -281,7 +281,7 @@ describe('lib', () => {
js: true, js: true,
}); });
expect(appTree.exists('/libs/my-lib/src/index.js')).toBe(true); expect(appTree.exists('my-lib/src/index.js')).toBe(true);
}); });
}); });
@ -293,7 +293,7 @@ describe('lib', () => {
directory: 'myDir', directory: 'myDir',
importPath: '@myorg/lib', importPath: '@myorg/lib',
}); });
const packageJson = readJson(appTree, 'libs/my-dir/my-lib/package.json'); const packageJson = readJson(appTree, 'my-dir/package.json');
const tsconfigJson = readJson(appTree, '/tsconfig.base.json'); const tsconfigJson = readJson(appTree, '/tsconfig.base.json');
expect(packageJson.name).toBe('@myorg/lib'); expect(packageJson.name).toBe('@myorg/lib');
@ -333,7 +333,7 @@ describe('lib', () => {
...defaultSchema, ...defaultSchema,
strict: false, strict: false,
}); });
const tsconfigJson = readJson(appTree, '/libs/my-lib/tsconfig.json'); const tsconfigJson = readJson(appTree, 'my-lib/tsconfig.json');
expect( expect(
tsconfigJson.compilerOptions.forceConsistentCasingInFileNames tsconfigJson.compilerOptions.forceConsistentCasingInFileNames

11
packages/expo/src/utils/add-linting.spec.ts
View File

@ -8,10 +8,11 @@ describe('Add Linting', () => {
let tree: Tree; let tree: Tree;
beforeEach(async () => { beforeEach(async () => {
tree = createTreeWithEmptyWorkspace({ layout: 'apps-libs' }); tree = createTreeWithEmptyWorkspace();
await libraryGenerator(tree, { await libraryGenerator(tree, {
name: 'my-lib', name: 'my-lib',
linter: Linter.None, linter: Linter.None,
projectNameAndRootFormat: 'as-provided',
}); });
}); });
@ -19,8 +20,8 @@ describe('Add Linting', () => {
addLinting(tree, { addLinting(tree, {
projectName: 'my-lib', projectName: 'my-lib',
linter: Linter.EsLint, linter: Linter.EsLint,
tsConfigPaths: ['libs/my-lib/tsconfig.lib.json'], tsConfigPaths: ['my-lib/tsconfig.lib.json'],
projectRoot: 'libs/my-lib', projectRoot: 'my-lib',
}); });
const project = readProjectConfiguration(tree, 'my-lib'); const project = readProjectConfiguration(tree, 'my-lib');
@ -32,8 +33,8 @@ describe('Add Linting', () => {
addLinting(tree, { addLinting(tree, {
projectName: 'my-lib', projectName: 'my-lib',
linter: Linter.None, linter: Linter.None,
tsConfigPaths: ['libs/my-lib/tsconfig.lib.json'], tsConfigPaths: ['my-lib/tsconfig.lib.json'],
projectRoot: 'libs/my-lib', projectRoot: 'my-lib',
}); });
const project = readProjectConfiguration(tree, 'my-lib'); const project = readProjectConfiguration(tree, 'my-lib');