Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add rush test command #60

Merged
merged 6 commits into from
Jul 1, 2019
Merged

Add rush test command #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
53814c9
Copy whole backend directory for tests
Jul 1, 2019
1dcf679
Use jest-standard-reporter
Jul 1, 2019
8a58c71
Add rush test command
Jul 1, 2019
a2f9902
Use rush test command
Jul 1, 2019
80e7c08
Rush change
Jul 1, 2019
248607b
CR: Document disabled parallelism
Jul 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,7 @@ jobs:
# command: npm run lint
- run:
name: Run tests
command: |
for f in $(find . -maxdepth 2 -name package.json); do
project=$(dirname $f)
echo Testing $project
(cd $project && npm test) || exit 1
done
command: node common/scripts/install-run-rush.js test --verbose
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is much nicer. Might even work with Windows!

workflows:
version: 2
build_and_test:
Expand Down
1 change: 1 addition & 0 deletions babel-macro/jest.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ module.exports = {
"roots": [
"<rootDir>/dist/test"
],
"reporters": ["jest-standard-reporter"],
"modulePaths": [
"<rootDir>/dist/"
],
Expand Down
3 changes: 2 additions & 1 deletion babel-macro/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
],
"description": "",
"scripts": {
"build": "rm -rf dist && tsc && cp -r src/test/backend/ dist/test/",
"build": "rm -rf dist && tsc && cp -r src/test/backend dist/test/",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't modern tscs clean up enough to do this nicely and quickly?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tsc does not clean up, so various confusing files collect up over time.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But the behaviour this implements is confusing Seems like we're trying to fix microsoft/TypeScript#30602 en passant. It will confuse various tools (such as anything that looks at file mtimes. It discourages tsc -w.

I don't want to second-guess TypeScript.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is not an uncommon pattern (e.g. https://github.com/ReactiveX/rxjs-tslint/blob/11d64176b717c5029c212d883bfc2dfc5d14d06d/package.json#L14), I just copied it from somewhere - this is just the most paranoid version of starting from a clean slate. I run tsc -w without cleaning directory during development but I agree it's not the best solution.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why did you make this change? it can cause a dist/test/backend/backend to be created

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was a bug - the tests did not pass on mac before. See this example - for a cross-platform copying of a directory contents need to cp -a source/. destination, or in this example cp -r src/test/backend/. dist/test/backend - this only writes backend once by omitting the trailing slash which causes the Mac OS behavior.

"test": "jest"
},
"author": "",
Expand All @@ -22,6 +22,7 @@
"@types/node": "^10.14.9",
"babel-plugin-tester": "^6.4.0",
"jest": "^24.8.0",
"jest-standard-reporter": "^1.0.1",
"typescript": "^3.5.2"
}
}
11 changes: 11 additions & 0 deletions common/changes/@binaris/shift-babel-macro/test-command_2019-07-01-09-13.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"comment": "",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Standard rush stuff...

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A dummy rush change since this isn't really a patch change which requires a release and only the testing infrastructure.

"packageName": "@binaris/shift-babel-macro",
"type": "none"
}
],
"packageName": "@binaris/shift-babel-macro",
"email": "vladimir@binaris.com"
}
11 changes: 11 additions & 0 deletions common/config/rush/command-line.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,17 @@
// */
// "shellCommand": "node common/scripts/my-global-command.js"
// }
{
"commandKind": "bulk",
"name": "test",
"summary": "Run all tests",
// disable parallelism for tests
// 1. Test output becomes interleaved and harder to search for errors
// 2. Microsoft example uses parallelism of 1 (possibly due to 1.)
// 3. Testing frameworks (Jest, AVA) have number-of-cores parallelism, allowing parallelism between projects
// might result in additional flakiness due to starvation
"enableParallelism": false
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not? (It would be disappointing if Rush is incapable of re-ordering the output to get this to print errors nicely.)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is disappointing, really. I documented this and other reasons why it's serial now.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can this be true?

}
],

