diff --git a/tests/integration/app_check.bats b/tests/integration/app_check.bats index 29963d63..43c51880 100644 --- a/tests/integration/app_check.bats +++ b/tests/integration/app_check.bats @@ -81,17 +81,17 @@ setup(){ } @test "ensure recipe not up to date if --offline" { - run git -C "$ABRA_DIR/recipes/$TEST_RECIPE" reset --hard HEAD~3 + run git -C "$ABRA_DIR/recipes/$TEST_RECIPE" reset --hard HEAD~1 assert_success run git -C "$ABRA_DIR/recipes/$TEST_RECIPE" status - assert_output --partial 'behind 3' + assert_output --partial 'behind 1' run $ABRA app check "$TEST_APP_DOMAIN" --offline assert_success run git -C "$ABRA_DIR/recipes/$TEST_RECIPE" status - assert_output --partial 'behind 3' + assert_output --partial 'behind 1' _reset_recipe } @@ -113,8 +113,7 @@ setup(){ run $ABRA app check "$TEST_APP_DOMAIN" --chaos assert_failure - assert_output --partial \ - "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env is missing NEW_VAR" + assert_output --partial "NEW_VAR" _checkout_recipe } diff --git a/tests/integration/app_new.bats b/tests/integration/app_new.bats index 15f9e470..ac8c94fd 100644 --- a/tests/integration/app_new.bats +++ b/tests/integration/app_new.bats @@ -136,10 +136,10 @@ teardown(){ --secrets assert_success assert_output --partial 'generated secrets' - assert_output --partial 'test_password' + assert_output --partial 'test_pass_one' assert_exists "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env" run $ABRA app secret ls "$TEST_APP_DOMAIN" assert_success - assert_output --partial 'test_password' + assert_output --partial 'test_pass_one' } diff --git a/tests/integration/app_remove.bats b/tests/integration/app_remove.bats index e9595db9..8b53984c 100644 --- a/tests/integration/app_remove.bats +++ b/tests/integration/app_remove.bats @@ -58,14 +58,14 @@ teardown(){ @test "detect no secrets to remove" { run $ABRA app secret ls "$TEST_APP_DOMAIN" assert_success - assert_output --partial 'test_password' + assert_output --partial 'test_pass_one' run $ABRA app secret rm "$TEST_APP_DOMAIN" --all --no-input assert_success run $ABRA app secret ls "$TEST_APP_DOMAIN" assert_success - assert_output --partial 'test_password' + assert_output --partial 'test_pass_one' assert_output --partial 'false' run $ABRA app rm "$TEST_APP_DOMAIN" --no-input @@ -82,14 +82,14 @@ teardown(){ run $ABRA app secret ls "$TEST_APP_DOMAIN" assert_success - assert_output --partial 'test_password' + assert_output --partial 'test_pass_one' run $ABRA app rm "$TEST_APP_DOMAIN" --no-input assert_success refute_output --partial 'no secrets to remove' sanitisedDomainName="${TEST_APP_DOMAIN//./_}" - assert_output --partial "$sanitisedDomainName_test_password_v1 removed" + assert_output --partial "$sanitisedDomainName_test_pass_one_v1 removed" _new_app }