diff --git a/Makefile b/Makefile index c8502798..b53c7a18 100644 --- a/Makefile +++ b/Makefile @@ -48,8 +48,8 @@ configure_tests: ./test/unit/configure test: configure_tests - SHELL=`command -v bash` ./test/unit/runner - SHELL=`command -v zsh` ./test/unit/runner + SHELL=`command -v bash` ./test/unit/runner --norc + SHELL=`command -v zsh` ./test/unit/runner --no-rcs integration_tests: SHELL=`command -v bash` ./test/integration/runner diff --git a/test/integration/helper.sh b/test/integration/helper.sh index 74185bf1..7f053791 100644 --- a/test/integration/helper.sh +++ b/test/integration/helper.sh @@ -13,6 +13,6 @@ original_pwd="$PWD" original_ruby="$(command -v ruby 2>/dev/null)" original_gem="$(command -v gem 2>/dev/null)" -setUp() { return; } -tearDown() { return; } -oneTimeTearDown() { return; } +setUp() { return 0; } +tearDown() { return 0; } +oneTimeTearDown() { return 0; } diff --git a/test/unit/chruby_reset_test.sh b/test/unit/chruby_reset_test.sh index 5e19ed60..e849efd9 100755 --- a/test/unit/chruby_reset_test.sh +++ b/test/unit/chruby_reset_test.sh @@ -15,10 +15,14 @@ function test_chruby_reset_hash_table() assertEquals "did not clear the path table" \ "" "$(hash)" elif [[ -n "$BASH_VERSION" ]]; then + local old_lang="$LANG" + export LANG=en_US.UTF-8 chruby_reset assertEquals "did not clear the path table" \ "hash: hash table empty" "$(hash)" + + LANG="$old_lang" fi } diff --git a/test/unit/chruby_use_test.sh b/test/unit/chruby_use_test.sh index 7cd8e049..6d7eb493 100755 --- a/test/unit/chruby_use_test.sh +++ b/test/unit/chruby_use_test.sh @@ -8,10 +8,14 @@ function test_chruby_clears_hash_table() assertEquals "did not clear the path table" \ "" "$(hash)" elif [[ -n "$BASH_VERSION" ]]; then + local old_lang="$LANG" + export LANG=en_US.UTF-8 chruby_use "$test_ruby_root" >/dev/null assertEquals "did not clear the path table" \ "hash: hash table empty" "$(hash)" + + LANG="$old_lang" fi } diff --git a/test/unit/helper.sh b/test/unit/helper.sh index 218c89ec..31b6bce1 100644 --- a/test/unit/helper.sh +++ b/test/unit/helper.sh @@ -20,6 +20,6 @@ chruby_reset original_path="$PATH" original_pwd="$PWD" -setUp() { return; } -tearDown() { return; } -oneTimeTearDown() { return; } +setUp() { return 0; } +tearDown() { return 0; } +oneTimeTearDown() { return 0; }