From d9e74f16dff14b86b07d88f5af1ac392777d11f7 Mon Sep 17 00:00:00 2001 From: Jake Champion Date: Wed, 7 Apr 2021 18:01:34 +0100 Subject: [PATCH] update fixtures to adhere to package.json.name specification --- test/integration/demo/fixtures/multiple-demos/package.json | 2 +- .../install/fixtures/no-npm-dependencies/package-lock.json | 4 ++-- .../install/fixtures/no-npm-dependencies/package.json | 2 +- .../install/fixtures/with-npm-dependencies/package-lock.json | 3 ++- .../install/fixtures/with-npm-dependencies/package.json | 1 + .../fixtures/with-npm-dependency-installed/package-lock.json | 4 ++-- .../test/fixtures/with-npm-dependency-installed/package.json | 2 +- .../integration/verify/fixtures/js-custom-eslint/package.json | 2 +- test/integration/verify/fixtures/js-es5/package.json | 2 +- test/integration/verify/fixtures/js-es6/package.json | 2 +- test/integration/verify/fixtures/js-es7/package.json | 2 +- test/integration/verify/fixtures/js-invalid/package.json | 2 +- .../verify/fixtures/js-npm-dependency/package.json | 2 +- test/integration/verify/fixtures/no-js-or-sass/package.json | 2 +- test/integration/verify/fixtures/no-readme/package.json | 2 +- .../verify/fixtures/readme-custom-remarkrc/package.json | 2 +- .../verify/fixtures/readme-invalid-name/package.json | 2 +- test/integration/verify/fixtures/readme-invalid/package.json | 2 +- .../verify/fixtures/readme-valid-lowercase/package.json | 2 +- .../verify/fixtures/readme-valid-uppercase/package.json | 2 +- .../verify/fixtures/sass-custom-config/package.json | 2 +- test/integration/verify/fixtures/sass-invalid/package.json | 2 +- .../verify/fixtures/sass-npm-dependency/package.json | 2 +- test/integration/verify/fixtures/sass/package.json | 2 +- test/integration/verify/verify.test.js | 2 +- test/unit/fixtures/verify/package-lock.json | 2 +- test/unit/fixtures/verify/src/js/error/package-lock.json | 2 +- test/unit/fixtures/verify/src/js/error/package.json | 1 + test/unit/fixtures/verify/src/js/warning/package-lock.json | 2 +- test/unit/fixtures/verify/src/js/warning/package.json | 1 + 30 files changed, 33 insertions(+), 29 deletions(-) diff --git a/test/integration/demo/fixtures/multiple-demos/package.json b/test/integration/demo/fixtures/multiple-demos/package.json index e020ae11..a9c3326e 100644 --- a/test/integration/demo/fixtures/multiple-demos/package.json +++ b/test/integration/demo/fixtures/multiple-demos/package.json @@ -1,5 +1,5 @@ { - "name": "o-multiple-demos", + "name": "@financial-times/o-multiple-demos", "description": "a fixture to test the demo command of origami-build-tools", "main": "main.js" } diff --git a/test/integration/install/fixtures/no-npm-dependencies/package-lock.json b/test/integration/install/fixtures/no-npm-dependencies/package-lock.json index 5124b847..3c2a6e7a 100644 --- a/test/integration/install/fixtures/no-npm-dependencies/package-lock.json +++ b/test/integration/install/fixtures/no-npm-dependencies/package-lock.json @@ -1,10 +1,10 @@ { - "name": "no-dependencies", + "name": "@financial-times/no-dependencies", "lockfileVersion": 2, "requires": true, "packages": { "": { - "name": "no-dependencies" + "name": "@financial-times/no-dependencies" } } } diff --git a/test/integration/install/fixtures/no-npm-dependencies/package.json b/test/integration/install/fixtures/no-npm-dependencies/package.json index 7b556e72..e5b16ee7 100644 --- a/test/integration/install/fixtures/no-npm-dependencies/package.json +++ b/test/integration/install/fixtures/no-npm-dependencies/package.json @@ -1,3 +1,3 @@ { - "name": "no-dependencies" + "name": "@financial-times/no-dependencies" } diff --git a/test/integration/install/fixtures/with-npm-dependencies/package-lock.json b/test/integration/install/fixtures/with-npm-dependencies/package-lock.json index e2e67e75..d5ac5e52 100644 --- a/test/integration/install/fixtures/with-npm-dependencies/package-lock.json +++ b/test/integration/install/fixtures/with-npm-dependencies/package-lock.json @@ -1,9 +1,10 @@ { - "name": "with-npm-dependencies", + "name": "@financial-times/with-npm-dependencies", "lockfileVersion": 2, "requires": true, "packages": { "": { + "name": "@financial-times/with-npm-dependencies", "dependencies": { "lodash": "*" } diff --git a/test/integration/install/fixtures/with-npm-dependencies/package.json b/test/integration/install/fixtures/with-npm-dependencies/package.json index 6223545a..ee06cfe1 100644 --- a/test/integration/install/fixtures/with-npm-dependencies/package.json +++ b/test/integration/install/fixtures/with-npm-dependencies/package.json @@ -1,4 +1,5 @@ { + "name": "@financial-times/with-npm-dependencies", "type": "module", "dependencies": { "lodash": "*" diff --git a/test/integration/test/fixtures/with-npm-dependency-installed/package-lock.json b/test/integration/test/fixtures/with-npm-dependency-installed/package-lock.json index 5b7a1b63..a8b31379 100644 --- a/test/integration/test/fixtures/with-npm-dependency-installed/package-lock.json +++ b/test/integration/test/fixtures/with-npm-dependency-installed/package-lock.json @@ -1,10 +1,10 @@ { - "name": "test-component", + "name": "@financial-times/test-component", "lockfileVersion": 2, "requires": true, "packages": { "": { - "name": "test-component", + "name": "@financial-times/test-component", "dependencies": { "o-test-component": "Financial-Times/o-test-component#v1.0.33" } diff --git a/test/integration/test/fixtures/with-npm-dependency-installed/package.json b/test/integration/test/fixtures/with-npm-dependency-installed/package.json index 5ec08eda..e9248631 100644 --- a/test/integration/test/fixtures/with-npm-dependency-installed/package.json +++ b/test/integration/test/fixtures/with-npm-dependency-installed/package.json @@ -1,5 +1,5 @@ { - "name": "test-component", + "name": "@financial-times/test-component", "type": "module", "dependencies": { "o-test-component": "Financial-Times/o-test-component#v1.0.33" diff --git a/test/integration/verify/fixtures/js-custom-eslint/package.json b/test/integration/verify/fixtures/js-custom-eslint/package.json index 08bad0fb..69a0d641 100644 --- a/test/integration/verify/fixtures/js-custom-eslint/package.json +++ b/test/integration/verify/fixtures/js-custom-eslint/package.json @@ -1,5 +1,5 @@ { - "name": "js-custom-eslint", + "name": "@financial-times/js-custom-eslint", "version": "1.0.0", "description": "for a fixture", "main": "main.js", diff --git a/test/integration/verify/fixtures/js-es5/package.json b/test/integration/verify/fixtures/js-es5/package.json index ac2a092c..8600fcff 100644 --- a/test/integration/verify/fixtures/js-es5/package.json +++ b/test/integration/verify/fixtures/js-es5/package.json @@ -1,5 +1,5 @@ { - "name": "test-component", + "name": "@financial-times/test-component", "description": "for a fixture", "keywords": [], "main": [ diff --git a/test/integration/verify/fixtures/js-es6/package.json b/test/integration/verify/fixtures/js-es6/package.json index ac2a092c..8600fcff 100644 --- a/test/integration/verify/fixtures/js-es6/package.json +++ b/test/integration/verify/fixtures/js-es6/package.json @@ -1,5 +1,5 @@ { - "name": "test-component", + "name": "@financial-times/test-component", "description": "for a fixture", "keywords": [], "main": [ diff --git a/test/integration/verify/fixtures/js-es7/package.json b/test/integration/verify/fixtures/js-es7/package.json index ac2a092c..8600fcff 100644 --- a/test/integration/verify/fixtures/js-es7/package.json +++ b/test/integration/verify/fixtures/js-es7/package.json @@ -1,5 +1,5 @@ { - "name": "test-component", + "name": "@financial-times/test-component", "description": "for a fixture", "keywords": [], "main": [ diff --git a/test/integration/verify/fixtures/js-invalid/package.json b/test/integration/verify/fixtures/js-invalid/package.json index fb878f03..82c825c0 100644 --- a/test/integration/verify/fixtures/js-invalid/package.json +++ b/test/integration/verify/fixtures/js-invalid/package.json @@ -1,5 +1,5 @@ { - "name": "js-invalid", + "name": "@financial-times/js-invalid", "description": "for a fixture", "keywords": [], "version": "1.0.0", diff --git a/test/integration/verify/fixtures/js-npm-dependency/package.json b/test/integration/verify/fixtures/js-npm-dependency/package.json index a4707eed..3d977fc7 100644 --- a/test/integration/verify/fixtures/js-npm-dependency/package.json +++ b/test/integration/verify/fixtures/js-npm-dependency/package.json @@ -1,5 +1,5 @@ { - "name": "test-component", + "name": "@financial-times/test-component", "description": "for a fixture", "keywords": [], "main": "main.js", diff --git a/test/integration/verify/fixtures/no-js-or-sass/package.json b/test/integration/verify/fixtures/no-js-or-sass/package.json index ea549490..aec6258f 100644 --- a/test/integration/verify/fixtures/no-js-or-sass/package.json +++ b/test/integration/verify/fixtures/no-js-or-sass/package.json @@ -1,5 +1,5 @@ { - "name": "no-js-or-sass", + "name": "@financial-times/no-js-or-sass", "version": "1.0.0", "description": "for a fixture", "keywords": [], diff --git a/test/integration/verify/fixtures/no-readme/package.json b/test/integration/verify/fixtures/no-readme/package.json index 3636206b..6bd94aef 100644 --- a/test/integration/verify/fixtures/no-readme/package.json +++ b/test/integration/verify/fixtures/no-readme/package.json @@ -1,5 +1,5 @@ { - "name": "no-readme", + "name": "@financial-times/no-readme", "version": "1.0.0", "description": "for a fixture", "keywords": [], diff --git a/test/integration/verify/fixtures/readme-custom-remarkrc/package.json b/test/integration/verify/fixtures/readme-custom-remarkrc/package.json index 84b0c8f5..ef9b82ba 100644 --- a/test/integration/verify/fixtures/readme-custom-remarkrc/package.json +++ b/test/integration/verify/fixtures/readme-custom-remarkrc/package.json @@ -1,5 +1,5 @@ { - "name": "test-component", + "name": "@financial-times/test-component", "description": "for a fixture", "keywords": [], "main": [], diff --git a/test/integration/verify/fixtures/readme-invalid-name/package.json b/test/integration/verify/fixtures/readme-invalid-name/package.json index 3636206b..6bd94aef 100644 --- a/test/integration/verify/fixtures/readme-invalid-name/package.json +++ b/test/integration/verify/fixtures/readme-invalid-name/package.json @@ -1,5 +1,5 @@ { - "name": "no-readme", + "name": "@financial-times/no-readme", "version": "1.0.0", "description": "for a fixture", "keywords": [], diff --git a/test/integration/verify/fixtures/readme-invalid/package.json b/test/integration/verify/fixtures/readme-invalid/package.json index 42a0afad..83697349 100644 --- a/test/integration/verify/fixtures/readme-invalid/package.json +++ b/test/integration/verify/fixtures/readme-invalid/package.json @@ -1,5 +1,5 @@ { - "name": "invalid-readme", + "name": "@financial-times/invalid-readme", "version": "1.0.0", "description": "for a fixture", "keywords": [], diff --git a/test/integration/verify/fixtures/readme-valid-lowercase/package.json b/test/integration/verify/fixtures/readme-valid-lowercase/package.json index 3636206b..6bd94aef 100644 --- a/test/integration/verify/fixtures/readme-valid-lowercase/package.json +++ b/test/integration/verify/fixtures/readme-valid-lowercase/package.json @@ -1,5 +1,5 @@ { - "name": "no-readme", + "name": "@financial-times/no-readme", "version": "1.0.0", "description": "for a fixture", "keywords": [], diff --git a/test/integration/verify/fixtures/readme-valid-uppercase/package.json b/test/integration/verify/fixtures/readme-valid-uppercase/package.json index 3636206b..6bd94aef 100644 --- a/test/integration/verify/fixtures/readme-valid-uppercase/package.json +++ b/test/integration/verify/fixtures/readme-valid-uppercase/package.json @@ -1,5 +1,5 @@ { - "name": "no-readme", + "name": "@financial-times/no-readme", "version": "1.0.0", "description": "for a fixture", "keywords": [], diff --git a/test/integration/verify/fixtures/sass-custom-config/package.json b/test/integration/verify/fixtures/sass-custom-config/package.json index 053acc49..9bfb7379 100644 --- a/test/integration/verify/fixtures/sass-custom-config/package.json +++ b/test/integration/verify/fixtures/sass-custom-config/package.json @@ -1,5 +1,5 @@ { - "name": "sass-custom-config", + "name": "@financial-times/sass-custom-config", "version": "1.0.0", "description": "for a fixture", "keywords": [], diff --git a/test/integration/verify/fixtures/sass-invalid/package.json b/test/integration/verify/fixtures/sass-invalid/package.json index 207d1d71..e87177bf 100644 --- a/test/integration/verify/fixtures/sass-invalid/package.json +++ b/test/integration/verify/fixtures/sass-invalid/package.json @@ -1,5 +1,5 @@ { - "name": "sass-invalid", + "name": "@financial-times/sass-invalid", "version": "1.0.0", "description": "for a fixture", "keywords": [], diff --git a/test/integration/verify/fixtures/sass-npm-dependency/package.json b/test/integration/verify/fixtures/sass-npm-dependency/package.json index da7cdbbc..7c8a511f 100644 --- a/test/integration/verify/fixtures/sass-npm-dependency/package.json +++ b/test/integration/verify/fixtures/sass-npm-dependency/package.json @@ -1,5 +1,5 @@ { - "name": "test-component", + "name": "@financial-times/test-component", "description": "for a fixture", "keywords": [], "type": "module", diff --git a/test/integration/verify/fixtures/sass/package.json b/test/integration/verify/fixtures/sass/package.json index 43d54a7a..87b1772f 100644 --- a/test/integration/verify/fixtures/sass/package.json +++ b/test/integration/verify/fixtures/sass/package.json @@ -1,5 +1,5 @@ { - "name": "test-component", + "name": "@financial-times/test-component", "description": "for a fixture", "keywords": [], "type": "module" diff --git a/test/integration/verify/verify.test.js b/test/integration/verify/verify.test.js index 1c5dd689..c8c157b7 100644 --- a/test/integration/verify/verify.test.js +++ b/test/integration/verify/verify.test.js @@ -71,7 +71,7 @@ describe('obt verify', function () { it('should warn', function () { return execa(obt, ['verify']).then(output => { - proclaim.include(output.stdout, 'expected "invalid-readme", got "not-the-component-name"'); + proclaim.include(output.stdout, 'expected "@financial-times/invalid-readme", got "not-the-component-name"'); }); }); }); diff --git a/test/unit/fixtures/verify/package-lock.json b/test/unit/fixtures/verify/package-lock.json index 5599e561..29a3f498 100644 --- a/test/unit/fixtures/verify/package-lock.json +++ b/test/unit/fixtures/verify/package-lock.json @@ -1,5 +1,5 @@ { - "name": "verify", + "name": "@financial-times/verify", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/test/unit/fixtures/verify/src/js/error/package-lock.json b/test/unit/fixtures/verify/src/js/error/package-lock.json index c8e0a76b..a6dcdc79 100644 --- a/test/unit/fixtures/verify/src/js/error/package-lock.json +++ b/test/unit/fixtures/verify/src/js/error/package-lock.json @@ -1,5 +1,5 @@ { - "name": "error", + "name": "@financial-times/error", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/test/unit/fixtures/verify/src/js/error/package.json b/test/unit/fixtures/verify/src/js/error/package.json index a146f0b7..d233776f 100644 --- a/test/unit/fixtures/verify/src/js/error/package.json +++ b/test/unit/fixtures/verify/src/js/error/package.json @@ -1,4 +1,5 @@ { + "name": "@financial-times/error", "devDependencies": { "eslint-config-origami-component": "^2.1.0" } diff --git a/test/unit/fixtures/verify/src/js/warning/package-lock.json b/test/unit/fixtures/verify/src/js/warning/package-lock.json index 41536915..80be3374 100644 --- a/test/unit/fixtures/verify/src/js/warning/package-lock.json +++ b/test/unit/fixtures/verify/src/js/warning/package-lock.json @@ -1,5 +1,5 @@ { - "name": "warning", + "name": "@financial-times/warning", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/test/unit/fixtures/verify/src/js/warning/package.json b/test/unit/fixtures/verify/src/js/warning/package.json index a146f0b7..fc3237de 100644 --- a/test/unit/fixtures/verify/src/js/warning/package.json +++ b/test/unit/fixtures/verify/src/js/warning/package.json @@ -1,4 +1,5 @@ { + "name": "@financial-times/warning", "devDependencies": { "eslint-config-origami-component": "^2.1.0" }