add integration test for patch-parse-failure

ds300 · ds300 · commit 6f6c81f647e8 · 2019-03-24T13:44:13.000+01:00
diff --git a/integration-tests/adding-and-deleting-files/adding-and-deleting-files.test.ts b/integration-tests/adding-and-deleting-files/adding-and-deleting-files.test.ts
@@ -1,3 +1,6 @@
 import { runIntegrationTest } from "../runIntegrationTest"
 
-runIntegrationTest("adding-and-deleting-files", false)
+runIntegrationTest({
+  projectName: "adding-and-deleting-files",
+  shouldProduceSnapshots: false,
+})
diff --git a/integration-tests/broken-patch-file/broken-patch-file.test.ts b/integration-tests/broken-patch-file/broken-patch-file.test.ts
@@ -1,2 +1,5 @@
 import { runIntegrationTest } from "../runIntegrationTest"
-runIntegrationTest("broken-patch-file", true)
+runIntegrationTest({
+  projectName: "broken-patch-file",
+  shouldProduceSnapshots: true,
+})
diff --git a/integration-tests/custom-patch-dir/custom-patch-dir.test.ts b/integration-tests/custom-patch-dir/custom-patch-dir.test.ts
@@ -1,2 +1,5 @@
 import { runIntegrationTest } from "../runIntegrationTest"
-runIntegrationTest("custom-patch-dir", false)
+runIntegrationTest({
+  projectName: "custom-patch-dir",
+  shouldProduceSnapshots: false,
+})
diff --git a/integration-tests/custom-resolutions/custom-resolutions.test.ts b/integration-tests/custom-resolutions/custom-resolutions.test.ts
@@ -1,2 +1,5 @@
 import { runIntegrationTest } from "../runIntegrationTest"
-runIntegrationTest("custom-resolutions", false)
+runIntegrationTest({
+  projectName: "custom-resolutions",
+  shouldProduceSnapshots: false,
+})
diff --git a/integration-tests/delete-old-patch-files/delete-old-patch-files.test.ts b/integration-tests/delete-old-patch-files/delete-old-patch-files.test.ts
@@ -1,2 +1,5 @@
 import { runIntegrationTest } from "../runIntegrationTest"
-runIntegrationTest("delete-old-patch-files", false)
+runIntegrationTest({
+  projectName: "delete-old-patch-files",
+  shouldProduceSnapshots: false,
+})
diff --git a/integration-tests/delete-scripts/delete-scripts.test.ts b/integration-tests/delete-scripts/delete-scripts.test.ts
@@ -1,3 +1,6 @@
 import { runIntegrationTest } from "../runIntegrationTest"
 
-runIntegrationTest("delete-scripts")
+runIntegrationTest({
+  projectName: "delete-scripts",
+  shouldProduceSnapshots: true,
+})
diff --git a/integration-tests/file-mode-changes/file-mode-changes.test.ts b/integration-tests/file-mode-changes/file-mode-changes.test.ts
@@ -1,2 +1,5 @@
 import { runIntegrationTest } from "../runIntegrationTest"
-runIntegrationTest("file-mode-changes", true)
+runIntegrationTest({
+  projectName: "file-mode-changes",
+  shouldProduceSnapshots: true,
+})
diff --git a/integration-tests/happy-path-npm/happy-path-npm.test.ts b/integration-tests/happy-path-npm/happy-path-npm.test.ts
@@ -1,2 +1,5 @@
 import { runIntegrationTest } from "../runIntegrationTest"
-runIntegrationTest("happy-path-npm")
+runIntegrationTest({
+  projectName: "happy-path-npm",
+  shouldProduceSnapshots: true,
+})
diff --git a/integration-tests/happy-path-yarn/happy-path-yarn.test.ts b/integration-tests/happy-path-yarn/happy-path-yarn.test.ts
@@ -1,2 +1,5 @@
 import { runIntegrationTest } from "../runIntegrationTest"
-runIntegrationTest("happy-path-yarn")
+runIntegrationTest({
+  projectName: "happy-path-yarn",
+  shouldProduceSnapshots: true,
+})
diff --git a/integration-tests/ignore-whitespace/ignore-whitespace.test.ts b/integration-tests/ignore-whitespace/ignore-whitespace.test.ts
@@ -1,3 +1,6 @@
 import { runIntegrationTest } from "../runIntegrationTest"
 
-runIntegrationTest("ignore-whitespace")
+runIntegrationTest({
+  projectName: "ignore-whitespace",
+  shouldProduceSnapshots: true,
+})
diff --git a/integration-tests/include-exclude-paths/include-exclude-paths.test.ts b/integration-tests/include-exclude-paths/include-exclude-paths.test.ts
@@ -1,3 +1,6 @@
 import { runIntegrationTest } from "../runIntegrationTest"
 