/**
Expand Down
102 changes: 51 additions & 51 deletions common/config/rush/shrinkwrap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ dependencies:
express: 4.17.1
http-proxy-middleware: 0.19.1
jest: 24.8.0
jest-standard-reporter: 1.0.1
leveldown: 5.1.0
levelup: 4.0.2
mkdirp: 0.5.1
Expand Down Expand Up @@ -82,27 +83,6 @@ packages:
'@babel/core': ^7.0.0-0
resolution:
integrity: sha512-XGr5YjQSjgTa6OzQZY57FAJsdeVSAKR/u/KA5exWIz66IKtv/zXtHy+fIZcMry/EgYegwuHE7vzGnrFhjdIAsQ==
/@babel/cli/7.4.4/@babel!core@7.4.5:
dependencies:
'@babel/core': 7.4.5
commander: 2.20.0
convert-source-map: 1.6.0
fs-readdir-recursive: 1.1.0
glob: 7.1.4
lodash: 4.17.11
mkdirp: 0.5.1
output-file-sync: 2.0.1
slash: 2.0.0
source-map: 0.5.7
dev: false
hasBin: true
id: registry.npmjs.org/@babel/cli/7.4.4
optionalDependencies:
chokidar: 2.1.6
peerDependencies:
'@babel/core': ^7.0.0-0
resolution:
integrity: sha512-XGr5YjQSjgTa6OzQZY57FAJsdeVSAKR/u/KA5exWIz66IKtv/zXtHy+fIZcMry/EgYegwuHE7vzGnrFhjdIAsQ==
/@babel/code-frame/7.0.0:
dependencies:
'@babel/highlight': 7.0.0
Expand Down Expand Up @@ -321,7 +301,6 @@ packages:
integrity: sha512-4sfBOJt58sEo9a2BQXnZq+Q3ZTSAUXyK3E30o36BOGnJ+tvJ6YSxF0PG6kERvbeISgProodWuI9UVG3/FMY6iw==
/@babel/plugin-transform-modules-commonjs/7.4.4/@babel!core@7.4.5:
dependencies:
'@babel/core': 7.4.5
'@babel/helper-module-transforms': 7.4.4
'@babel/helper-plugin-utils': 7.0.0
'@babel/helper-simple-access': 7.1.0
Expand Down Expand Up @@ -481,7 +460,7 @@ packages:
/@jest/source-map/24.3.0:
dependencies:
callsites: 3.1.0
graceful-fs: 4.1.15
graceful-fs: 4.2.0
source-map: 0.6.1
dev: false
engines:
Expand Down Expand Up @@ -1221,7 +1200,7 @@ packages:
component-emitter: 1.3.0
define-property: 1.0.0
isobject: 3.0.1
mixin-deep: 1.3.1
mixin-deep: 1.3.2
pascalcase: 0.1.1
dev: false
engines:
Expand Down Expand Up @@ -1361,9 +1340,9 @@ packages:
get-value: 2.0.6
has-value: 1.0.0
isobject: 3.0.1
set-value: 2.0.0
set-value: 2.0.1
to-object-path: 0.3.0
union-value: 1.0.0
union-value: 1.0.1
unset-value: 1.0.0
dev: false
engines:
Expand Down Expand Up @@ -2738,6 +2717,10 @@ packages:
dev: false
resolution:
integrity: sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==
/graceful-fs/4.2.0:
dev: false
resolution:
integrity: sha512-jpSvDPV4Cq/bgtpndIWbI5hmYxhQGHPC4d4cqBPb4DLniCfhJokdXhwhaDuLBGLQdvvRum/UiX6ECVIPvDXqdg==
/growly/1.3.0:
dev: false
resolution:
Expand Down Expand Up @@ -3759,6 +3742,16 @@ packages:
node: '>= 6'
resolution:
integrity: sha512-5ehtWoc8oU9/cAPe6fez6QofVJLBKyqkY2+TlKTOf0VllBB/mqUNdARdcjlZrs9F1Cv+/HKoCS/BknT0+tmfPg==
/jest-standard-reporter/1.0.1:
dependencies:
chalk: 2.4.2
jest-util: 24.8.0
path: 0.12.7
slash: 2.0.0
string-length: 2.0.0
dev: false
resolution:
integrity: sha512-m+85eu8KNp3fLpMMyS6Kx+Tbt3j6ZjhcUvQvN1Jk+uvaskpKBb0Cle+vIwhqzLNQps2XymrdEQcy3weM1kvLYQ==
/jest-util/24.8.0:
dependencies:
'@jest/console': 24.7.1
Expand All @@ -3768,7 +3761,7 @@ packages:
'@jest/types': 24.8.0
callsites: 3.1.0
chalk: 2.4.2
graceful-fs: 4.1.15
graceful-fs: 4.2.0
is-ci: 2.0.0
mkdirp: 0.5.1
slash: 2.0.0
Expand Down Expand Up @@ -4431,16 +4424,15 @@ packages:
dev: false
resolution:
integrity: sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
/mixin-deep/1.3.1:
/mixin-deep/1.3.2:
dependencies:
for-in: 1.0.2
is-extendable: 1.0.1
deprecated: 'Critical bug fixed in v2.0.1, please upgrade to the latest version.'
dev: false
engines:
node: '>=0.10.0'
resolution:
integrity: sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==
integrity: sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==
/mkdirp/0.5.1:
dependencies:
minimist: 0.0.8
Expand Down Expand Up @@ -4937,6 +4929,13 @@ packages:
node: '>=4'
resolution:
integrity: sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==
/path/0.12.7:
dependencies:
process: 0.11.10
util: 0.10.4
dev: false
resolution:
integrity: sha1-1NwqUGxM4hl+tIHr/NWzbAFAsQ8=
/performance-now/2.1.0:
dev: false
resolution:
Expand Down Expand Up @@ -5063,6 +5062,12 @@ packages:
dev: false
resolution:
integrity: sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
/process/0.11.10:
dev: false
engines:
node: '>= 0.6.0'
resolution:
integrity: sha1-czIwDoQBYb2j5podHZGn1LwW8YI=
/prompts/2.1.0:
dependencies:
kleur: 3.0.3
Expand Down Expand Up @@ -5610,30 +5615,17 @@ packages:
dev: false
resolution:
integrity: sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
/set-value/0.4.3:
dependencies:
extend-shallow: 2.0.1
is-extendable: 0.1.1
is-plain-object: 2.0.4
to-object-path: 0.3.0
deprecated: 'Critical bug fixed in v3.0.1, please upgrade to the latest version.'
dev: false
engines:
node: '>=0.10.0'
resolution:
integrity: sha1-fbCPnT0i3H945Trzw79GZuzfzPE=
/set-value/2.0.0:
/set-value/2.0.1:
dependencies:
extend-shallow: 2.0.1
is-extendable: 0.1.1
is-plain-object: 2.0.4
split-string: 3.1.0
deprecated: 'Critical bug fixed in v3.0.1, please upgrade to the latest version.'
dev: false
engines:
node: '>=0.10.0'
resolution:
integrity: sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==
integrity: sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==
/setprototypeof/1.1.1:
dev: false
resolution:
Expand Down Expand Up @@ -6214,17 +6206,17 @@ packages:
node: '>=4'
resolution:
integrity: sha512-L5RAqCfXqAwR3RriF8pM0lU0w4Ryf/GgzONwi6KnL1taJQa7x1TCxdJnILX59WIGOwR57IVxn7Nej0fz1Ny6fw==
/union-value/1.0.0:
/union-value/1.0.1:
dependencies:
arr-union: 3.1.0
get-value: 2.0.6
is-extendable: 0.1.1
set-value: 0.4.3
set-value: 2.0.1
dev: false
engines:
node: '>=0.10.0'
resolution:
integrity: sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=
integrity: sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==
/unique-string/1.0.0:
dependencies:
crypto-random-string: 1.0.0
Expand Down Expand Up @@ -6349,6 +6341,12 @@ packages:
dev: false
resolution:
integrity: sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==
/util/0.10.4:
dependencies:
inherits: 2.0.3
dev: false
resolution:
integrity: sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==
/utils-merge/1.0.1:
dev: false
engines:
Expand Down Expand Up @@ -6588,11 +6586,12 @@ packages:
babel-plugin-macros: 2.6.1
babel-plugin-tester: 6.4.0
jest: 24.8.0
jest-standard-reporter: 1.0.1
typescript: 3.5.2
dev: false
name: '@rush-temp/shift-babel-macro'
resolution:
integrity: sha512-0eCTeD0ffHhmpZ8/oDyBLmr4rxofgrdaiNYWy+4tOsKRDEYLg+NcszWrQbwEk5M5RHmX7627s7QGXfoRJKRtnA==
integrity: sha512-17wB8yfeaUyWU6WlHCib/YP4fMR//rSqnxVCTt78zEy3zgXfkWhQxs2J/phOW88xdH+6qvmqjn6GZBC566768g==
tarball: 'file:projects/shift-babel-macro.tgz'
version: 0.0.0
'file:projects/shift-db.tgz':
Expand Down Expand Up @@ -6622,9 +6621,9 @@ packages:
version: 0.0.0
'file:projects/shift-local-proxy.tgz':
dependencies:
'@babel/cli': /@babel/cli/7.4.4/@babel!core@7.4.5
'@babel/cli': 7.4.4
'@babel/core': 7.4.5
'@babel/plugin-transform-modules-commonjs': /@babel/plugin-transform-modules-commonjs/7.4.4/@babel!core@7.4.5
'@babel/plugin-transform-modules-commonjs': 7.4.4
'@types/babel__core': 7.1.2
'@types/express': 4.17.0
'@types/http-proxy-middleware': 0.19.2
Expand Down Expand Up @@ -6700,6 +6699,7 @@ specifiers:
express: ^4.17.1
http-proxy-middleware: ^0.19.1
jest: ^24.8.0
jest-standard-reporter: ^1.0.1
leveldown: ^5.1.0
levelup: ^4.0.2
mkdirp: ^0.5.1
Expand Down