Add cmd_insert_uri; refactor tests

2 files changed, 44 insertions, 12 deletions

diff --git a/test/insert.t b/test/insert.t
index a78971f..e04914e 100755
--- a/test/insert.t
+++ b/test/insert.t
@@ -4,16 +4,44 @@ export test_description="Tests pass otp insert commands"
 
 . ./setup.sh
 
+test_expect_success 'Inserts a key URI' '
+  uri="otpauth://totp/Example:alice@google.com?secret=JBSWY3DPEHPK3PXP&issuer=Example"
+
+  test_pass_init &&
+  "$PASS" otp insert "$uri" passfile &&
+  [[ $("$PASS" show passfile) == "$uri" ]]
+'
+
+test_expect_success 'Prompts before overwriting key URI' '
+  uri1="otpauth://totp/Example:alice@google.com?secret=JBSWY3DPEHPK3PXP&issuer=Foo"
+  uri2="otpauth://totp/Example:alice@google.com?secret=JBSWY3DPEHPK3PXP&issuer=Bar"
+
+  test_pass_init &&
+  "$PASS" otp insert "$uri1" passfile &&
+  test_faketty "echo n | $PASS otp insert $uri2 passfile" &&
+  [[ $("$PASS" show passfile) == "$uri1" ]]
+'
+
+test_expect_success 'Force overwrites key URI' '
+  uri1="otpauth://totp/Example:alice@google.com?secret=JBSWY3DPEHPK3PXP&issuer=Foo"
+  uri2="otpauth://totp/Example:alice@google.com?secret=JBSWY3DPEHPK3PXP&issuer=Bar"
+
+  test_pass_init &&
+  "$PASS" otp insert "$uri1" passfile &&
+  "$PASS" otp insert -f "$uri2" passfile &&
+  [[ $("$PASS" show passfile) == "$uri2" ]]
+'
+
 test_expect_success 'Inserts a basic TOTP key' '
-	"$PASS" init $KEY1 &&
-	"$PASS" otp insert totp -s AAAAAAAAAAAAAAAAAAAAA totp-secret
+  test_pass_init &&
+  "$PASS" otp insert totp -s AAAAAAAAAAAAAAAAAAAAA passfile
 '
 
 test_expect_success 'Commits insert to git' '
-	git init "$PASSWORD_STORE_DIR" &&
-	"$PASS" init $KEY1 &&
-	"$PASS" otp insert totp -s AAAAAAAAAAAAAAAAAAAAA totp-secret2 &&
-	git log --no-decorate -1 | grep "Add given OTP secret for totp-secret2 to store."
+  test_pass_init &&
+  pass git init &&
+  "$PASS" otp insert totp -s AAAAAAAAAAAAAAAAAAAAA passfile &&
+  git log --no-decorate -1 | grep "Add given OTP secret for passfile to store."
 '
 
 test_done
diff --git a/test/setup.sh b/test/setup.sh
index f896382..b363e6d 100644
--- a/test/setup.sh
+++ b/test/setup.sh
@@ -33,12 +33,6 @@ export PASSWORD_STORE_ENABLE_EXTENSIONS=true
 export PASSWORD_STORE_EXTENSIONS_DIR="$EXT_HOME"
 
 export PASSWORD_STORE_DIR="$SHARNESS_TRASH_DIRECTORY/test-store"
-rm -rf "$PASSWORD_STORE_DIR"
-mkdir -p "$PASSWORD_STORE_DIR"
-if [[ ! -d $PASSWORD_STORE_DIR ]]; then
-	echo "Could not create $PASSWORD_STORE_DIR"
-	exit 1
-fi
 
 export GIT_DIR="$PASSWORD_STORE_DIR/.git"
 export GIT_WORK_TREE="$PASSWORD_STORE_DIR"
@@ -65,3 +59,13 @@ KEY2="D774A374"  # pass test key 2
 KEY3="EB7D54A8"  # pass test key 3
 KEY4="E4691410"  # pass test key 4
 KEY5="39E5020C"  # pass test key 5
+
+# Test helpers
+test_pass_init() {
+  rm -rf "$PASSWORD_STORE_DIR"
+  "$PASS" init "$KEY1"
+}
+
+test_faketty() {
+  script -qfc "$(printf "%q " "$@")"
+}