-runIntegrationTest("include-exclude-paths")
+runIntegrationTest({
+  projectName: "include-exclude-paths",
+  shouldProduceSnapshots: true,
+})
diff --git a/integration-tests/include-exclude-regex-relativity/include-exclude-regex-relativity.test.ts b/integration-tests/include-exclude-regex-relativity/include-exclude-regex-relativity.test.ts
@@ -1,2 +1,5 @@
 import { runIntegrationTest } from "../runIntegrationTest"
-runIntegrationTest("include-exclude-regex-relativity", false)
+runIntegrationTest({
+  projectName: "include-exclude-regex-relativity",
+  shouldProduceSnapshots: false,
+})
diff --git a/integration-tests/nested-packages/nested-packages.test.ts b/integration-tests/nested-packages/nested-packages.test.ts
@@ -1,2 +1,5 @@
 import { runIntegrationTest } from "../runIntegrationTest"
-runIntegrationTest("nested-packages", true)
+runIntegrationTest({
+  projectName: "nested-packages",
+  shouldProduceSnapshots: true,
+})
diff --git a/integration-tests/nested-scoped-packages/nested-scoped-packages.test.ts b/integration-tests/nested-scoped-packages/nested-scoped-packages.test.ts
@@ -1,2 +1,5 @@
 import { runIntegrationTest } from "../runIntegrationTest"
-runIntegrationTest("nested-scoped-packages", true)
+runIntegrationTest({
+  projectName: "nested-scoped-packages",
+  shouldProduceSnapshots: true,
+})
diff --git a/integration-tests/newIntegrationTest.ts b/integration-tests/newIntegrationTest.ts
@@ -48,6 +48,6 @@ yarn add $1
 fs.writeFileSync(
   path.join(testDir, `${testName}.test.ts`),
   `import { runIntegrationTest } from "../runIntegrationTest"
-runIntegrationTest("${testName}", false)
+runIntegrationTest({projectName: "${testName}", shouldProduceSnapshots: false})
 `,
 )
diff --git a/integration-tests/package-gets-updated/package-gets-updated.test.ts b/integration-tests/package-gets-updated/package-gets-updated.test.ts
@@ -1,2 +1,5 @@
 import { runIntegrationTest } from "../runIntegrationTest"
