Skip to content

Commit

Permalink
chore(storage): Upgrade minitest and fix warnings
Browse files Browse the repository at this point in the history
* Use rubocop-minitest to auto-correct warnings with `bundle exec rubocop --only Minitest/GlobalExpectations -a`, then remove rubocop-minitest.

refs: #4110
refs: #4116
  • Loading branch information
yahonda authored Apr 16, 2020
1 parent c36aacc commit f4a254c
Show file tree
Hide file tree
Showing 69 changed files with 2,675 additions and 2,677 deletions.
4 changes: 1 addition & 3 deletions google-cloud-storage/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,4 @@ gem "google-cloud-pubsub", path: "../google-cloud-pubsub"
gem "minitest-reporters", "~> 1.3.5", require: false
gem "rake"

# Pin minitest to 5.11.x to avoid warnings emitted by 5.12.
# See https://github.com/googleapis/google-cloud-ruby/issues/4110
gem "minitest", "~> 5.11.3"
gem "minitest"
70 changes: 35 additions & 35 deletions google-cloud-storage/acceptance/storage/bucket_acl_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -28,92 +28,92 @@
end

it "adds a reader" do
bucket.acl.readers.wont_include user_val
_(bucket.acl.readers).wont_include user_val
bucket.acl.add_reader user_val
bucket.acl.readers.must_include user_val
_(bucket.acl.readers).must_include user_val
bucket.acl.refresh!
bucket.acl.readers.must_include user_val
_(bucket.acl.readers).must_include user_val
bucket.refresh!
bucket.acl.readers.must_include user_val
_(bucket.acl.readers).must_include user_val
end

it "adds a writer" do
bucket.acl.writers.wont_include user_val
_(bucket.acl.writers).wont_include user_val
bucket.acl.add_writer user_val
bucket.acl.writers.must_include user_val
_(bucket.acl.writers).must_include user_val
bucket.acl.refresh!
bucket.acl.writers.must_include user_val
_(bucket.acl.writers).must_include user_val
bucket.refresh!
bucket.acl.writers.must_include user_val
_(bucket.acl.writers).must_include user_val
end

it "adds an owner" do
bucket.acl.owners.wont_include user_val
_(bucket.acl.owners).wont_include user_val
bucket.acl.add_owner user_val
bucket.acl.owners.must_include user_val
_(bucket.acl.owners).must_include user_val
bucket.acl.refresh!
bucket.acl.owners.must_include user_val
_(bucket.acl.owners).must_include user_val
bucket.refresh!
bucket.acl.owners.must_include user_val
_(bucket.acl.owners).must_include user_val
end

it "updates predefined rules" do
bucket.acl.readers.wont_include "allAuthenticatedUsers"
_(bucket.acl.readers).wont_include "allAuthenticatedUsers"
bucket.acl.auth!
bucket.acl.readers.must_include "allAuthenticatedUsers"
_(bucket.acl.readers).must_include "allAuthenticatedUsers"
bucket.acl.refresh!
bucket.acl.readers.must_include "allAuthenticatedUsers"
_(bucket.acl.readers).must_include "allAuthenticatedUsers"
bucket.refresh!
bucket.acl.readers.must_include "allAuthenticatedUsers"
_(bucket.acl.readers).must_include "allAuthenticatedUsers"
end

it "deletes rules" do
bucket.acl.auth!
bucket.acl.readers.must_include "allAuthenticatedUsers"
_(bucket.acl.readers).must_include "allAuthenticatedUsers"
bucket.acl.delete "allAuthenticatedUsers"
bucket.acl.readers.wont_include "allAuthenticatedUsers"
_(bucket.acl.readers).wont_include "allAuthenticatedUsers"
bucket.acl.refresh!
bucket.acl.readers.wont_include "allAuthenticatedUsers"
_(bucket.acl.readers).wont_include "allAuthenticatedUsers"
bucket.refresh!
bucket.acl.readers.wont_include "allAuthenticatedUsers"
_(bucket.acl.readers).wont_include "allAuthenticatedUsers"
end

it "retrieves and modifies the ACL" do
bucket.acl.owners.wont_be :empty?
bucket.acl.writers.must_be :empty?
bucket.acl.readers.must_be :empty?
_(bucket.acl.owners).wont_be :empty?
_(bucket.acl.writers).must_be :empty?
_(bucket.acl.readers).must_be :empty?

bucket.acl.add_writer user_val

bucket.acl.owners.wont_be :empty?
bucket.acl.writers.wont_be :empty?
bucket.acl.readers.must_be :empty?
_(bucket.acl.owners).wont_be :empty?
_(bucket.acl.writers).wont_be :empty?
_(bucket.acl.readers).must_be :empty?

