use patch-package bin directly in tests

Author: ds300

integration-tests/adding-and-deleting-files/adding-and-deleting-files.sh

@@ -3,6 +3,7 @@ set -e
 
 echo "add patch-package"
 yarn add $1
+alias patch-package=./node_modules/.bin/patch-package
 
 echo "add a file"
 echo "this is a new file" > node_modules/lodash/newFile.md
@@ -11,14 +12,14 @@ echo "remove a file"
 rm node_modules/lodash/fp/__.js
 
 echo "generate patch file"
-npx patch-package lodash
+patch-package lodash
 
 echo "remove node_modules"
 rm -rf node_modules
 
 echo "resintall and patch node_modules"
 yarn
-npx patch-package
+patch-package
 
 echo "check that the file was added"
 ls node_modules/lodash/newFile.md

integration-tests/broken-patch-file/broken-patch-file.sh

@@ -3,9 +3,10 @@ set -e
 
 echo "add patch-package"
 yarn add $1
+alias patch-package=./node_modules/.bin/patch-package
 
 (>&2 echo "SNAPSHOT: patch-package fails when patch file is invalid")
-if npx patch-package
+if patch-package
 then
   exit 1
 fi

integration-tests/custom-patch-dir/custom-patch-dir.sh

@@ -3,14 +3,15 @@ set -e
 
 echo "add patch-package"
 yarn add $1
+alias patch-package=./node_modules/.bin/patch-package
 
 echo "modify left-pad"
 npx replace pad patch-package node_modules/left-pad/index.js
 
 mkdir my
 
 echo "make patch file"
-npx patch-package left-pad --patch-dir my/patches
+patch-package left-pad --patch-dir my/patches
 
 ls my/patches/left-pad*
 
@@ -19,6 +20,6 @@ rimraf node_modules
 yarn
 
 echo "run patch-package"
-npx patch-package --patch-dir my/patches
+patch-package --patch-dir my/patches
 
 grep patch-package node_modules/left-pad/index.js

integration-tests/custom-resolutions/custom-resolutions.sh

@@ -3,9 +3,10 @@ set -e
 
 echo "add patch-package"
 yarn add $1
+alias patch-package=./node_modules/.bin/patch-package
 
 echo "make changes to dependency/index.js"
 echo '// hello i am patch-package' > node_modules/dependency/index.js
 
 echo "doesn't fail when making a patch"
-npx patch-package dependency
+patch-package dependency

integration-tests/delete-old-patch-files/delete-old-patch-files.sh

@@ -3,9 +3,10 @@ set -e
 
 echo "add patch-package"
 yarn add $1
+alias patch-package=./node_modules/.bin/patch-package
 
 echo "apply patch-package"
-npx patch-package
+patch-package
 
 echo "make sure the changes were applied"
 grep patch-package node_modules/@types/lodash/index.d.ts
@@ -16,7 +17,7 @@ ls patches/lodash:4.17.11.patch
 ls patches/@types/lodash:4.14.120.patch
 
 echo "make patch files again"
-npx patch-package lodash @types/lodash
+patch-package lodash @types/lodash
 
 echo "make sure the changes were still applied"
 grep patch-package node_modules/@types/lodash/index.d.ts

integration-tests/delete-scripts/delete-scripts.sh

@@ -2,6 +2,7 @@ set -e
 
 echo 'install without error because package.json is sanitized'
 yarn add $1
+alias patch-package=./node_modules/.bin/patch-package
 
 echo 'unsnitize package.json'
 npx replace '<<PREINSTALL>>' preinstall package.json
@@ -14,7 +15,7 @@ fi
 npx replace leftPad patchPackage node_modules/left-pad/index.js
 
 echo 'but patch-package still works because it ignores scripts'
-npx patch-package left-pad
+patch-package left-pad
 
 echo "SNAPSHOT: a patch file got produced"
 cat patches/left-pad*.patch

integration-tests/fails-when-no-package/__snapshots__/fails-when-no-package.test.ts.snap

@@ -3,6 +3,5 @@
 exports[`Test fails-when-no-package: no package present failure 1`] = `
 "SNAPSHOT: no package present failure
 Error: Patch file found for package left-pad which is not present at node_modules/left-pad
-error Command failed with exit code 1.
 END SNAPSHOT"
 `;

integration-tests/fails-when-no-package/fails-when-no-package.sh

@@ -3,9 +3,10 @@ set -e
 
 echo "add patch-package"
 yarn add $1
+alias patch-package=./node_modules/.bin/patch-package
 
 (>&2 echo "SNAPSHOT: no package present failure")
-if yarn patch-package; then
+if patch-package; then
   exit 1
 fi
 (>&2 echo "END SNAPSHOT")

integration-tests/file-mode-changes/file-mode-changes.sh

@@ -3,6 +3,7 @@ set -e
 
 echo "add patch-package"
 yarn add $1
+alias patch-package=./node_modules/.bin/patch-package
 
 echo "check file permissions 1"
 ./assert-executable.js node_modules/prettier/bin-prettier.js
@@ -17,7 +18,7 @@ echo "check file permissions 2"
 ./assert-not-executable.js node_modules/prettier/bin-prettier.js
 
 echo "patch prettier"
-npx patch-package prettier
+patch-package prettier
 
 echo "SNAPSHOT: the patch file"
 cat patches/prettier*
@@ -32,7 +33,7 @@ echo "check file permissions 3"
 ./assert-not-executable.js node_modules/prettier/index.js
 
 echo "run patch-package"
-npx patch-package
+patch-package
 
 echo "check file permissions 4"
 ./assert-executable.js node_modules/prettier/index.js

integration-tests/happy-path-npm/happy-path-npm.sh

@@ -5,6 +5,7 @@ npm i
 
 echo "add patch-package"
 npm i $1
+alias patch-package=./node_modules/.bin/patch-package
 
 echo "Add left-pad"
 npm i [email protected]
@@ -13,7 +14,7 @@ echo "replace pad with yarn in left-pad/index.js"
 npx replace pad npm node_modules/left-pad/index.js
 
 echo "SNAPSHOT: making patch"
-npx patch-package left-pad
+patch-package left-pad
 echo "END SNAPSHOT"
 
 echo "SNAPSHOT: the patch looks like this"