From d2edf5dddb4e01b14591e16b483bf937acf08bf8 Mon Sep 17 00:00:00 2001
From: "Yamashita, Yuu" <peek824545201@gmail.com>
Date: Sun, 8 Nov 2015 06:32:20 +0000
Subject: [PATCH] Fix tests

---
 test/activate.bats         | 92 ++++++++++++++++++++++----------------
 test/conda-activate.bats   | 46 +------------------
 test/conda-deactivate.bats |  9 ----
 test/deactivate.bats       | 41 ++---------------
 test/init.bats             | 27 +++--------
 5 files changed, 66 insertions(+), 149 deletions(-)

diff --git a/test/activate.bats b/test/activate.bats
index d274e9b..c9caaf6 100644
--- a/test/activate.bats
+++ b/test/activate.bats
@@ -13,7 +13,6 @@ setup() {
   stub pyenv-version-name "echo venv"
   stub pyenv-virtualenv-prefix "venv : echo \"${PYENV_ROOT}/versions/venv\""
   stub pyenv-prefix "venv : echo \"${PYENV_ROOT}/versions/venv\""
-  stub pyenv-prefix "venv : echo \"${PYENV_ROOT}/versions/venv\""
 
   PYENV_SHELL="bash" PYENV_VERSION="venv" run pyenv-sh-activate
 
@@ -24,8 +23,6 @@ setup() {
   assert_success
   assert_output <<EOS
 pyenv-virtualenv: activate venv
-unset PYENV_DEACTIVATE;
-export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv";
 export VIRTUAL_ENV="${PYENV_ROOT}/versions/venv";
 EOS
 }
@@ -36,7 +33,6 @@ EOS
   stub pyenv-version-name "echo venv"
   stub pyenv-virtualenv-prefix "venv : echo \"${PYENV_ROOT}/versions/venv\""
   stub pyenv-prefix "venv : echo \"${PYENV_ROOT}/versions/venv\""
-  stub pyenv-prefix "venv : echo \"${PYENV_ROOT}/versions/venv\""
 
   PYENV_SHELL="bash" PYENV_VERSION="venv" run pyenv-sh-activate --verbose
 
@@ -47,8 +43,6 @@ EOS
   assert_success
   assert_output <<EOS
 pyenv-virtualenv: activate venv
-unset PYENV_DEACTIVATE;
-export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv";
 export VIRTUAL_ENV="${PYENV_ROOT}/versions/venv";
 EOS
 }
@@ -59,7 +53,6 @@ EOS
   stub pyenv-version-name "echo venv"
   stub pyenv-virtualenv-prefix "venv : echo \"${PYENV_ROOT}/versions/venv\""
   stub pyenv-prefix "venv : echo \"${PYENV_ROOT}/versions/venv\""
-  stub pyenv-prefix "venv : echo \"${PYENV_ROOT}/versions/venv\""
 
   PYENV_SHELL="bash" PYENV_VERSION="venv" run pyenv-sh-activate
 
@@ -75,10 +68,8 @@ EOS
 eval "\$(pyenv virtualenv-init -)"
 
 pyenv-virtualenv: activate venv
-pyenv shell "venv";
+export PYENV_VERSION="venv";
 export PYENV_ACTIVATE_SHELL=1;
-unset PYENV_DEACTIVATE;
-export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv";
 export VIRTUAL_ENV="${PYENV_ROOT}/versions/venv";
 EOS
 }
@@ -89,7 +80,6 @@ EOS
   stub pyenv-version-name "echo venv"
   stub pyenv-virtualenv-prefix "venv : echo \"${PYENV_ROOT}/versions/venv\""
   stub pyenv-prefix "venv : echo \"${PYENV_ROOT}/versions/venv\""
-  stub pyenv-prefix "venv : echo \"${PYENV_ROOT}/versions/venv\""
 
   PYENV_SHELL="fish" PYENV_VERSION="venv" run pyenv-sh-activate
 
@@ -100,8 +90,6 @@ EOS
   assert_success
   assert_output <<EOS
 pyenv-virtualenv: activate venv