bucket.acl.writers.must_include user_val
_(bucket.acl.writers).must_include user_val

bucket.acl.reload!

bucket.acl.writers.must_include user_val
_(bucket.acl.writers).must_include user_val

bucket.reload!

bucket.acl.writers.must_include user_val
_(bucket.acl.writers).must_include user_val

bucket.acl.delete user_val

bucket.acl.owners.wont_be :empty?
bucket.acl.writers.must_be :empty?
bucket.acl.readers.must_be :empty?
_(bucket.acl.owners).wont_be :empty?
_(bucket.acl.writers).must_be :empty?
_(bucket.acl.readers).must_be :empty?

bucket.acl.writers.wont_include user_val
_(bucket.acl.writers).wont_include user_val

bucket.acl.reload!

bucket.acl.writers.wont_include user_val
_(bucket.acl.writers).wont_include user_val

bucket.reload!

bucket.acl.writers.wont_include user_val
_(bucket.acl.writers).wont_include user_val
end

it "sets predefined ACL rules" do
Expand Down
56 changes: 28 additions & 28 deletions google-cloud-storage/acceptance/storage/bucket_default_acl_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -29,80 +29,80 @@

it "adds a reader" do
user_val = "[email protected]"
bucket.default_acl.readers.wont_include user_val
_(bucket.default_acl.readers).wont_include user_val
bucket.default_acl.add_reader user_val
bucket.default_acl.readers.must_include user_val
_(bucket.default_acl.readers).must_include user_val
bucket.default_acl.refresh!
bucket.default_acl.readers.must_include user_val
_(bucket.default_acl.readers).must_include user_val
bucket.refresh!
bucket.default_acl.readers.must_include user_val
_(bucket.default_acl.readers).must_include user_val
end

it "adds an owner" do
user_val = "[email protected]"
bucket.default_acl.owners.wont_include user_val
_(bucket.default_acl.owners).wont_include user_val
bucket.default_acl.add_owner user_val
bucket.default_acl.owners.must_include user_val
_(bucket.default_acl.owners).must_include user_val
bucket.default_acl.refresh!
bucket.default_acl.owners.must_include user_val
_(bucket.default_acl.owners).must_include user_val
bucket.refresh!
bucket.default_acl.owners.must_include user_val
_(bucket.default_acl.owners).must_include user_val
end

it "updates predefined rules" do
bucket.default_acl.readers.wont_include "allAuthenticatedUsers"
_(bucket.default_acl.readers).wont_include "allAuthenticatedUsers"
bucket.default_acl.auth!
bucket.default_acl.readers.must_include "allAuthenticatedUsers"
_(bucket.default_acl.readers).must_include "allAuthenticatedUsers"
bucket.default_acl.refresh!
bucket.default_acl.readers.must_include "allAuthenticatedUsers"
_(bucket.default_acl.readers).must_include "allAuthenticatedUsers"
bucket.refresh!
bucket.default_acl.readers.must_include "allAuthenticatedUsers"
_(bucket.default_acl.readers).must_include "allAuthenticatedUsers"
end

it "deletes rules" do
bucket.default_acl.auth!
bucket.default_acl.readers.must_include "allAuthenticatedUsers"
_(bucket.default_acl.readers).must_include "allAuthenticatedUsers"
bucket.default_acl.delete "allAuthenticatedUsers"
bucket.default_acl.readers.wont_include "allAuthenticatedUsers"
_(bucket.default_acl.readers).wont_include "allAuthenticatedUsers"
bucket.default_acl.refresh!
bucket.default_acl.readers.wont_include "allAuthenticatedUsers"
_(bucket.default_acl.readers).wont_include "allAuthenticatedUsers"
bucket.refresh!
bucket.default_acl.readers.wont_include "allAuthenticatedUsers"
_(bucket.default_acl.readers).wont_include "allAuthenticatedUsers"
end

it "retrieves and modifies the ACL" do
bucket.default_acl.owners.must_be :empty?
bucket.default_acl.readers.must_be :empty?
_(bucket.default_acl.owners).must_be :empty?
_(bucket.default_acl.readers).must_be :empty?

bucket.default_acl.add_reader user_val

bucket.default_acl.owners.must_be :empty?
bucket.default_acl.readers.wont_be :empty?
_(bucket.default_acl.owners).must_be :empty?
_(bucket.default_acl.readers).wont_be :empty?

bucket.default_acl.readers.must_include user_val
_(bucket.default_acl.readers).must_include user_val

bucket.default_acl.reload!

bucket.default_acl.readers.must_include user_val
_(bucket.default_acl.readers).must_include user_val

bucket.reload!

bucket.default_acl.readers.must_include user_val
_(bucket.default_acl.readers).must_include user_val

