diff --git a/tests/integration/app_backup.bats b/tests/integration/app_backup.bats index 3a8d9f0c3..9456f9e02 100644 --- a/tests/integration/app_backup.bats +++ b/tests/integration/app_backup.bats @@ -10,6 +10,7 @@ setup_file() { teardown_file() { _rm_app _rm_server + _reset_recipe } setup() { diff --git a/tests/integration/app_check.bats b/tests/integration/app_check.bats index dd52ee255..29963d63f 100644 --- a/tests/integration/app_check.bats +++ b/tests/integration/app_check.bats @@ -9,6 +9,7 @@ setup_file(){ teardown_file(){ _rm_server + _reset_recipe } setup(){ @@ -76,7 +77,7 @@ setup(){ run git -C "$ABRA_DIR/recipes/$TEST_RECIPE" status refute_output --partial 'behind 3' - _reset_recipe "$TEST_RECIPE" + _reset_recipe } @test "ensure recipe not up to date if --offline" { @@ -92,7 +93,7 @@ setup(){ run git -C "$ABRA_DIR/recipes/$TEST_RECIPE" status assert_output --partial 'behind 3' - _reset_recipe "$TEST_RECIPE" + _reset_recipe } @test "error if missing .env.sample" { diff --git a/tests/integration/app_cmd.bats b/tests/integration/app_cmd.bats index 39cfbd44a..b7762600b 100644 --- a/tests/integration/app_cmd.bats +++ b/tests/integration/app_cmd.bats @@ -10,6 +10,7 @@ setup_file(){ teardown_file(){ _rm_app _rm_server + _reset_recipe } setup(){ diff --git a/tests/integration/app_deploy.bats b/tests/integration/app_deploy.bats index 7769ab714..e3a564770 100644 --- a/tests/integration/app_deploy.bats +++ b/tests/integration/app_deploy.bats @@ -10,6 +10,7 @@ setup_file(){ teardown_file(){ _rm_app _rm_server + _reset_recipe } setup(){ diff --git a/tests/integration/app_new.bats b/tests/integration/app_new.bats index 4f8985edc..15f9e4704 100644 --- a/tests/integration/app_new.bats +++ b/tests/integration/app_new.bats @@ -8,6 +8,7 @@ setup_file(){ teardown_file(){ _rm_server + _reset_recipe } setup(){ diff --git a/tests/integration/app_restore.bats b/tests/integration/app_restore.bats index 641a18e96..77a63f63e 100644 --- a/tests/integration/app_restore.bats +++ b/tests/integration/app_restore.bats @@ -10,6 +10,7 @@ setup_file(){ teardown_file(){ _rm_app _rm_server + _reset_recipe } setup(){ diff --git a/tests/integration/app_rollback.bats b/tests/integration/app_rollback.bats index 64afce278..d6cbbef1a 100644 --- a/tests/integration/app_rollback.bats +++ b/tests/integration/app_rollback.bats @@ -10,6 +10,7 @@ setup_file(){ teardown_file(){ _rm_app _rm_server + _reset_recipe } setup(){ diff --git a/tests/integration/app_secret.bats b/tests/integration/app_secret.bats index a0297196e..091805ede 100644 --- a/tests/integration/app_secret.bats +++ b/tests/integration/app_secret.bats @@ -10,6 +10,7 @@ setup_file(){ teardown_file(){ _rm_app _rm_server + _reset_recipe } teardown(){ diff --git a/tests/integration/app_services.bats b/tests/integration/app_services.bats index c63ce2df3..6776092e9 100644 --- a/tests/integration/app_services.bats +++ b/tests/integration/app_services.bats @@ -10,6 +10,7 @@ setup_file(){ teardown_file(){ _rm_app _rm_server + _reset_recipe } setup(){ diff --git a/tests/integration/recipe_lint.bats b/tests/integration/recipe_lint.bats index b600a3c22..fec51a03d 100644 --- a/tests/integration/recipe_lint.bats +++ b/tests/integration/recipe_lint.bats @@ -1,5 +1,9 @@ #!/usr/bin/env bash +teardown_file() { + _reset_recipe +} + setup() { load "$PWD/tests/integration/helpers/common" _common_setup diff --git a/tests/integration/recipe_release.bats b/tests/integration/recipe_release.bats index 356e1264f..a847206cc 100644 --- a/tests/integration/recipe_release.bats +++ b/tests/integration/recipe_release.bats @@ -9,6 +9,7 @@ setup_file(){ teardown_file(){ _rm_server + _reset_recipe } setup(){ diff --git a/tests/integration/recipe_upgrade.bats b/tests/integration/recipe_upgrade.bats index f282c12aa..183d1f22f 100644 --- a/tests/integration/recipe_upgrade.bats +++ b/tests/integration/recipe_upgrade.bats @@ -9,6 +9,7 @@ setup_file(){ teardown_file(){ _rm_server + _reset_recipe } setup(){