1 files changed, 35 insertions, 1 deletions
diff --git a/test/app-cat-conf.bats b/test/app-cat-conf.bats
index 8060cea..62309a5 100755
--- a/test/app-cat-conf.bats
+++ b/test/app-cat-conf.bats
@@ -43,21 +43,55 @@ setup_inner() {
 
 @test "app-cat-conf can use stdin and multiple files" {
   x=$(cat $APPSH_HOME/test/data/app-cat-conf/config-3 | \
-  $APPSH_HOME/libexec/app-cat-conf -D -f $APPSH_HOME/test/data/app-cat-conf/config-2 -f -)
+  $APPSH_HOME/libexec/app-cat-conf -D -f - -f $APPSH_HOME/test/data/app-cat-conf/config-2)
   [[ $x == "foo.bar=wat
 foo.wat=bar" ]]
 }
 
+@test "app-cat-conf read multiple files, last file wins" {
+  app_libexec app-cat-conf \
+    -f $APPSH_HOME/test/data/app-cat-conf/config-2 \
+    -f $APPSH_HOME/test/data/app-cat-conf/config-4
+  echo_lines
+  eq '${lines[0]}' "foo.bar=foo"
+  eq '${#lines[*]}' 1
+}
+
 @test "uses \$APPSH_DEFAULT_CONFIG" {
   APPSH_DEFAULT_CONFIG=$APPSH_HOME/test/data/app-cat-conf/config-2
   app_libexec app-cat-conf -f /dev/null
   echo_lines
   eq '${lines[0]}' "foo.bar=wat"
   eq '${#lines[*]}' 1
+}
 
+@test "uses \$APPSH_DEFAULT_CONFIG, check order" {
   app_libexec app-cat-conf -f $APPSH_HOME/test/data/app-cat-conf/config-3
   echo_lines
   eq '${lines[0]}' "foo.bar=baz"
   eq '${lines[1]}' "foo.wat=bar"
   eq '${#lines[*]}' 2
 }
+
+@test "app-cat-conf read from installation's, user's and then app's config" {
+  HOME=$APPSH_HOME/test/data/app-cat-conf/home
+  APPSH_DEFAULT_CONFIG=$APPSH_HOME/test/data/app-cat-conf/config-2
+  app_libexec app-cat-conf; echo_lines
+  eq '$status' 0
+  eq '${lines[0]}' "foo.bar=1"
+  eq '${lines[1]}' "foo.foo=2"
+  eq '${#lines[*]}' 2
+}
+
+# With home directory, outside app
+@test "./app conf - should read user's conf too, in app" {
+  HOME=$APPSH_HOME/test/data/app-cat-conf/home
+  APPSH_DEFAULT_CONFIG=$APPSH_HOME/test/data/app-cat-conf/config-2
+  cd $APPSH_HOME/test/data/app-cat-conf/my-app
+  app_libexec app-cat-conf; echo_lines
+  eq '$status' 0
+  eq '${lines[0]}' "foo.bar=2" 
+  eq '${lines[1]}' "foo.baz=3" 
+  eq '${lines[2]}' "foo.foo=2" 
+  eq '${#lines[*]}' 3
+}