summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorAnish Athalye <me@anishathalye.com>2018-05-24 12:00:13 -0400
committerAnish Athalye <me@anishathalye.com>2018-05-24 12:57:49 -0400
commitc3f271481aa7740e54342b663dce0e1a1306f5f0 (patch)
treeaaad4327ea97dd682a6803d014beeb2456274f2c /test
parent2f4cc0d9cb70235e7c5820dc4e7dd89b1d375fb5 (diff)
Fix handling of base directory
Prior to this patch, Dotbot was relying on running with the base directory being the current working directory. In practice, it was relying on the install shim to set up this context. It makes more sense sense to actually execute `chdir()` within Dotbot itself, rather than relying on the install shim to do so.
Diffstat (limited to 'test')
-rw-r--r--test/test-lib.bash10
-rw-r--r--test/tests/plugin-dir.bash2
-rw-r--r--test/tests/plugin.bash2
3 files changed, 6 insertions, 8 deletions
diff --git a/test/test-lib.bash b/test/test-lib.bash
index 008c2f8..3a24510 100644
--- a/test/test-lib.bash
+++ b/test/test-lib.bash
@@ -51,17 +51,15 @@ initialize() {
run_dotbot() {
(
- cd "${DOTFILES}"
- cat > "${INSTALL_CONF}"
- ${DOTBOT_EXEC} -d . -c "${INSTALL_CONF}" "${@}"
+ cat > "${DOTFILES}/${INSTALL_CONF}"
+ ${DOTBOT_EXEC} -d "${DOTFILES}" -c "${DOTFILES}/${INSTALL_CONF}" "${@}"
)
}
run_dotbot_json() {
(
- cd "${DOTFILES}"
- cat > "${INSTALL_CONF_JSON}"
- ${DOTBOT_EXEC} -d . -c "${INSTALL_CONF_JSON}" "${@}"
+ cat > "${DOTFILES}/${INSTALL_CONF_JSON}"
+ ${DOTBOT_EXEC} -d "${DOTFILES}" -c "${DOTFILES}/${INSTALL_CONF_JSON}" "${@}"
)
}
diff --git a/test/tests/plugin-dir.bash b/test/tests/plugin-dir.bash
index 299f144..f3a5e94 100644
--- a/test/tests/plugin-dir.bash
+++ b/test/tests/plugin-dir.bash
@@ -19,7 +19,7 @@ EOF
'
test_expect_success 'run' '
-run_dotbot --plugin-dir plugins <<EOF
+run_dotbot --plugin-dir ${DOTFILES}/plugins <<EOF
- test: ~
EOF
'
diff --git a/test/tests/plugin.bash b/test/tests/plugin.bash
index 960e9ce..bdf0c7f 100644
--- a/test/tests/plugin.bash
+++ b/test/tests/plugin.bash
@@ -18,7 +18,7 @@ EOF
'
test_expect_success 'run' '
-run_dotbot --plugin test.py <<EOF
+run_dotbot --plugin ${DOTFILES}/test.py <<EOF
- test: ~
EOF
'