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

Node functional test improvements #9437

Merged
merged 7 commits into from
Nov 15, 2024
Merged

Node functional test improvements #9437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ff835ae
test(node): Remove an incorrect replacement
fviernau Nov 15, 2024
0d77165
test(npm): Rename the `package-lock` project to `project-with-lockfile`
fviernau Nov 15, 2024
14e114e
test(npm): Sort the dependencies of `project-with-lockfile`
fviernau Nov 15, 2024
23bd978
test(yarn): Align a test case name with analog tests for other managers
fviernau Nov 15, 2024
d74413f
test(node): Align `project-with-lockfile` dependencies
fviernau Nov 15, 2024
7049492
test(node): Align the metadata of the `project-with-lockfile`
fviernau Nov 15, 2024
205bcf5
feat(yarn2): Support parsing the project's `authors`
fviernau Nov 15, 2024
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
2 changes: 1 addition & 1 deletion ...etic/npm/package-lock-expected-output.yml → ...project-with-lockfile-expected-output.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
project:
id: "NPM::<REPLACE_PROJECT_NAME>:1.0.0"
id: "NPM::npm-package-lock:1.0.0"
definition_file_path: "<REPLACE_DEFINITION_FILE_PATH>"
authors:
- "The Author"
Expand Down
0 ...thetic/npm/package-lock/package-lock.json → ...m/project-with-lockfile/package-lock.json
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...s/synthetic/npm/package-lock/package.json → ...ic/npm/project-with-lockfile/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
"author": "The Author <the.author@mail.example> (https://www.the.author.example/index.html)",
"private": true,
"dependencies": {
"long": "^3.2.0",
"cheerio": "1.0.0-rc.1",
"long": "^3.2.0",
Copy link
Member

Choose a reason for hiding this comment

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

Please explain in the commit message why these are reordered, and to which order. I guess to have alphabetical ordering, but why is that important here? Just for readability / consistency, or something else?

Maybe instead of "re-order" simply say "sort" to make things clearer?

"web-animations-js": "github:web-animations/web-animations-js#2.3.2"
},
"devDependencies": {
Expand Down
31 changes: 31 additions & 0 deletions ...node/src/funTest/assets/projects/synthetic/pnpm/project-with-lockfile-expected-output.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
project:
id: "PNPM::pnpm-package-with-lockfile:1.0.0"
definition_file_path: "<REPLACE_DEFINITION_FILE_PATH>"
authors:
Copy link
Member

Choose a reason for hiding this comment

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

Commit message typo in "comparision".

- "The Author"
declared_licenses:
- "Apache-2.0"
declared_licenses_processed:
Expand Down Expand Up @@ -71,6 +73,7 @@ project:
- id: "NPM::promise:7.3.1"
dependencies:
- id: "NPM::asap:2.0.6"
- id: "NPM::web-animations-js:2.3.2"
- name: "devDependencies"
dependencies:
- id: "NPM::cson:4.1.0"
Expand Down Expand Up @@ -1140,6 +1143,34 @@ packages:
url: "https://github.com/TooTallNate/util-deprecate.git"
revision: "475fb6857cd23fafff20c1be846c1350abf8e6d4"
path: ""
- id: "NPM::web-animations-js:2.3.2"
purl: "pkg:npm/web-animations-js@2.3.2"
declared_licenses:
- "Apache-2.0"
declared_licenses_processed:
spdx_expression: "Apache-2.0"
description: "JavaScript implementation of the Web Animations API"
homepage_url: "https://github.com/web-animations"
binary_artifact:
url: ""
hash:
value: ""
algorithm: ""
source_artifact:
url: "https://registry.npmjs.org/web-animations-js/-/web-animations-js-2.3.2.tgz"
hash:
value: "a51963a359c543f97b47c7d4bc2d811f9fc9e153"
algorithm: "SHA-1"
vcs:
type: "Git"
url: "https://github.com/web-animations/web-animations-js.git"
revision: "64d83730282fdbce733460d44be52c132d6c04e9"
path: ""
vcs_processed:
type: "Git"
url: "https://github.com/web-animations/web-animations-js.git"
revision: "64d83730282fdbce733460d44be52c132d6c04e9"
path: ""
- id: "NPM:@types:node:18.0.6"
purl: "pkg:npm/%40types/node@18.0.6"
declared_licenses:
Expand Down
4 changes: 3 additions & 1 deletion ...nagers/node/src/funTest/assets/projects/synthetic/pnpm/project-with-lockfile/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,12 @@
"url": "https://github.com/oss-review-toolkit/ort.git"
},
"license": "Apache-2.0",
"author": "The Author <the.author@mail.example> (https://www.the.author.example/index.html)",
"private": true,
"dependencies": {
"cheerio": "1.0.0-rc.1",
"long": "^3.2.0"
"long": "^3.2.0",
"web-animations-js": "github:web-animations/web-animations-js#2.3.2"
},
"devDependencies": {
"cson": "~4.1.0"
Expand Down
9 changes: 9 additions & 0 deletions ...gers/node/src/funTest/assets/projects/synthetic/pnpm/project-with-lockfile/pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

31 changes: 31 additions & 0 deletions ...node/src/funTest/assets/projects/synthetic/yarn/project-with-lockfile-expected-output.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
project:
id: "Yarn::yarn-package-with-lockfile:1.0.0"
definition_file_path: "<REPLACE_DEFINITION_FILE_PATH>"
authors:
- "The Author"
declared_licenses:
- "Apache-2.0"
declared_licenses_processed:
Expand Down Expand Up @@ -71,6 +73,7 @@ project:
- id: "NPM::promise:7.3.1"
dependencies:
- id: "NPM::asap:2.0.6"
- id: "NPM::web-animations-js:2.3.2"
- name: "devDependencies"
dependencies:
- id: "NPM::cson:4.1.0"
Expand Down Expand Up @@ -1132,6 +1135,34 @@ packages:
url: "https://github.com/TooTallNate/util-deprecate.git"
revision: "475fb6857cd23fafff20c1be846c1350abf8e6d4"
path: ""
- id: "NPM::web-animations-js:2.3.2"
purl: "pkg:npm/web-animations-js@2.3.2"
declared_licenses:
- "Apache-2.0"
declared_licenses_processed:
spdx_expression: "Apache-2.0"
description: "JavaScript implementation of the Web Animations API"
homepage_url: "https://github.com/web-animations"
binary_artifact:
url: ""
hash:
value: ""
algorithm: ""
source_artifact:
url: "https://registry.npmjs.org/web-animations-js/-/web-animations-js-2.3.2.tgz"
hash:
value: "a51963a359c543f97b47c7d4bc2d811f9fc9e153"
algorithm: "SHA-1"
vcs:
type: "Git"
url: "https://github.com/web-animations/web-animations-js.git"
revision: "64d83730282fdbce733460d44be52c132d6c04e9"
path: ""
vcs_processed:
type: "Git"
url: "https://github.com/web-animations/web-animations-js.git"
revision: "64d83730282fdbce733460d44be52c132d6c04e9"
path: ""
- id: "NPM:@types:node:12.6.8"
purl: "pkg:npm/%40types/node@12.6.8"
declared_licenses:
Expand Down
4 changes: 3 additions & 1 deletion ...nagers/node/src/funTest/assets/projects/synthetic/yarn/project-with-lockfile/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,12 @@
"url": "https://github.com/oss-review-toolkit/ort.git"
},
"license": "Apache-2.0",
"author": "The Author <the.author@mail.example> (https://www.the.author.example/index.html)",
"private": true,
"dependencies": {
"cheerio": "1.0.0-rc.1",
"long": "^3.2.0",
"cheerio": "1.0.0-rc.1"
"web-animations-js": "github:web-animations/web-animations-js#2.3.2"
},
"devDependencies": {
"cson": "~4.1.0"
Expand Down
Loading
Loading