diff --git a/src/lib/attributes/default-action.sh b/src/lib/attributes/default-action.sh index 12ba4bb..daee6dd 100644 --- a/src/lib/attributes/default-action.sh +++ b/src/lib/attributes/default-action.sh @@ -1,5 +1,5 @@ dotify-set-default-action() { - DOTIFY_ATTR_DEFAULT_ACTION="$1" + DOTIFY_ATTR_DEFAULT_ACTION="$@" } dotify-get-default-action() { diff --git a/src/lib/attributes/root-link.sh b/src/lib/attributes/root-link.sh index f9571cd..114cc35 100644 --- a/src/lib/attributes/root-link.sh +++ b/src/lib/attributes/root-link.sh @@ -1,5 +1,5 @@ dotify-set-root-link() { - DOTIFY_ATTR_ROOT_LINK="$1" + DOTIFY_ATTR_ROOT_LINK="$@" } dotify-get-root-link() { diff --git a/src/lib/dotfile-commands/default_action.sh b/src/lib/dotfile-commands/default_action.sh index a4fb83a..7e63735 100644 --- a/src/lib/dotfile-commands/default_action.sh +++ b/src/lib/dotfile-commands/default_action.sh @@ -1,3 +1,3 @@ default_action() { - dotify-set-default-action "$@" + dotify-set-default-action $@ } diff --git a/src/lib/dotfile-commands/root_link.sh b/src/lib/dotfile-commands/root_link.sh index 5b17537..d09b861 100644 --- a/src/lib/dotfile-commands/root_link.sh +++ b/src/lib/dotfile-commands/root_link.sh @@ -1,3 +1,3 @@ root_link () { - dotify-set-root-link "$@" + dotify-set-root-link $@ } diff --git a/test/lib/dotfile-commands/default_action.test.sh b/test/lib/dotfile-commands/default_action.test.sh index 89b4261..a92afa3 100755 --- a/test/lib/dotfile-commands/default_action.test.sh +++ b/test/lib/dotfile-commands/default_action.test.sh @@ -1,14 +1,15 @@ #! /usr/bin/env bash source "../../test-helper.sh" +source "../../../src/lib/attributes/default-action.sh" source "../../../src/lib/dotfile-commands/default_action.sh" # -# root_link() tests +# default_action() tests # # Sets DOTIFY_OPT_DEFAULT_ACTION default_action foo -assert 'echo $DOTIFY_OPT_DEFAULT_ACTION' 'foo' +assert 'echo $DOTIFY_ATTR_DEFAULT_ACTION' 'foo' default_action foo bar -assert 'echo $DOTIFY_OPT_DEFAULT_ACTION' 'foo bar' -assert_end "root_link()" +assert 'echo $DOTIFY_ATTR_DEFAULT_ACTION' 'foo bar' +assert_end "default_action()" diff --git a/test/lib/dotfile-commands/root_link.test.sh b/test/lib/dotfile-commands/root_link.test.sh index 2083da3..25ac3e4 100755 --- a/test/lib/dotfile-commands/root_link.test.sh +++ b/test/lib/dotfile-commands/root_link.test.sh @@ -1,5 +1,6 @@ #! /usr/bin/env bash source "../../test-helper.sh" +source "../../../src/lib/attributes/root-link.sh" source "../../../src/lib/dotfile-commands/root_link.sh" # @@ -8,7 +9,7 @@ source "../../../src/lib/dotfile-commands/root_link.sh" # Sets DOTIFY_OPT_ROOT_LINK root_link .dots -assert 'echo $DOTIFY_OPT_ROOT_LINK' '.dots' +assert 'echo $DOTIFY_ATTR_ROOT_LINK' '.dots' root_link my dots -assert 'echo $DOTIFY_OPT_ROOT_LINK' 'my dots' +assert 'echo $DOTIFY_ATTR_ROOT_LINK' 'my dots' assert_end "root_link()" diff --git a/test/lib/helpers/arguments.test.sh b/test/lib/helpers/arguments.test.sh index 36dd1f3..aa4290d 100755 --- a/test/lib/helpers/arguments.test.sh +++ b/test/lib/helpers/arguments.test.sh @@ -46,5 +46,4 @@ assert 'parse-argument file f -v --file=foo\ bar.txt' "foo bar.txt" assert 'parse-argument file f -v --file="foo bar.txt"' "foo bar.txt" assert "parse-argument file f -v --file='foo bar.txt'" "foo bar.txt" - assert_end "parse-argument()" diff --git a/test/lib/internals/has-action.test.sh b/test/lib/internals/has-action.test.sh index 5565287..6edf3de 100755 --- a/test/lib/internals/has-action.test.sh +++ b/test/lib/internals/has-action.test.sh @@ -4,7 +4,7 @@ source "../../../src/lib/internals/register-action.sh" source "../../../src/lib/internals/has-action.sh" # -# dotify-register-action() tests +# dotify-has-action() tests # # When no actions are registered. @@ -29,4 +29,4 @@ assert_raises 'dotify-has-action "copy"' 1 unset DOTIFY_ACTIONS -assert_end "dotify-register-action() tests" +assert_end "dotify-has-action() tests"