aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTrygve Laugstøl <trygvis@inamo.no>2013-10-20 09:32:32 +0200
committerTrygve Laugstøl <trygvis@inamo.no>2013-10-20 09:32:32 +0200
commitdc180da2125df5eb8953ee98123ba7d73b676ff6 (patch)
tree8937e528a160e9b2bcbb91789fb09fdb50c014cd
parent079a49eaaa5a6bacca3181671abd8ebb72015fd1 (diff)
downloadapp.sh-dc180da2125df5eb8953ee98123ba7d73b676ff6.tar.gz
app.sh-dc180da2125df5eb8953ee98123ba7d73b676ff6.tar.bz2
app.sh-dc180da2125df5eb8953ee98123ba7d73b676ff6.tar.xz
app.sh-dc180da2125df5eb8953ee98123ba7d73b676ff6.zip
o Updating tests.
-rwxr-xr-xtest/app-conf.bats3
-rwxr-xr-xtest/app-init.bats9
2 files changed, 7 insertions, 5 deletions
diff --git a/test/app-conf.bats b/test/app-conf.bats
index 257564b..13dc18b 100755
--- a/test/app-conf.bats
+++ b/test/app-conf.bats
@@ -131,7 +131,8 @@ setup_inner() {
app conf import config-b; echo_lines
eq '$status' 0
- eq '${#lines[*]}' 0
+ eq '${lines[0]}' "Importing config from config-b"
+ eq '${#lines[*]}' 1
app_libexec app-cat-conf
eq '${lines[0]}' "foo.bar=2"
diff --git a/test/app-init.bats b/test/app-init.bats
index 2a3e1d8..ebf850c 100755
--- a/test/app-init.bats
+++ b/test/app-init.bats
@@ -24,13 +24,14 @@ load utils
app init -d my-app maven -r "file://$BATS_TMPDIR/repo" org.example:app-a:1.0-SNAPSHOT; echo_lines
eq '$status' 0
- eq '${lines[0]}' "Resolving version 1.0-SNAPSHOT..."
+ eq '${lines[0]}' "Resolving Maven version 1.0-SNAPSHOT..."
match '${lines[1]}' "Resolved version to 1.0-.*"
match '${lines[2]}' "Downloading org.example:app-a:1.0-.*"
eq '${lines[3]}' "Unpacking..."
- match '${lines[4]}' "Creating current symlink for version 1.0-.*"
- eq '${lines[5]}' "Post install"
- eq '${#lines[*]}' 6
+ match '${lines[4]}' "Importing config from versions/1.0-*"
+ match '${lines[5]}' "Creating current symlink for version 1.0-.*"
+ eq '${lines[6]}' "Post install"
+ eq '${#lines[*]}' 7
is_directory "my-app/.app"
# Created by post-install