-runIntegrationTest("package-gets-updated", true)
+runIntegrationTest({
+  projectName: "package-gets-updated",
+  shouldProduceSnapshots: true,
+})
diff --git a/integration-tests/patch-parse-failure/__snapshots__/patch-parse-failure.test.ts.snap b/integration-tests/patch-parse-failure/__snapshots__/patch-parse-failure.test.ts.snap
@@ -0,0 +1,24 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Test patch-parse-failure: patch parse failure message 1`] = `
+"SNAPSHOT: patch parse failure message
+
+**ERROR** Failed to apply patch for package left-pad
+    
+  This happened because the patch file patches/left-pad+1.3.0.patch could not be parsed.
+   
+  If you just upgraded patch-package, you can try running:
+  
+    patch -p1 -i patches/left-pad+1.3.0.patch
+    npx patch-package left-pad
+    
+  Otherwise, try manually creating the patch file again.
+  
+  If the problem persists, please submit a bug report:
+  
+    https://github.com/ds300/patch-package/issues/new?title=Patch+file+parse+error&body=%3CPlease+attach+the+patch+file+in+question%3E
+
+
+error Command failed with exit code 1.
+END SNAPSHOT"
+`;
diff --git a/integration-tests/patch-parse-failure/package.json b/integration-tests/patch-parse-failure/package.json
@@ -0,0 +1,11 @@
+{
+  "name": "patch-parse-failure",
+  "version": "1.0.0",
+  "description": "integration test for patch-package",
+  "main": "index.js",
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "left-pad": "^1.3.0"
+  }
+}
diff --git a/integration-tests/patch-parse-failure/patch-parse-failure.sh b/integration-tests/patch-parse-failure/patch-parse-failure.sh
@@ -0,0 +1,11 @@
+# make sure errors stop the script
+set -e
+
+echo "add patch-package"
+yarn add $1
+
+(>&2 echo "SNAPSHOT: patch parse failure message")
+if yarn patch-package; then
+  exit 1
+fi
+(>&2 echo "END SNAPSHOT")
diff --git a/integration-tests/patch-parse-failure/patch-parse-failure.test.ts b/integration-tests/patch-parse-failure/patch-parse-failure.test.ts
@@ -0,0 +1,5 @@
+import { runIntegrationTest } from "../runIntegrationTest"
+runIntegrationTest({
+  projectName: "patch-parse-failure",
+  shouldProduceSnapshots: true,
+})
diff --git a/integration-tests/patch-parse-failure/patches/left-pad+1.3.0.patch b/integration-tests/patch-parse-failure/patches/left-pad+1.3.0.patch
@@ -0,0 +1,11 @@
+diff --git a/node_modules/left-pad/index.js b/node_modules/left-pad/index.js
+index e90aec3..bfca6c5 100644
+--- a/node_modules/left-pad/index.js
++++ b/node_modules/left-pad/index.js
+@@ -33,7 +33,6 @@ function leftPad (str, len, ch) {
+   // cache common use cases
+   if (ch === ' ' && len < 10) return cache[len] + str;
+   // `pad` starts with an empty string
+-  var pad = '';
+   while (true) {
+     // add `ch` to `pad` if `len` is odd
diff --git a/integration-tests/patch-parse-failure/yarn.lock b/integration-tests/patch-parse-failure/yarn.lock
@@ -0,0 +1,8 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+left-pad@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/left-pad/-/left-pad-1.3.0.tgz#5b8a3a7765dfe001261dde915589e782f8c94d1e"
+  integrity sha512-XI5MPzVNApjAyhQzphX8BkmKsKUxD4LdyK24iZeQGinBN9yTQT3bFlCBy/aVx2HrNcqQGsdot8ghrjyrvMCoEA==
diff --git a/integration-tests/reverse-option/reverse-option.test.ts b/integration-tests/reverse-option/reverse-option.test.ts
@@ -1,3 +1,6 @@
 import { runIntegrationTest } from "../runIntegrationTest"
 
-runIntegrationTest("reverse-option", false)
+runIntegrationTest({
+  projectName: "reverse-option",
+  shouldProduceSnapshots: false,
+})
diff --git a/integration-tests/runIntegrationTest.ts b/integration-tests/runIntegrationTest.ts
@@ -10,10 +10,13 @@ export const patchPackageTarballPath = resolve(
     .filter(nm => nm.match(/^patch-package\.test\.\d+\.tgz$/))[0],
 )
 
-export function runIntegrationTest(
-  projectName: string,
-  shouldProduceSnapshots: boolean = true,
-) {
+export function runIntegrationTest({
+  projectName,
+  shouldProduceSnapshots,
+}: {
+  projectName: string
+  shouldProduceSnapshots: boolean
+}) {
   describe(`Test ${projectName}:`, () => {
     const tmpDir = tmp.dirSync({ unsafeCleanup: true })
     fs.copySync(join(__dirname, projectName), tmpDir.name, {
diff --git a/integration-tests/scoped-package/scoped-package.test.ts b/integration-tests/scoped-package/scoped-package.test.ts
@@ -1,2 +1,5 @@
 import { runIntegrationTest } from "../runIntegrationTest"
-runIntegrationTest("scoped-package")
+runIntegrationTest({
+  projectName: "scoped-package",
+  shouldProduceSnapshots: true,
+})
diff --git a/integration-tests/shrinkwrap/shrinkwrap.test.ts b/integration-tests/shrinkwrap/shrinkwrap.test.ts
@@ -1,2 +1,2 @@
 import { runIntegrationTest } from "../runIntegrationTest"
-runIntegrationTest("shrinkwrap", true)
+runIntegrationTest({ projectName: "shrinkwrap", shouldProduceSnapshots: true })
diff --git a/package.json b/package.json
@@ -18,7 +18,7 @@
     "build": "tsc --project tsconfig.build.json",
     "new-integration-test": "ts-node integration-tests/newIntegrationTest.ts",
     "clean": "rimraf dist patch-package.test*.tgz",
-    "format": "prettier --no-semi --write --trailing-comma=all src{/**,}/*.ts",
+    "format": "prettier --no-semi --write --trailing-comma=all src{/**,}/*.ts integration-tests{/**,}/*.ts property-based-tests{/**,}/*.ts",
     "prepack": "rimraf dist/**/*.test.js",
     "test": "./run-tests.sh --runInBand"
   },
diff --git a/tsconfig.build.json b/tsconfig.build.json
@@ -1,4 +1,4 @@
 {
   "extends": "./tsconfig.json",
-  "exclude": ["./property-based-tests"]
+  "exclude": ["./property-based-tests", "./integration-tests"]
 }
diff --git a/tsconfig.json b/tsconfig.json
@@ -12,6 +12,6 @@
     "noEmitOnError": false,
     "inlineSources": true
   },
-  "include": ["typings/**/*.d.ts", "src/**/*.ts", "property-based-tests/**/*"],
+  "include": ["typings/**/*.d.ts", "src/**/*.ts", "property-based-tests/**/*", "integration-tests/**/*"],
   "compileOnSave": true
 }
