Add example tests when `init` generates a new express project #5

FrankEssenberger · 2019-10-16T14:38:58Z

Proposed Changes

If a fresh express project is created also two tests are added:

sample integration test: Starting the express app locally and doing a ping
sample unit test: Just a simple assertion

Also two jest configs are included for the unit and integration tests. The configs mainly set the reporting diretory to the S4hana_pipeline so that everything is in line with the pipeline.

Type of Changes

Bug Fix
New Feature
Documentation Update

Checklist

I have added tests that prove my fix is effective or that my feature works
~~- [ ] I have added necessary documentation~~

# Conflicts: # .github/workflows/nodejs.yml # .gitignore # .prettierrc # LICENSE # NOTICE # README.md # bin/run.cmd # jest.config.js # package-lock.json # package.json # src/commands/add-approuter.ts # src/commands/add-cx-server.ts # src/commands/help-page.ts # src/commands/init.ts # src/commands/package.ts # src/index.ts # src/templates/add-approuter/approuter/.npmrc # src/templates/add-approuter/approuter/manifest.yml.mu # src/templates/add-approuter/approuter/package.json # src/templates/add-approuter/approuter/xs-app.json.mu # src/templates/add-approuter/approuter/xs-security.json.mu # src/templates/add-cx-server/cx-server/cx-server # src/templates/add-cx-server/cx-server/cx-server.bat # src/templates/add-cx-server/cx-server/server.cfg # src/templates/init/.npmrc # src/templates/init/Jenkinsfile # src/templates/init/credentials.json # src/templates/init/deployment/.gitkeep # src/templates/init/manifest.yml.mu # src/templates/init/pipeline_config.yml.mu # src/templates/init/s4hana_pipeline/reports/.gitkeep # src/templates/init/s4hana_pipeline/reports/coverage-reports/.gitkeep # src/templates/init/systems.json # src/utils/copy-list.ts # src/utils/templates.ts # test/add-approuter.spec.ts # test/add-cx-server.spec.ts # test/e2e.spec.ts # test/express/app.js # test/express/package.json # test/express/public/stylesheets/style.css # test/express/routes/index.js # test/express/routes/users.js # test/express/views/error.jade # test/express/views/index.jade # test/express/views/layout.jade # test/help-page.spec.ts # test/init.spec.ts # test/nest/.gitignore # test/nest/.prettierrc # test/nest/README.md # test/nest/nest-cli.json # test/nest/package-lock.json # test/nest/package.json # test/nest/src/app.controller.spec.ts # test/nest/src/app.controller.ts # test/nest/src/app.module.ts # test/nest/src/app.service.ts # test/nest/src/main.ts # test/nest/test/app.e2e-spec.ts # test/nest/test/jest-e2e.json # test/nest/tsconfig.build.json # test/nest/tsconfig.json # test/nest/tslint.json # test/package.spec.ts # test/tsconfig.json # test/tslint.json # tsconfig.json # tslint.json

CLAassistant · 2019-10-16T14:53:25Z

All committers have signed the CLA.

florian-richter

Please consider my comments. Especially the TS vs JS for the express tests.

package.json

src/utils/initialization-helper.ts

src/utils/templates.ts

test/init.spec.ts

Co-Authored-By: Florian Richter <[email protected]>

License Co-Authored-By: Florian Richter <[email protected]>

Co-Authored-By: Florian Richter <[email protected]>

…dk-cli into addTestsFreshExpress

Co-Authored-By: Florian Richter <[email protected]>

# Conflicts: # package-lock.json # package.json

…stsFreshExpress # Conflicts: # package-lock.json # package.json

# Conflicts: # .gitignore # package.json

florian-richter

A minor point concerning the folder structure in the express project: I would prefer if all tests were in a test folder and had subfolders for integration and unit.

src/templates/init/jest.config.js

src/templates/init/test/sample-unit-test.spec.js

src/templates/init/test/test-file-info.ts

src/commands/init.ts

…stsFreshExpress # Conflicts: # jest.config.js # src/commands/init.ts # src/templates/init/jest.config.js # src/templates/init/jest.integration-test.config.js # src/templates/init/jest.unit-test.config.js # src/templates/init/test/test-file-info.ts

Co-Authored-By: Florian Richter <[email protected]>

florian-richter · 2019-10-22T07:43:30Z

src/commands/init.ts

