Merge branch 'RM-3355_fix_bats_tests_version_checking' into 'master'

RM-3355: fix version checking from bats tests

See merge request cdoc2/cdoc2-java-ref-impl!17

Author: jann0k

prepare_release.sh

@@ -3,20 +3,20 @@
 GIT_BRANCH=$(git branch --show-current)
 
 if [[ "master" != "$GIT_BRANCH" ]]; then
-  echo "Not on 'master' branch. You have 5 seconds to abort, before script will continue"
+  echo "Release will be made from branch $GIT_BRANCH."
   sleep 5
 fi
 
 
-#if [[ -n $(git cherry -v) ]]; then
-#  echo "Detected unpushed commits. Exit"
-#  exit 1
-#fi
-#
-#if [[ -n $(git status --porcelain --untracked-files=no) ]]; then
-#  echo "Uncommited changes detected. Exit"
-#  exit 1
-#fi
+if [[ -n $(git cherry -v) ]]; then
+  echo "Detected unpushed commits. Exit"
+  exit 1
+fi
+
+if [[ -n $(git status --porcelain --untracked-files=no) ]]; then
+  echo "Uncommitted changes detected. Exit"
+  exit 1
+fi
 
 while getopts "v:" opt; do
   case $opt in

test/bats/cdoc2_tests.bats

@@ -44,7 +44,7 @@ run_alias() {
 @test "CDOC2 version is found" {
   run echo $CDOC2_VER
   echo "# $CDOC2_VER">&3
-  assert_output --partial 'SNAPSHOT'
+  assert_output --regexp '^[0-9]+\.[0-9]+\.[0-9].*$'
 }
 
 @test "preparing: assert BATS_HOME value exists" {