From 577e61fb2e846b39b8924a9624ea15717760b795 Mon Sep 17 00:00:00 2001 From: The Magician Date: Mon, 13 Apr 2020 13:17:44 -0700 Subject: [PATCH] add new project for app engine flex tests (#3348) (#380) * add new project for app engine flex tests * remove delete_service_on_destroy * do not delete the 'default' service * add noop_on_destroy to tests * ignore noop_on_destroy in tests Signed-off-by: Modular Magician --- docs/resources/google_storage_bucket.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/docs/resources/google_storage_bucket.md b/docs/resources/google_storage_bucket.md index e8203d1ef..f021d3388 100644 --- a/docs/resources/google_storage_bucket.md +++ b/docs/resources/google_storage_bucket.md @@ -13,10 +13,7 @@ describe google_storage_bucket(name: bucket-name) do its('location') { should cmp 'europe-west2'.upcase } its('storage_class') { should eq "STANDARD" } -<<<<<<< HEAD its('labels') { should include("key" => "value") } -======= ->>>>>>> gcp/master end describe google_storage_bucket(name: "nonexistent") do