From d4ec690610dd40d509d21a52bfe466657152c86e Mon Sep 17 00:00:00 2001
From: Bruno Sutic <bruno.sutic@gmail.com>
Date: Mon, 23 Feb 2015 01:19:03 +0100
Subject: [PATCH] Use more 'tmux-test' functions

---
 tests/helpers/resurrect_helpers.sh | 6 ------
 tests/test_resurrect_restore.sh    | 5 +----
 tests/test_resurrect_save.sh       | 6 ++----
 3 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/tests/helpers/resurrect_helpers.sh b/tests/helpers/resurrect_helpers.sh
index 0380051..268aca5 100644
--- a/tests/helpers/resurrect_helpers.sh
+++ b/tests/helpers/resurrect_helpers.sh
@@ -1,9 +1,3 @@
-install_tmux_resurrect_helper() {
-	local plugin_path="${HOME}/.tmux/plugins/tmux-resurrect/"
-	rm -rf "$plugin_path"
-	git clone --recursive "${CURRENT_DIR}/../" "$plugin_path" >/dev/null 2>&1
-}
-
 # we want "fixed" dimensions no matter the size of real display
 set_screen_dimensions_helper() {
 	stty cols 200
diff --git a/tests/test_resurrect_restore.sh b/tests/test_resurrect_restore.sh
index f022e2e..9cf4644 100755
--- a/tests/test_resurrect_restore.sh
+++ b/tests/test_resurrect_restore.sh
@@ -16,15 +16,12 @@ setup_before_restore() {
 }
 
 restore_tmux_environment_and_save_again() {
-	set_tmux_conf_helper<<-HERE
-	run-shell '~/.tmux/plugins/tmux-resurrect/resurrect.tmux'
-	HERE
 	set_screen_dimensions_helper
 	$CURRENT_DIR/helpers/restore_and_save_tmux_test_environment.exp
 }
 
 main() {
-	install_tmux_resurrect_helper
+	install_tmux_plugin_under_test_helper
 	setup_before_restore
 	restore_tmux_environment_and_save_again
 
diff --git a/tests/test_resurrect_save.sh b/tests/test_resurrect_save.sh
index 36297be..c1d6d28 100755
--- a/tests/test_resurrect_save.sh
+++ b/tests/test_resurrect_save.sh
@@ -6,15 +6,13 @@ source $CURRENT_DIR/helpers/helpers.sh
 source $CURRENT_DIR/helpers/resurrect_helpers.sh
 
 create_tmux_test_environment_and_save() {
-	set_tmux_conf_helper<<-HERE
-	run-shell '~/.tmux/plugins/tmux-resurrect/resurrect.tmux'
-	HERE
 	set_screen_dimensions_helper
 	$CURRENT_DIR/helpers/create_and_save_tmux_test_environment.exp
 }
 
 main() {
-	install_tmux_resurrect_helper
+	install_tmux_plugin_under_test_helper
+	install_tmux_plugin_under_test_helper
 	mkdir -p /tmp/bar # setup required dirs
 	create_tmux_test_environment_and_save