+      const excludes = initializationType === InitializationType.existingProject ? ['test'] : [];
+      const files = readTemplates({
+        from: [path.resolve(__dirname, '..', 'templates', 'init')],
+        to: flags.projectDir,
+        exclude: excludes


Very minor thing but I would shorten initializationType to initType (same for the uppercase one) and move the initType === InitType.existingProject ? ['test'] : []; to line 72 so

exclude: initType === InitType.existingProject ? ['test'] : []

florian-richter · 2019-10-22T07:52:57Z

src/commands/init.ts

@@ -103,31 +95,43 @@ export default class Init extends Command {
    }
  }

-  private async initExpressProject() {
-    const { flags } = this.parse(Init);
+  private async determineInitializationType(flags: OutputFlags<typeof Init.flags>): Promise<InitializationType> {


I assume there are testing reasons why you pass flags as param instead of putting const { flags } = this.parse(Init); into the function?

I like passing the flags generally, but the type def does look nice. If we keep it as the parameters we should be consistent between all the methods and also put something like type Flags = OutputFlags<typeof Init.flags> somewhere to shorten the param def.

florian-richter

Very nice 🎉

FrankEssenberger added 8 commits October 15, 2019 17:08

first commit

2c68bfb

first commit

856ec41

linter test working

b862393

adjust gitignore

dbd614c

adjust gitignore

aa41fb5

remove comment

44b20db

remove comment

515976b

FrankEssenberger added 17 commits October 16, 2019 16:57

adjust permission

3b0025b

adjust permission 2

26f72c6

adjust permission

5ec3add

adjust permission

1008bbf

adjust permission

2e20568

chmod

2298583

more files

9dce1f4

more files

3d14a47

more files

b75030d

more files

1b7fb09

getting close

4d69f36

using find type file

f1c53ac

last files

ea7fd1d

increase timeout

d7c10b9

more logging

b7ad782

move to scope

2d927d4

tslint

2617d1b

FrankEssenberger requested review from mr-flannery and florian-richter October 17, 2019 08:49

florian-richter suggested changes Oct 17, 2019

View reviewed changes

remove typescript

2fd9464

FrankEssenberger and others added 18 commits October 17, 2019 16:49

Update package.json

88fff6e

Co-Authored-By: Florian Richter <[email protected]>

Update package.json

f9251c7

Co-Authored-By: Florian Richter <[email protected]>

Update package.json

a214fd8

License Co-Authored-By: Florian Richter <[email protected]>

Update package.json

99f794a

Co-Authored-By: Florian Richter <[email protected]>

Update test/init.spec.ts

f3f9e36

Co-Authored-By: Florian Richter <[email protected]>

florian remarks

7327742

Merge branch 'addTestsFreshExpress' of https://github.com/SAP/cloud-s…

8cbcb94

…dk-cli into addTestsFreshExpress

adjust signature

ed30a3b

Update package.json

645e1ab

Co-Authored-By: Florian Richter <[email protected]>

Update package-lock.json

207d3ab

Co-Authored-By: Florian Richter <[email protected]>

Merge remote-tracking branch 'origin/master' into addTestsFreshExpress

1822d1b

# Conflicts: # package-lock.json # package.json

merge master

ebff551

Merge remote-tracking branch 'origin/addTestsFreshExpress' into addTe…

2db8ecf

…stsFreshExpress # Conflicts: # package-lock.json # package.json

remeve unnecessary jest setup

65aee66

Fix formatting

11de062

Merge branch 'master' into addTestsFreshExpress

b935093

# Conflicts: # .gitignore # package.json

Update and fix versions

fbd8ef1

Add quoteProp to .prettierrc

20b7c51

florian-richter suggested changes Oct 21, 2019

View reviewed changes

src/templates/init/jest.config.js Outdated Show resolved Hide resolved

src/templates/init/test/sample-unit-test.spec.js Outdated Show resolved Hide resolved

src/templates/init/test/test-file-info.ts Outdated Show resolved Hide resolved

src/commands/init.ts Outdated Show resolved Hide resolved

FrankEssenberger and others added 5 commits October 21, 2019 16:24

more comments florian

9ce9c63

Update src/templates/init/test/sample-unit-test.spec.js

268bcf5

Co-Authored-By: Florian Richter <[email protected]>

florians remakrs

7b90fd3

some more remarks

85767dd

florian-richter reviewed Oct 22, 2019

View reviewed changes

some more remarks

0e40d39

florian-richter approved these changes Oct 22, 2019

View reviewed changes

florian-richter merged commit 61a895f into master Oct 22, 2019

florian-richter deleted the addTestsFreshExpress branch October 22, 2019 12:33

florian-richter changed the title ~~Add tests fresh express~~ Add example tests when init generates a new express project Oct 22, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add example tests when `init` generates a new express project #5

Add example tests when `init` generates a new express project #5

FrankEssenberger commented Oct 16, 2019 •

edited

Loading

CLAassistant commented Oct 16, 2019 •

edited

Loading

florian-richter left a comment

florian-richter left a comment

florian-richter Oct 22, 2019

florian-richter Oct 22, 2019

florian-richter left a comment

Add example tests when init generates a new express project #5

Add example tests when init generates a new express project #5

Conversation

FrankEssenberger commented Oct 16, 2019 • edited Loading

Proposed Changes

Type of Changes

Checklist

CLAassistant commented Oct 16, 2019 • edited Loading

florian-richter left a comment

Choose a reason for hiding this comment

florian-richter left a comment

Choose a reason for hiding this comment

florian-richter Oct 22, 2019

Choose a reason for hiding this comment

florian-richter Oct 22, 2019

Choose a reason for hiding this comment

florian-richter left a comment

Choose a reason for hiding this comment

Add example tests when `init` generates a new express project #5

Add example tests when `init` generates a new express project #5

FrankEssenberger commented Oct 16, 2019 •

edited

Loading

CLAassistant commented Oct 16, 2019 •

edited

Loading