From dc180da2125df5eb8953ee98123ba7d73b676ff6 Mon Sep 17 00:00:00 2001
From: Trygve Laugstøl <trygvis@inamo.no>
Date: Sun, 20 Oct 2013 09:32:32 +0200
Subject: o Updating tests.

---
 test/app-conf.bats | 3 ++-
 test/app-init.bats | 9 +++++----
 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
-- 
cgit v1.2.3