o Tests for 'list' and 'list-versions'.

o Adding support for -i for 'list'.

4 files changed, 129 insertions, 1 deletions

diff --git a/test/app-install.bats b/test/app-install.bats
index 08c4a06..9961c84 100755
--- a/test/app-install.bats
+++ b/test/app-install.bats
@@ -3,6 +3,8 @@
 
 load utils
 
+# TODO: Add test for installing duplicate version
+
 @test "./app app install app-a" {
   mkzip "app-a"
   app app install \
diff --git a/test/app-list-versions.bats b/test/app-list-versions.bats
new file mode 100755
index 0000000..e9a70c2
--- /dev/null
+++ b/test/app-list-versions.bats
@@ -0,0 +1,25 @@
+#!/usr/bin/env bats
+# vim: set filetype=sh:
+
+load utils
+
+@test "./app app list-versions" {
+  mkzip "app-a"
+  app app install -r file -u $BATS_TEST_DIRNAME/data/app-a.zip -n app-a -i env-a -v 1.0 &&
+  app app install -r file -u $BATS_TEST_DIRNAME/data/app-a.zip -n app-a -i env-a -v 1.1 &&
+  app app install -r file -u $BATS_TEST_DIRNAME/data/app-a.zip -n app-a -i env-b -v 1.0 &&
+  app app install -r file -u $BATS_TEST_DIRNAME/data/app-a.zip -n app-b -i env-a -v 1.0 &&
+  app app install -r file -u $BATS_TEST_DIRNAME/data/app-a.zip -n app-b -i env-b -v 1.0 &&
+  [ $status -eq 0 ]
+
+  app app list-versions -n app-a -i env-a; echo_lines
+  [ $status -eq 0 ]
+  [ "$output" = "Available versions for app-a/env-a:
+1.0
+1.1" ]
+
+  app app list-versions -n app-a -i env-a -P; echo_lines
+  [ $status -eq 0 ]
+  [ "$output" = "1.0
+1.1" ]
+}
diff --git a/test/app-list.bats b/test/app-list.bats
new file mode 100755
index 0000000..4e56f00
--- /dev/null
+++ b/test/app-list.bats
@@ -0,0 +1,102 @@
+#!/usr/bin/env bats
+# vim: set filetype=sh:
+
+load utils
+
+@test "./app app list - all apps" {
+  mkzip "app-a"
+  app app install -r file -u $BATS_TEST_DIRNAME/data/app-a.zip -n app-a -i env-a -v 1.0 &&
+  app app install -r file -u $BATS_TEST_DIRNAME/data/app-a.zip -n app-a -i env-a -v 1.1 &&
+  app app install -r file -u $BATS_TEST_DIRNAME/data/app-a.zip -n app-a -i env-b -v 1.0 &&
+  app app install -r file -u $BATS_TEST_DIRNAME/data/app-a.zip -n app-b -i env-a -v 1.0 &&
+  app app install -r file -u $BATS_TEST_DIRNAME/data/app-a.zip -n app-b -i env-b -v 1.0 &&
+  [ $status -eq 0 ]
+
+  app app list; echo_lines
+  [ $status -eq 0 ]
+  [ "$output" = "Name                 Instance             Version             
+app-a                env-a                1.1                 
+app-a                env-b                1.0                 
+app-b                env-a                1.0                 
+app-b                env-b                1.0                 " ]
+
+  app app list -P name -P instance -P version; echo_lines
+  [ $status -eq 0 ]
+  [ "$output" = "app-a:env-a:1.1
+app-a:env-b:1.0
+app-b:env-a:1.0
+app-b:env-b:1.0" ]
+}
+
+@test "./app app list - -n filter" {
+  mkzip "app-a"
+  app app install -r file -u $BATS_TEST_DIRNAME/data/app-a.zip -n app-a -i env-a -v 1.0 &&
+  app app install -r file -u $BATS_TEST_DIRNAME/data/app-a.zip -n app-a -i env-a -v 1.1 &&
+  app app install -r file -u $BATS_TEST_DIRNAME/data/app-a.zip -n app-a -i env-b -v 1.0 &&
+  app app install -r file -u $BATS_TEST_DIRNAME/data/app-a.zip -n app-b -i env-a -v 1.0 &&
+  app app install -r file -u $BATS_TEST_DIRNAME/data/app-a.zip -n app-b -i env-b -v 1.0 &&
+  [ $status -eq 0 ]
+
+  app app list -n foo; echo_lines
+  [ $status -eq 0 ]
+  [ "$output" = "Name                 Instance             Version             " ]
+
+  app app list -n app-a; echo_lines
+  [ $status -eq 0 ]
+  [ "$output" = "Name                 Instance             Version             
+app-a                env-a                1.1                 
+app-a                env-b                1.0                 " ]
+
+  app app list -n app-a -P name -P instance -P version; echo_lines
+  [ $status -eq 0 ]
+  [ "$output" = "app-a:env-a:1.1
+app-a:env-b:1.0" ]
+}
+
+@test "./app app list - -i filter" {
+  mkzip "app-a"
+  app app install -r file -u $BATS_TEST_DIRNAME/data/app-a.zip -n app-a -i env-a -v 1.0 &&
+  app app install -r file -u $BATS_TEST_DIRNAME/data/app-a.zip -n app-a -i env-a -v 1.1 &&
+  app app install -r file -u $BATS_TEST_DIRNAME/data/app-a.zip -n app-a -i env-b -v 1.0 &&
+  app app install -r file -u $BATS_TEST_DIRNAME/data/app-a.zip -n app-b -i env-a -v 1.0 &&
+  app app install -r file -u $BATS_TEST_DIRNAME/data/app-a.zip -n app-b -i env-b -v 1.0 &&
+  [ $status -eq 0 ]
+
+  app app list -i foo; echo_lines
+  [ $status -eq 0 ]
+  [ "$output" = "Name                 Instance             Version             " ]
+
+  app app list -i env-a; echo_lines
+  [ $status -eq 0 ]
+  [ "$output" = "Name                 Instance             Version             
+app-a                env-a                1.1                 
+app-b                env-a                1.0                 " ]
+
+  app app list -i env-a -P name -P instance -P version; echo_lines
+  [ $status -eq 0 ]
+  [ "$output" = "app-a:env-a:1.1
+app-b:env-a:1.0" ]
+}
+
+@test "./app app list - -n + -i filter" {
+  mkzip "app-a"
+  app app install -r file -u $BATS_TEST_DIRNAME/data/app-a.zip -n app-a -i env-a -v 1.0 &&
+  app app install -r file -u $BATS_TEST_DIRNAME/data/app-a.zip -n app-a -i env-a -v 1.1 &&
+  app app install -r file -u $BATS_TEST_DIRNAME/data/app-a.zip -n app-a -i env-b -v 1.0 &&
+  app app install -r file -u $BATS_TEST_DIRNAME/data/app-a.zip -n app-b -i env-a -v 1.0 &&
+  app app install -r file -u $BATS_TEST_DIRNAME/data/app-a.zip -n app-b -i env-b -v 1.0 &&
+  [ $status -eq 0 ]
+
+  app app list -n foo -i bar; echo_lines
+  [ $status -eq 0 ]
+  [ "$output" = "Name                 Instance             Version             " ]
+
+  app app list -n app-a -i env-a; echo_lines
+  [ $status -eq 0 ]
+  [ "$output" = "Name                 Instance             Version             
+app-a                env-a                1.1                 " ]
+
+  app app list -n app-a -i env-a -P name -P instance -P version; echo_lines
+  [ $status -eq 0 ]
+  [ "$output" = "app-a:env-a:1.1" ]
+}
diff --git a/test/utils.bash b/test/utils.bash
index 418b962..0edead8 100644
--- a/test/utils.bash
+++ b/test/utils.bash
@@ -19,7 +19,6 @@ setup() {
   cd $BATS_TMPDIR/app.sh
   ln -s $APPSH
   WORK=$(cd -P $BATS_TMPDIR/app.sh; pwd)
-  echo WORK=$WORK
 }
 
 mkzip() {