bucket.default_acl.delete user_val

bucket.default_acl.owners.must_be :empty?
bucket.default_acl.readers.must_be :empty?
_(bucket.default_acl.owners).must_be :empty?
_(bucket.default_acl.readers).must_be :empty?

bucket.default_acl.readers.wont_include user_val
_(bucket.default_acl.readers).wont_include user_val

bucket.default_acl.reload!

bucket.default_acl.readers.wont_include user_val
_(bucket.default_acl.readers).wont_include user_val

bucket.reload!

bucket.default_acl.readers.wont_include user_val
_(bucket.default_acl.readers).wont_include user_val
end

it "sets predefined ACL rules" do
Expand Down
20 changes: 10 additions & 10 deletions google-cloud-storage/acceptance/storage/bucket_encryption_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -48,27 +48,27 @@
describe "KMS customer-managed encryption key (CMEK)" do

it "knows its encryption configuration" do
bucket.default_kms_key.wont_be :nil?
bucket.default_kms_key.must_equal kms_key
_(bucket.default_kms_key).wont_be :nil?
_(bucket.default_kms_key).must_equal kms_key
bucket.reload!
bucket.default_kms_key.wont_be :nil?
bucket.default_kms_key.must_equal kms_key
_(bucket.default_kms_key).wont_be :nil?
_(bucket.default_kms_key).must_equal kms_key
end

it "can update its default kms key to another key" do
bucket.default_kms_key.must_equal kms_key
_(bucket.default_kms_key).must_equal kms_key
bucket.default_kms_key = kms_key_2
bucket.default_kms_key.must_equal kms_key_2
_(bucket.default_kms_key).must_equal kms_key_2
bucket.reload!
bucket.default_kms_key.must_equal kms_key_2
_(bucket.default_kms_key).must_equal kms_key_2
end

it "can remove its default kms key by setting encryption to nil" do
bucket.default_kms_key.must_equal kms_key
_(bucket.default_kms_key).must_equal kms_key
bucket.default_kms_key = nil
bucket.default_kms_key.must_be :nil?
_(bucket.default_kms_key).must_be :nil?
bucket.reload!
bucket.default_kms_key.must_be :nil?
_(bucket.default_kms_key).must_be :nil?
end
end
end
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,13 @@

response = http.request request

response.code.must_equal "204"
_(response.code).must_equal "204"
file = bucket.file(post_object.fields["key"])
file.wont_be :nil?
_(file).wont_be :nil?
Tempfile.open ["google-cloud-logo", ".jpg"] do |tmpfile|
tmpfile.binmode
downloaded = file.download tmpfile
File.read(downloaded.path, mode: "rb").must_equal File.read(data, mode: "rb")
_(File.read(downloaded.path, mode: "rb")).must_equal File.read(data, mode: "rb")
end
end

Expand All @@ -67,13 +67,13 @@
request.set_form form_data, 'multipart/form-data'

response = http.request request
response.code.must_equal "204"
_(response.code).must_equal "204"
file = bucket.file(post_object.fields["key"])
file.wont_be :nil?
_(file).wont_be :nil?
Tempfile.open ["google-cloud-logo", ".jpg"] do |tmpfile|
tmpfile.binmode
downloaded = file.download tmpfile
File.read(downloaded.path, mode: "rb").must_equal File.read(data, mode: "rb")
_(File.read(downloaded.path, mode: "rb")).must_equal File.read(data, mode: "rb")
end
end

Expand All @@ -97,13 +97,13 @@

response = http.request request

response.code.must_equal "204"
_(response.code).must_equal "204"
file = bucket.file(post_object.fields["key"])
file.wont_be :nil?
_(file).wont_be :nil?
Tempfile.open ["google-cloud-logo", ".jpg"] do |tmpfile|
tmpfile.binmode
downloaded = file.download tmpfile
File.read(downloaded.path, mode: "rb").must_equal File.read(data, mode: "rb")
_(File.read(downloaded.path, mode: "rb")).must_equal File.read(data, mode: "rb")
end
end

Expand All @@ -126,13 +126,13 @@

response = http.request request

response.code.must_equal "200"
_(response.code).must_equal "200"
file = bucket.file(post_object.fields["key"])
file.wont_be :nil?
_(file).wont_be :nil?
Tempfile.open ["google-cloud-logo", ".jpg"] do |tmpfile|
tmpfile.binmode
downloaded = file.download tmpfile
File.read(downloaded.path, mode: "rb").must_equal File.read(data, mode: "rb")
_(File.read(downloaded.path, mode: "rb")).must_equal File.read(data, mode: "rb")
end
end

Expand Down
Loading

0 comments on commit f4a254c

Please sign in to comment.