-set -e PYENV_DEACTIVATE;
-setenv PYENV_ACTIVATE "${PYENV_ROOT}/versions/venv";
 setenv VIRTUAL_ENV "${PYENV_ROOT}/versions/venv";
 EOS
 }
@@ -112,7 +100,6 @@ EOS
   stub pyenv-version-name "echo venv"
   stub pyenv-virtualenv-prefix "venv : echo \"${PYENV_ROOT}/versions/venv\""
   stub pyenv-prefix "venv : echo \"${PYENV_ROOT}/versions/venv\""
-  stub pyenv-prefix "venv : echo \"${PYENV_ROOT}/versions/venv\""
 
   PYENV_SHELL="fish" PYENV_VERSION="venv" run pyenv-sh-activate
 
@@ -128,10 +115,8 @@ EOS
 status --is-interactive; and . (pyenv virtualenv-init -|psub)
 
 pyenv-virtualenv: activate venv
-pyenv shell "venv";
+setenv PYENV_VERSION "venv";
 setenv PYENV_ACTIVATE_SHELL 1;
-set -e PYENV_DEACTIVATE;
-setenv PYENV_ACTIVATE "${PYENV_ROOT}/versions/venv";
 setenv VIRTUAL_ENV "${PYENV_ROOT}/versions/venv";
 EOS
 }
@@ -141,7 +126,6 @@ EOS
 
   stub pyenv-virtualenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\""
   stub pyenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\""
-  stub pyenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\""
 
   PYENV_SHELL="bash" PYENV_VERSION="venv" run pyenv-sh-activate "venv27"
 
@@ -151,10 +135,8 @@ EOS
   assert_success
   assert_output <<EOS
 pyenv-virtualenv: activate venv27
-pyenv shell "venv27";
+export PYENV_VERSION="venv27";
 export PYENV_ACTIVATE_SHELL=1;
-unset PYENV_DEACTIVATE;
-export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv27";
 export VIRTUAL_ENV="${PYENV_ROOT}/versions/venv27";
 EOS
 }
@@ -164,7 +146,6 @@ EOS
 
   stub pyenv-virtualenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\""
   stub pyenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\""
-  stub pyenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\""
 
   PYENV_SHELL="bash" PYENV_VERSION="venv" run pyenv-sh-activate "venv27"
 
@@ -179,10 +160,8 @@ EOS
 eval "\$(pyenv virtualenv-init -)"
 
 pyenv-virtualenv: activate venv27
-pyenv shell "venv27";
+export PYENV_VERSION="venv27";
 export PYENV_ACTIVATE_SHELL=1;
-unset PYENV_DEACTIVATE;
-export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv27";
 export VIRTUAL_ENV="${PYENV_ROOT}/versions/venv27";
 EOS
 }
@@ -192,7 +171,6 @@ EOS
 
   stub pyenv-virtualenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\""
   stub pyenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\""
-  stub pyenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\""
 
   PYENV_SHELL="fish" PYENV_VERSION="venv" run pyenv-sh-activate "venv27"
 
@@ -202,10 +180,8 @@ EOS
   assert_success
   assert_output <<EOS
 pyenv-virtualenv: activate venv27
-pyenv shell "venv27";
+setenv PYENV_VERSION "venv27";
 setenv PYENV_ACTIVATE_SHELL 1;
-set -e PYENV_DEACTIVATE;
-setenv PYENV_ACTIVATE "${PYENV_ROOT}/versions/venv27";
 setenv VIRTUAL_ENV "${PYENV_ROOT}/versions/venv27";
 EOS
 }
@@ -215,7 +191,6 @@ EOS
 
   stub pyenv-virtualenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\""
   stub pyenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\""
-  stub pyenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\""
 
   PYENV_SHELL="fish" PYENV_VERSION="venv" run pyenv-sh-activate "venv27"
 
@@ -230,10 +205,8 @@ EOS
 status --is-interactive; and . (pyenv virtualenv-init -|psub)
 
 pyenv-virtualenv: activate venv27
-pyenv shell "venv27";
+setenv PYENV_VERSION "venv27";
 setenv PYENV_ACTIVATE_SHELL 1;
