Merge pull request heroku#5 from rbrainard/master

Fix version detection regex to find numbers 0-9 and update tests.
tavlima · Jan 24, 2012 · 728ab35 · 728ab35
2 parents 0dde325 + 132135a
commit 728ab35
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/bin/compile b/bin/compile
@@ -50,7 +50,7 @@ install_play()
   echo "-----> done"
 }
 
-PLAY_VERSION=`grep 'play[ \t]*[0-9\.]' conf/dependencies.yml | sed -E -e 's/[ \t]*-[ \t]*play[ \t]*([1-9\.]*).*/\1/'`
+PLAY_VERSION=`grep 'play[ \t]*[0-9\.]' conf/dependencies.yml | sed -E -e 's/[ \t]*-[ \t]*play[ \t]*([0-9\.]*).*/\1/'`
 DEFAULT_PLAY_VERSION="1.2.4"
 VERSION_DECLARED=true
 

diff --git a/test/compile_test.sh b/test/compile_test.sh
@@ -34,7 +34,7 @@ getPlayApp() {
   local playVersion=${1:-${DEFAULT_PLAY_VERSION}}
   local appBaseDir="${PLAY_TEST_CACHE}/app-${playVersion}"
   if [ ! -f ${appBaseDir}/conf/application.conf ]; then
-    $(_full_play) new ${appBaseDir} --name app
+    $(_full_play) new ${appBaseDir} --name app >/dev/null
   fi
   cp -r ${appBaseDir}/. ${BUILD_DIR}
   assertTrue "${BUILD_DIR}/conf/application.conf should be present after creating a new app." "[ -f ${BUILD_DIR}/conf/application.conf ]"
@@ -136,6 +136,7 @@ testPlayVersionIsPickedUpFromDependenciesFile() {
 
   compile
 
+  assertCaptured "Installing Play! 1.2.4"
   assertNotCaptured "WARNING: Play! version not specified in dependencies.yml."
 }
 
@@ -151,9 +152,12 @@ testPlayCopiedToCacheDirForSuccessfulBuild() {
 }
 
 testValidVersionOfPlayThatIsNotInS3Bucket() {
-  getPlayApp "1.1.1"
-  definePlayAppVersion "1.1.1"
+  getPlayApp "1.0.1"
+  definePlayAppVersion "1.0.1"
+
   compile
+
+  assertCaptured "Installing Play! 1.0.1"
   assertCaptured "Error installing Play! framework or unsupported Play! framework version specified."
 }