Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions test/integration/helper.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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; }
4 changes: 4 additions & 0 deletions test/unit/chruby_reset_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
4 changes: 4 additions & 0 deletions test/unit/chruby_use_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
6 changes: 3 additions & 3 deletions test/unit/helper.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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; }