-set -e PYENV_DEACTIVATE;
-setenv PYENV_ACTIVATE "${PYENV_ROOT}/versions/venv27";
 setenv VIRTUAL_ENV "${PYENV_ROOT}/versions/venv27";
 EOS
 }
@@ -249,12 +222,10 @@ EOS
 
 @test "should fail if the version is not a virtualenv" {
   stub pyenv-virtualenv-prefix "3.3.3 : false"
-  stub pyenv-prefix "3.3.3 : echo \"${PYENV_ROOT}/versions/3.3.3\""
 
   run pyenv-sh-activate "3.3.3"
 
   unstub pyenv-virtualenv-prefix
-  unstub pyenv-prefix
 
   assert_failure
   assert_output <<EOS
@@ -265,12 +236,10 @@ EOS
 
 @test "should fail if the version is not a virtualenv (quiet)" {
   stub pyenv-virtualenv-prefix "3.3.3 : false"
-  stub pyenv-prefix "3.3.3 : echo \"${PYENV_ROOT}/versions/3.3.3\""
 
   run pyenv-sh-activate --quiet "3.3.3"
 
   unstub pyenv-virtualenv-prefix
-  unstub pyenv-prefix
 
   assert_failure
   assert_output <<EOS
@@ -279,8 +248,13 @@ EOS
 }
 
 @test "should fail if there are multiple versions" {
+  stub pyenv-virtualenv-prefix "venv : true"
+  stub pyenv-virtualenv-prefix "venv27 : true"
+
   run pyenv-sh-activate "venv" "venv27"
 
+  unstub pyenv-virtualenv-prefix
+
   assert_failure
   assert_output <<EOS
 pyenv-virtualenv: cannot activate multiple versions at once: venv venv27
@@ -288,15 +262,57 @@ false
 EOS
 }
 
-@test "should fail if there are multiple versions (quiet)" {
+@test "should fail if there are multiple virtualenvs (quiet)" {
+  stub pyenv-virtualenv-prefix "venv : true"
+  stub pyenv-virtualenv-prefix "venv27 : true"
+
   run pyenv-sh-activate --quiet "venv" "venv27"
 
+  unstub pyenv-virtualenv-prefix
+
   assert_failure
   assert_output <<EOS
 false
 EOS
 }
 
+@test "should fail if the first version is not a virtualenv" {
+  export PYENV_VIRTUALENV_INIT=1
+
+  stub pyenv-virtualenv-prefix "2.7.10 : false"
+
+  run pyenv-sh-activate "2.7.10" "venv27"
+
+  unstub pyenv-virtualenv-prefix
+
+  assert_failure
+  assert_output <<EOS
+pyenv-virtualenv: version \`2.7.10' is not a virtualenv
+false
+EOS
+}
+
+@test "activate if the first virtualenv is a virtualenv" {
+  export PYENV_VIRTUALENV_INIT=1
+
+  stub pyenv-virtualenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\""
+  stub pyenv-virtualenv-prefix "2.7.10 : false"
+  stub pyenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\""
+
+  run pyenv-sh-activate "venv27" "2.7.10"
+
+  unstub pyenv-virtualenv-prefix
+  unstub pyenv-prefix
+
+  assert_success
+  assert_output <<EOS
+pyenv-virtualenv: activate venv27
+export PYENV_VERSION="venv27:2.7.10";
+export PYENV_ACTIVATE_SHELL=1;
+export VIRTUAL_ENV="${PYENV_ROOT}/versions/venv27";
+EOS
+}
+
 @test "should fail if activate is invoked as a command" {
   run pyenv-activate
 
diff --git a/test/conda-activate.bats b/test/conda-activate.bats
index 7aa87f1..ffbd8d0 100644
--- a/test/conda-activate.bats
+++ b/test/conda-activate.bats
@@ -14,7 +14,6 @@ setup() {
   stub pyenv-version-name "echo anaconda-2.3.0"
   stub pyenv-virtualenv-prefix "anaconda-2.3.0 : echo \"${PYENV_ROOT}/versions/anaconda-2.3.0\""
   stub pyenv-prefix "anaconda-2.3.0 : echo \"${PYENV_ROOT}/versions/anaconda-2.3.0\""
-  stub pyenv-prefix "anaconda-2.3.0 : echo \"${PYENV_ROOT}/versions/anaconda-2.3.0\""
 
   PYENV_SHELL="bash" PYENV_VERSION="anaconda-2.3.0" run pyenv-sh-activate
 
@@ -25,8 +24,6 @@ setup() {
   assert_success
   assert_output <<EOS
 pyenv-virtualenv: activate anaconda-2.3.0
-unset PYENV_DEACTIVATE;
-export PYENV_ACTIVATE="${PYENV_ROOT}/versions/anaconda-2.3.0";
 export VIRTUAL_ENV="${PYENV_ROOT}/versions/anaconda-2.3.0";
 export CONDA_DEFAULT_ENV="root";
 EOS
@@ -39,7 +36,6 @@ EOS
   stub pyenv-version-name "echo anaconda-2.3.0"
   stub pyenv-virtualenv-prefix "anaconda-2.3.0 : echo \"${PYENV_ROOT}/versions/anaconda-2.3.0\""
   stub pyenv-prefix "anaconda-2.3.0 : echo \"${PYENV_ROOT}/versions/anaconda-2.3.0\""
-  stub pyenv-prefix "anaconda-2.3.0 : echo \"${PYENV_ROOT}/versions/anaconda-2.3.0\""
 
   PYENV_SHELL="fish" PYENV_VERSION="anaconda-2.3.0" run pyenv-sh-activate
 
@@ -50,8 +46,6 @@ EOS
   assert_success
   assert_output <<EOS
 pyenv-virtualenv: activate anaconda-2.3.0
-set -e PYENV_DEACTIVATE;
-setenv PYENV_ACTIVATE "${TMP}/pyenv/versions/anaconda-2.3.0";
 setenv VIRTUAL_ENV "${TMP}/pyenv/versions/anaconda-2.3.0";
 setenv CONDA_DEFAULT_ENV "root";
 EOS
@@ -64,7 +58,6 @@ EOS
   create_conda "miniconda-3.9.1"
   stub pyenv-virtualenv-prefix "miniconda-3.9.1 : echo \"${PYENV_ROOT}/versions/miniconda-3.9.1\""
   stub pyenv-prefix "miniconda-3.9.1 : echo \"${PYENV_ROOT}/versions/miniconda-3.9.1\""
-  stub pyenv-prefix "miniconda-3.9.1 : echo \"${PYENV_ROOT}/versions/miniconda-3.9.1\""
 
   PYENV_SHELL="bash" PYENV_VERSION="anaconda-2.3.0" run pyenv-sh-activate "miniconda-3.9.1"
 
@@ -74,10 +67,8 @@ EOS
   assert_success
   assert_output <<EOS
 pyenv-virtualenv: activate miniconda-3.9.1
-pyenv shell "miniconda-3.9.1";
+export PYENV_VERSION="miniconda-3.9.1";
 export PYENV_ACTIVATE_SHELL=1;
-unset PYENV_DEACTIVATE;
-export PYENV_ACTIVATE="${PYENV_ROOT}/versions/miniconda-3.9.1";
 export VIRTUAL_ENV="${PYENV_ROOT}/versions/miniconda-3.9.1";
 export CONDA_DEFAULT_ENV="root";
 EOS
@@ -90,7 +81,6 @@ EOS
   stub pyenv-version-name "echo anaconda-2.3.0/envs/foo"
   stub pyenv-virtualenv-prefix "anaconda-2.3.0/envs/foo : echo \"${PYENV_ROOT}/versions/anaconda-2.3.0/envs/foo\""
   stub pyenv-prefix "anaconda-2.3.0/envs/foo : echo \"${PYENV_ROOT}/versions/anaconda-2.3.0/envs/foo\""
-  stub pyenv-prefix "anaconda-2.3.0/envs/foo : echo \"${PYENV_ROOT}/versions/anaconda-2.3.0/envs/foo\""
 
   PYENV_SHELL="bash" PYENV_VERSION="anaconda-2.3.0/envs/foo" run pyenv-sh-activate
 
@@ -101,8 +91,6 @@ EOS
   assert_success
   assert_output <<EOS
 pyenv-virtualenv: activate anaconda-2.3.0/envs/foo
-unset PYENV_DEACTIVATE;
-export PYENV_ACTIVATE="${PYENV_ROOT}/versions/anaconda-2.3.0/envs/foo";
 export VIRTUAL_ENV="${PYENV_ROOT}/versions/anaconda-2.3.0/envs/foo";
 export CONDA_DEFAULT_ENV="foo";
 EOS
@@ -115,7 +103,6 @@ EOS
   create_conda "miniconda-3.9.1" "bar"
   stub pyenv-virtualenv-prefix "miniconda-3.9.1/envs/bar : echo \"${PYENV_ROOT}/versions/miniconda-3.9.1\""
   stub pyenv-prefix "miniconda-3.9.1/envs/bar : echo \"${PYENV_ROOT}/versions/miniconda-3.9.1/envs/bar\""
-  stub pyenv-prefix "miniconda-3.9.1/envs/bar : echo \"${PYENV_ROOT}/versions/miniconda-3.9.1/envs/bar\""
 
   PYENV_SHELL="bash" PYENV_VERSION="anaconda-2.3.0/envs/foo" run pyenv-sh-activate "miniconda-3.9.1/envs/bar"
 
@@ -125,37 +112,8 @@ EOS
   assert_success
   assert_output <<EOS
 pyenv-virtualenv: activate miniconda-3.9.1/envs/bar
-pyenv shell "miniconda-3.9.1/envs/bar";
+export PYENV_VERSION="miniconda-3.9.1/envs/bar";
 export PYENV_ACTIVATE_SHELL=1;
-unset PYENV_DEACTIVATE;
-export PYENV_ACTIVATE="${PYENV_ROOT}/versions/miniconda-3.9.1/envs/bar";
-export VIRTUAL_ENV="${PYENV_ROOT}/versions/miniconda-3.9.1/envs/bar";
-export CONDA_DEFAULT_ENV="bar";
-EOS
-}
-
-@test "activate conda env from command-line argument in short-form" {
-  export PYENV_VIRTUALENV_INIT=1
-
-  create_conda "miniconda-3.9.1" "bar"
-  stub pyenv-prefix "bar : false"
-  stub pyenv-version-name " : echo miniconda-3.9.1"
-  stub pyenv-virtualenv-prefix "miniconda-3.9.1/envs/bar : echo \"${PYENV_ROOT}/versions/miniconda-3.9.1/envs/bar\""
-  stub pyenv-prefix "miniconda-3.9.1/envs/bar : echo \"${PYENV_ROOT}/versions/miniconda-3.9.1/envs/bar\""
-
-  PYENV_SHELL="bash" PYENV_VERSION="miniconda-3.9.1" run pyenv-sh-activate "bar"
-
-  unstub pyenv-prefix
-  unstub pyenv-version-name
-  unstub pyenv-virtualenv-prefix
-
-  assert_success
-  assert_output <<EOS
-pyenv-virtualenv: activate miniconda-3.9.1/envs/bar
-pyenv shell "miniconda-3.9.1/envs/bar";
-export PYENV_ACTIVATE_SHELL=1;
-unset PYENV_DEACTIVATE;
-export PYENV_ACTIVATE="${PYENV_ROOT}/versions/miniconda-3.9.1/envs/bar";
 export VIRTUAL_ENV="${PYENV_ROOT}/versions/miniconda-3.9.1/envs/bar";
 export CONDA_DEFAULT_ENV="bar";
 EOS
diff --git a/test/conda-deactivate.bats b/test/conda-deactivate.bats
index 5cb4489..57cb8ea 100644
--- a/test/conda-deactivate.bats
+++ b/test/conda-deactivate.bats
@@ -8,7 +8,6 @@ setup() {
 
 @test "deactivate conda root" {
   export VIRTUAL_ENV="${PYENV_ROOT}/versions/anaconda-2.3.0"
-  export PYENV_ACTIVATE="${PYENV_ROOT}/versions/anaconda-2.3.0"
   export PYENV_ACTIVATE_SHELL=
   export CONDA_DEFAULT_ENV="root"
 
@@ -19,8 +18,6 @@ setup() {
   assert_success
   assert_output <<EOS
 pyenv-virtualenv: deactivate anaconda-2.3.0
-export PYENV_DEACTIVATE="$PYENV_ACTIVATE";
-unset PYENV_ACTIVATE;
 unset VIRTUAL_ENV;
 unset CONDA_DEFAULT_ENV;
 EOS
@@ -28,7 +25,6 @@ EOS
 
 @test "deactivate conda root (fish)" {
   export VIRTUAL_ENV="${PYENV_ROOT}/versions/anaconda-2.3.0"
-  export PYENV_ACTIVATE="${PYENV_ROOT}/versions/anaconda-2.3.0"
   export PYENV_ACTIVATE_SHELL=
   export CONDA_DEFAULT_ENV="root"
 
@@ -40,8 +36,6 @@ EOS
   assert_success
   assert_output <<EOS
 pyenv-virtualenv: deactivate anaconda-2.3.0
-setenv PYENV_DEACTIVATE "${TMP}/pyenv/versions/anaconda-2.3.0";
-set -e PYENV_ACTIVATE;
 set -e VIRTUAL_ENV;
 set -e CONDA_DEFAULT_ENV;
 EOS
@@ -49,7 +43,6 @@ EOS
 
 @test "deactivate conda env" {
   export VIRTUAL_ENV="${PYENV_ROOT}/versions/anaconda-2.3.0/envs/foo"
-  export PYENV_ACTIVATE="${PYENV_ROOT}/versions/anaconda-2.3.0/envs/foo"
   export PYENV_ACTIVATE_SHELL=
   export CONDA_DEFAULT_ENV="foo"
 
@@ -61,8 +54,6 @@ EOS
   assert_success
   assert_output <<EOS
 pyenv-virtualenv: deactivate anaconda-2.3.0/envs/foo
-export PYENV_DEACTIVATE="$PYENV_ACTIVATE";
-unset PYENV_ACTIVATE;
 unset VIRTUAL_ENV;
 unset CONDA_DEFAULT_ENV;
 EOS
diff --git a/test/deactivate.bats b/test/deactivate.bats
index 5b811e4..0753bcc 100644
--- a/test/deactivate.bats
+++ b/test/deactivate.bats
@@ -8,7 +8,6 @@ setup() {
 
 @test "deactivate virtualenv" {
   export VIRTUAL_ENV="${PYENV_ROOT}/versions/venv"
-  export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv"
   export PYENV_ACTIVATE_SHELL=
 
   PYENV_SHELL="bash" run pyenv-sh-deactivate
@@ -16,15 +15,12 @@ setup() {
   assert_success
   assert_output <<EOS
 pyenv-virtualenv: deactivate venv
-export PYENV_DEACTIVATE="$PYENV_ACTIVATE";
-unset PYENV_ACTIVATE;
 unset VIRTUAL_ENV;
 EOS
 }
 
 @test "deactivate virtualenv (verbose)" {
   export VIRTUAL_ENV="${PYENV_ROOT}/versions/venv"
-  export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv"
   export PYENV_ACTIVATE_SHELL=
 
   PYENV_SHELL="bash" run pyenv-sh-deactivate --verbose
@@ -32,15 +28,12 @@ EOS
   assert_success
   assert_output <<EOS
 pyenv-virtualenv: deactivate venv
-export PYENV_DEACTIVATE="$PYENV_ACTIVATE";
-unset PYENV_ACTIVATE;
 unset VIRTUAL_ENV;
 EOS
 }
 
 @test "deactivate virtualenv (quiet)" {
   export VIRTUAL_ENV="${PYENV_ROOT}/versions/venv"
-  export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv"
   export PYENV_ACTIVATE_SHELL=
 
   PYENV_SHELL="bash" run pyenv-sh-deactivate --quiet
@@ -48,15 +41,12 @@ EOS
   assert_success
   assert_output <<EOS
 pyenv-virtualenv: deactivate venv
-export PYENV_DEACTIVATE="$PYENV_ACTIVATE";
-unset PYENV_ACTIVATE;
 unset VIRTUAL_ENV;
 EOS
 }
 
 @test "deactivate virtualenv (with shell activation)" {
   export VIRTUAL_ENV="${PYENV_ROOT}/versions/venv"
-  export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv"
   export PYENV_ACTIVATE_SHELL=1
 
   PYENV_SHELL="bash" run pyenv-sh-deactivate
@@ -64,17 +54,14 @@ EOS
   assert_success
   assert_output <<EOS
 pyenv-virtualenv: deactivate venv
-pyenv shell --unset;
+unset PYENV_VERSION;
 unset PYENV_ACTIVATE_SHELL;
-export PYENV_DEACTIVATE="$PYENV_ACTIVATE";
-unset PYENV_ACTIVATE;
 unset VIRTUAL_ENV;
 EOS
 }
 
 @test "deactivate virtualenv (with shell activation) (quiet)" {
   export VIRTUAL_ENV="${PYENV_ROOT}/versions/venv"
-  export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv"
   export PYENV_ACTIVATE_SHELL=1
 
   PYENV_SHELL="bash" run pyenv-sh-deactivate --quiet
@@ -82,17 +69,14 @@ EOS
   assert_success
   assert_output <<EOS
 pyenv-virtualenv: deactivate venv
-pyenv shell --unset;
+unset PYENV_VERSION;
 unset PYENV_ACTIVATE_SHELL;
-export PYENV_DEACTIVATE="$PYENV_ACTIVATE";
-unset PYENV_ACTIVATE;
 unset VIRTUAL_ENV;
 EOS
 }
 
 @test "deactivate virtualenv which has been activated manually" {
   export VIRTUAL_ENV="${PYENV_ROOT}/versions/venv"
-  export PYENV_ACTIVATE=
   export PYENV_ACTIVATE_SHELL=
 
   PYENV_SHELL="bash" run pyenv-sh-deactivate
@@ -100,15 +84,12 @@ EOS
   assert_success
   assert_output <<EOS
 pyenv-virtualenv: deactivate venv
-export PYENV_DEACTIVATE="$VIRTUAL_ENV";
-unset PYENV_ACTIVATE;
 unset VIRTUAL_ENV;
 EOS
 }
 
 @test "deactivate virtualenv (fish)" {
   export VIRTUAL_ENV="${PYENV_ROOT}/versions/venv"
-  export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv"
   export PYENV_ACTIVATE_SHELL=
 
   PYENV_SHELL="fish" run pyenv-sh-deactivate
@@ -116,15 +97,12 @@ EOS
   assert_success
   assert_output <<EOS
 pyenv-virtualenv: deactivate venv
-setenv PYENV_DEACTIVATE "$PYENV_ACTIVATE";
-set -e PYENV_ACTIVATE;
 set -e VIRTUAL_ENV;
 EOS
 }
 
 @test "deactivate virtualenv (fish) (quiet)" {
   export VIRTUAL_ENV="${PYENV_ROOT}/versions/venv"
-  export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv"
   export PYENV_ACTIVATE_SHELL=
 
   PYENV_SHELL="fish" run pyenv-sh-deactivate --quiet
@@ -132,15 +110,12 @@ EOS
   assert_success
   assert_output <<EOS
 pyenv-virtualenv: deactivate venv
-setenv PYENV_DEACTIVATE "$PYENV_ACTIVATE";
-set -e PYENV_ACTIVATE;
 set -e VIRTUAL_ENV;
 EOS
 }
 
 @test "deactivate virtualenv (fish) (with shell activation)" {
   export VIRTUAL_ENV="${PYENV_ROOT}/versions/venv"
-  export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv"
   export PYENV_ACTIVATE_SHELL=1
 
   PYENV_SHELL="fish" run pyenv-sh-deactivate
@@ -148,17 +123,14 @@ EOS
   assert_success
   assert_output <<EOS
 pyenv-virtualenv: deactivate venv
-pyenv shell --unset;
+set -e PYENV_VERSION;
 set -e PYENV_ACTIVATE_SHELL;
-setenv PYENV_DEACTIVATE "$PYENV_ACTIVATE";
-set -e PYENV_ACTIVATE;
 set -e VIRTUAL_ENV;
 EOS
 }
 
 @test "deactivate virtualenv (fish) (with shell activation) (quiet)" {
   export VIRTUAL_ENV="${PYENV_ROOT}/versions/venv"
-  export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv"
   export PYENV_ACTIVATE_SHELL=1
 
   PYENV_SHELL="fish" run pyenv-sh-deactivate --quiet
@@ -166,17 +138,14 @@ EOS
   assert_success
   assert_output <<EOS
 pyenv-virtualenv: deactivate venv
-pyenv shell --unset;
+set -e PYENV_VERSION;
 set -e PYENV_ACTIVATE_SHELL;
-setenv PYENV_DEACTIVATE "$PYENV_ACTIVATE";
-set -e PYENV_ACTIVATE;
 set -e VIRTUAL_ENV;
 EOS
 }
 
 @test "deactivate virtualenv which has been activated manually (fish)" {
   export VIRTUAL_ENV="${PYENV_ROOT}/versions/venv"
-  export PYENV_ACTIVATE=
   export PYENV_ACTIVATE_SHELL=
 
   PYENV_SHELL="fish" run pyenv-sh-deactivate
@@ -184,8 +153,6 @@ EOS
   assert_success
   assert_output <<EOS
 pyenv-virtualenv: deactivate venv
-setenv PYENV_DEACTIVATE "$VIRTUAL_ENV";
-set -e PYENV_ACTIVATE;
 set -e VIRTUAL_ENV;
 EOS
 }
diff --git a/test/init.bats b/test/init.bats
index 43352f6..7a99a2e 100644
--- a/test/init.bats
+++ b/test/init.bats
@@ -55,14 +55,9 @@ export PYENV_VIRTUALENV_INIT=1;
 _pyenv_virtualenv_hook() {
   local ret=\$?
   if [ -n "\$VIRTUAL_ENV" ]; then
-    if [ "\$VIRTUAL_ENV" != "\$(pyenv prefix 2>/dev/null || true)" ]; then
-      eval "\$(pyenv sh-deactivate --quiet || true)" || true
-      eval "\$(pyenv sh-activate --quiet || true)" || true
-    fi
+    eval "\$(pyenv sh-activate --deactivate --quiet || pyenv sh-deactivate --quiet || true)" || true
   else
-    if [ "\$PYENV_DEACTIVATE" != "\$(pyenv prefix 2>/dev/null || true)" ]; then
-      eval "\$(pyenv sh-activate --quiet || true)" || true
-    fi
+    eval "\$(pyenv sh-activate --quiet || true)" || true
   fi
   return \$ret
 };
@@ -82,14 +77,9 @@ setenv PYENV_VIRTUALENV_INIT 1;
 function _pyenv_virtualenv_hook --on-event fish_prompt;
   set -l ret \$status
   if [ -n "\$VIRTUAL_ENV" ]
-    if [ "\$VIRTUAL_ENV" != (pyenv prefix 2>/dev/null; or true) ]
-      pyenv deactivate --quiet; or true
-      pyenv activate --quiet; or true
-    end
+    pyenv activate --deactivate --quiet; or pyenv deactivate --quiet; or true
   else
-    if [ "\$PYENV_DEACTIVATE" != (pyenv prefix 2>/dev/null; or true) ]
-      pyenv activate --quiet; or true
-    end
+    pyenv activate --quiet; or true
   end
   return \$ret
 end
@@ -106,14 +96,9 @@ export PYENV_VIRTUALENV_INIT=1;
 _pyenv_virtualenv_hook() {
   local ret=\$?
   if [ -n "\$VIRTUAL_ENV" ]; then
-    if [ "\$VIRTUAL_ENV" != "\$(pyenv prefix 2>/dev/null || true)" ]; then
-      eval "\$(pyenv sh-deactivate --quiet || true)" || true
-      eval "\$(pyenv sh-activate --quiet || true)" || true
-    fi
+    eval "\$(pyenv sh-activate --deactivate --quiet || pyenv sh-deactivate --quiet || true)" || true
   else
-    if [ "\$PYENV_DEACTIVATE" != "\$(pyenv prefix 2>/dev/null || true)" ]; then
-      eval "\$(pyenv sh-activate --quiet || true)" || true
-    fi
+    eval "\$(pyenv sh-activate --quiet || true)" || true
   fi
   return \$ret
 };