Refactor build-default tests for more explicitness and correctness checks

templates/basic/README.md

@@ -40,9 +40,9 @@ This is the folder structure we set up for you:
 
 ```txt
 /src
-  index.tsx       # EDIT THIS
+  index.ts        # EDIT THIS
 /test
-  blah.test.tsx   # EDIT THIS
+  index.test.ts   # EDIT THIS
 .gitignore
 package.json
 README.md         # EDIT THIS

templates/basic/src/index.ts

@@ -1,6 +1,6 @@
 export const sum = (a: number, b: number) => {
   if ('development' === process.env.NODE_ENV) {
-    console.log('boop');
+    console.log('dev only output');
   }
   return a + b;
 };

templates/basic/test/blah.test.ts → templates/basic/test/index.test.ts

@@ -1,7 +1,7 @@
 import { sum } from '../src';
 
-describe('blah', () => {
-  it('works', () => {
+describe('sum', () => {
+  it('adds two numbers together', () => {
     expect(sum(1, 1)).toEqual(2);
   });
 });

templates/react-with-storybook/README.md

@@ -73,7 +73,7 @@ This is the folder structure we set up for you:
 /src
   index.tsx       # EDIT THIS
 /test
-  blah.test.tsx   # EDIT THIS
+  index.test.tsx  # EDIT THIS
 /stories
   Thing.stories.tsx # EDIT THIS
 /.storybook

templates/react/README.md

@@ -57,7 +57,7 @@ This is the folder structure we set up for you:
 /src
   index.tsx       # EDIT THIS
 /test
-  blah.test.tsx   # EDIT THIS
+  index.test.tsx  # EDIT THIS
 .gitignore
 package.json
 README.md         # EDIT THIS

templates/react/test/blah.test.tsx → templates/react/test/index.test.tsx

@@ -2,7 +2,7 @@ import * as React from 'react';
 import * as ReactDOM from 'react-dom';
 import { Thing } from '../src';
 
-describe('it', () => {
+describe('Thing', () => {
   it('renders without crashing', () => {
     const div = document.createElement('div');
     ReactDOM.render(<Thing />, div);

test/e2e/fixtures/build-default/src/index.ts

@@ -1,19 +1,19 @@
-import './syntax/nullish-coalescing';
-import './syntax/optional-chaining';
-
 import './syntax/jsx-import/JSX-import-JSX';
 
-import './syntax/async';
+export { testNullishCoalescing } from './syntax/nullish-coalescing';
+export { testOptionalChaining } from './syntax/optional-chaining';
+
 export { testGenerator } from './syntax/generator';
+export { testAsync } from './syntax/async';
 
 export { kebabCase } from 'lodash';
 export { merge, mergeAll } from 'lodash/fp';
 
-export { foo } from './foo';
+export { returnsTrue } from './returnsTrue';
 
 export const sum = (a: number, b: number) => {
   if ('development' === process.env.NODE_ENV) {
-    console.log('fuck');
+    console.log('dev only output');
   }
   return a + b;
 };

test/e2e/fixtures/build-default/src/returnsTrue.ts

@@ -0,0 +1,2 @@
+// this just ensure a simple import works
+export const returnsTrue = () => true;

test/e2e/fixtures/build-default/src/syntax/async.ts

@@ -1,6 +1,11 @@
 // regression test for async/await
 // code inspired by https://github.com/formium/tsdx/issues/869
+let shouldBeTrue = false;
 (async () => {
+  shouldBeTrue = true; // a side effect to make sure this is output
   await Promise.resolve();
-  console.log('a side effect to make sure this is output');
 })();
+
+export async function testAsync() {
+  return await Promise.resolve(shouldBeTrue);
+}

test/e2e/fixtures/build-default/src/syntax/generator.ts

@@ -1,4 +1,4 @@
 // regression test for generators
 export function* testGenerator() {
-  return yield 'blah';
+  return yield true;
 }

test/e2e/fixtures/build-default/src/syntax/nullish-coalescing.ts

@@ -1,5 +1,9 @@
+// regression test for nullish coalescing syntax
 // https://www.typescriptlang.org/docs/handbook/release-notes/typescript-3-7.html#nullish-coalescing
 
-const bar = () => {};
-const foo = false;
-export const x = foo ?? bar();
+export function testNullishCoalescing() {
+  const someFunc = () => 'some string';
+  const someFalse = false;
+  const shouldBeTrue = !(someFalse ?? someFunc());
+  return shouldBeTrue;
+}

test/e2e/fixtures/build-default/src/syntax/optional-chaining.ts

@@ -1,3 +1,8 @@
+// regression test for optional chaining syntax
 // https://www.typescriptlang.org/docs/handbook/release-notes/typescript-3-7.html#optional-chaining
 
-export const foo = (foo?: { bar: string }) => foo?.bar || 'bar';
+export function testOptionalChaining() {
+  const someObj: { someOptionalString?: string } = {};
+  const shouldBeTrue = someObj?.someOptionalString || true;
+  return shouldBeTrue;
+}

test/e2e/fixtures/build-withTsconfig/src/index.ts

@@ -1,6 +1,6 @@
 export const sum = (a: number, b: number) => {
   if ('development' === process.env.NODE_ENV) {
-    console.log('fuck');
+    console.log('dev only output');
   }
   return a + b;
 };

test/e2e/tsdx-build-default.test.ts

@@ -41,12 +41,19 @@ describe('tsdx build :: zero-config defaults', () => {
     expect(output.code).toBe(0);
   });
 
-  it('should create the library correctly', () => {
+  it('should create the library correctly', async () => {
     const output = execWithCache('node ../dist/index.js build');
 
     const lib = require(`../../${stageName}/dist`);
-    expect(lib.foo()).toBe('bar');
-    expect(lib.__esModule).toBe(true);
+    expect(lib.returnsTrue()).toBe(true);
+    expect(lib.__esModule).toBe(true); // test that ESM -> CJS interop was output
+
+    // syntax tests
+    expect(lib.testNullishCoalescing()).toBe(true);
+    expect(lib.testOptionalChaining()).toBe(true);
+    // can't use an async generator in Jest yet, so use next().value instead of yield
+    expect(lib.testGenerator().next().value).toBe(true);
+    expect(await lib.testAsync()).toBe(true);
 
     expect(output.code).toBe(0);
   });
@@ -59,14 +66,6 @@ describe('tsdx build :: zero-config defaults', () => {
     expect(matched).toBeTruthy();
   });
 
-  it('should not bundle regeneratorRuntime when targeting Node', () => {
-    const output = execWithCache('node ../dist/index.js build --target node');
-    expect(output.code).toBe(0);
-
-    const matched = grep(/regeneratorRuntime = r/, ['dist/build-default.*.js']);
-    expect(matched).toBeFalsy();
-  });
-
   it('should use lodash for the CJS build', () => {
     const output = execWithCache('node ../dist/index.js build');
     expect(output.code).toBe(0);

test/e2e/tsdx-build-options.test.ts

@@ -1,7 +1,7 @@
 import * as shell from 'shelljs';
 
 import * as util from '../utils/fixture';
-import { execWithCache } from '../utils/shell';
+import { execWithCache, grep } from '../utils/shell';
 
 shell.config.silent = false;
 
@@ -47,6 +47,14 @@ describe('tsdx build :: options', () => {
     expect(output.code).toBe(0);
   });
 
+  it('should not bundle regeneratorRuntime when targeting Node', () => {
+    const output = execWithCache('node ../dist/index.js build --target node');
+    expect(output.code).toBe(0);
+
+    const matched = grep(/regeneratorRuntime = r/, ['dist/build-default.*.js']);
+    expect(matched).toBeFalsy();
+  });
+
   afterAll(() => {
     util.teardownStage(stageName);
   });

test/integration/fixtures/build-options/src/index.ts

@@ -6,7 +6,7 @@ warning(true, 'warning - water is wet');
 
 export const sum = (a: number, b: number) => {
   if ('development' === process.env.NODE_ENV) {
-    console.log('fuck');
+    console.log('dev only output');
   }
   return a + b;
 };

test/integration/fixtures/build-withBabel/src/index.ts

@@ -2,7 +2,7 @@ export { Title } from './styled';
 
 export const sum = (a: number, b: number) => {
   if ('development' === process.env.NODE_ENV) {
-    console.log('fuck');
+    console.log('dev only output');
   }
   return a + b;
 };

test/integration/fixtures/build-withConfig/src/index.ts

@@ -2,7 +2,7 @@ import './index.css';
 
 export const sum = (a: number, b: number) => {
   if ('development' === process.env.NODE_ENV) {
-    console.log('fuck');
+    console.log('dev only output');
   }
   return a + b;
 };