chore(logging): Update minitest to 5.14

* Add rubocop-minitest * Run bundle exec rubocop --only Minitest/GlobalExpectations -a * Revert rubocop-minitest refs: #4110 refs: #4116 pr: #5716
googleapis · Apr 27, 2020 · 4cf5583 · 4cf5583
1 parent 5e893d7
commit 4cf5583
Show file tree

Hide file tree

Showing 38 changed files with 1,160 additions and 1,164 deletions.
diff --git a/google-cloud-logging/Gemfile b/google-cloud-logging/Gemfile
@@ -11,7 +11,3 @@ gem "stackdriver-core", path: "../stackdriver-core"
 
 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"
diff --git a/google-cloud-logging/acceptance/logging/logging_test.rb b/google-cloud-logging/acceptance/logging/logging_test.rb
@@ -25,44 +25,44 @@
                                  pubsub_dest,
                                  filter: "severity = ALERT"
 
-      sink.name.must_equal "#{prefix}-sink"
-      sink.destination.must_equal pubsub_dest
-      sink.filter.must_equal "severity = ALERT"
+      _(sink.name).must_equal "#{prefix}-sink"
+      _(sink.destination).must_equal pubsub_dest
+      _(sink.filter).must_equal "severity = ALERT"
 
       sink.filter = "severity >= WARNING"
 
       sink.save
 
-      sink.name.must_equal "#{prefix}-sink"
-      sink.destination.must_equal pubsub_dest
-      sink.filter.must_equal "severity >= WARNING"
+      _(sink.name).must_equal "#{prefix}-sink"
+      _(sink.destination).must_equal pubsub_dest
+      _(sink.filter).must_equal "severity >= WARNING"
 
       sink.refresh!
 
-      sink.name.must_equal "#{prefix}-sink"
-      sink.destination.must_equal pubsub_dest
-      sink.filter.must_equal "severity >= WARNING"
+      _(sink.name).must_equal "#{prefix}-sink"
+      _(sink.destination).must_equal pubsub_dest
+      _(sink.filter).must_equal "severity >= WARNING"
 
       dup_sink = logging.sink "#{prefix}-sink"
 
-      dup_sink.name.must_equal "#{prefix}-sink"
-      dup_sink.destination.must_equal pubsub_dest
-      dup_sink.filter.must_equal "severity >= WARNING"
+      _(dup_sink.name).must_equal "#{prefix}-sink"
+      _(dup_sink.destination).must_equal pubsub_dest
+      _(dup_sink.filter).must_equal "severity >= WARNING"
 
-      logging.sinks.wont_be :empty?
-      logging.sinks(max: 1).length.must_equal 1
+      _(logging.sinks).wont_be :empty?
+      _(logging.sinks(max: 1).length).must_equal 1
 
       sink.delete
 
-      logging.sink("#{prefix}-sink").must_be :nil?
+      _(logging.sink("#{prefix}-sink")).must_be :nil?
     end
 
     it "lists sinks" do
       pubsub_dest = "pubsub.googleapis.com/projects/#{logging.project}/topics/#{prefix}-topic"
       sink = logging.create_sink "#{prefix}-list-sink", pubsub_dest
 
-      logging.sinks.wont_be :empty?
-      logging.sinks(max: 1).length.must_equal 1
+      _(logging.sinks).wont_be :empty?
+      _(logging.sinks(max: 1).length).must_equal 1
 
       sink.delete
     end
@@ -74,37 +74,37 @@
                                      "severity = ALERT",
                                      description: "Metric for acceptance tsets"
 
-      metric.name.must_equal "#{prefix}-metric"
-      metric.description.must_equal "Metric for acceptance tsets"
-      metric.filter.must_equal "severity = ALERT"
+      _(metric.name).must_equal "#{prefix}-metric"
+      _(metric.description).must_equal "Metric for acceptance tsets"
+      _(metric.filter).must_equal "severity = ALERT"
 
       metric.description = "Metric for acceptance tests"
       metric.filter = "severity >= WARNING"
 
       metric.save
 
-      metric.name.must_equal "#{prefix}-metric"
-      metric.description.must_equal "Metric for acceptance tests"
-      metric.filter.must_equal "severity >= WARNING"
+      _(metric.name).must_equal "#{prefix}-metric"
+      _(metric.description).must_equal "Metric for acceptance tests"
+      _(metric.filter).must_equal "severity >= WARNING"
 
       metric.refresh!
 
-      metric.name.must_equal "#{prefix}-metric"
-      metric.description.must_equal "Metric for acceptance tests"
-      metric.filter.must_equal "severity >= WARNING"
+      _(metric.name).must_equal "#{prefix}-metric"
+      _(metric.description).must_equal "Metric for acceptance tests"
+      _(metric.filter).must_equal "severity >= WARNING"
 
       dup_metric = logging.metric "#{prefix}-metric"
 
-      dup_metric.name.must_equal "#{prefix}-metric"
-      dup_metric.description.must_equal "Metric for acceptance tests"
-      dup_metric.filter.must_equal "severity >= WARNING"
+      _(dup_metric.name).must_equal "#{prefix}-metric"
+      _(dup_metric.description).must_equal "Metric for acceptance tests"
+      _(dup_metric.filter).must_equal "severity >= WARNING"
 
-      logging.metrics.wont_be :empty?
-      logging.metrics(max: 1).length.must_equal 1
+      _(logging.metrics).wont_be :empty?
+      _(logging.metrics(max: 1).length).must_equal 1
 
       metric.delete
 
-      logging.metric("#{prefix}-metric").must_be :nil?
+      _(logging.metric("#{prefix}-metric")).must_be :nil?
     end
   end
 
@@ -134,11 +134,11 @@
         sleep delay
         delay += 1
       end
-      entries.wont_be_empty
-      logging.entries(max: 1).length.must_equal 1
+      _(entries).wont_be_empty
+      _(logging.entries(max: 1).length).must_equal 1
 
-      logging.logs.wont_be :empty?
-      logging.logs(max: 1).length.must_equal 1
+      _(logging.logs).wont_be :empty?
+      _(logging.logs(max: 1).length).must_equal 1
     end
   end
 
@@ -167,12 +167,12 @@
       skip "Removed due to inconsistent failure by the service to retrieve written_entries. Reinstate when service stabilizes."
       written_entries = entries_via_backoff("symbol").map &:payload
 
-      written_entries.must_include "Danger Will Robinson (:debug)!"
-      written_entries.must_include "Danger Will Robinson (:info)!"
-      written_entries.must_include "Danger Will Robinson (:warn)!"
-      written_entries.must_include "Danger Will Robinson (:error)!"
-      written_entries.must_include "Danger Will Robinson (:fatal)!"
-      written_entries.must_include "Danger Will Robinson (:unknown)!"
+      _(written_entries).must_include "Danger Will Robinson (:debug)!"
+      _(written_entries).must_include "Danger Will Robinson (:info)!"
+      _(written_entries).must_include "Danger Will Robinson (:warn)!"
+      _(written_entries).must_include "Danger Will Robinson (:error)!"
+      _(written_entries).must_include "Danger Will Robinson (:fatal)!"
+      _(written_entries).must_include "Danger Will Robinson (:unknown)!"
     end
 
     it "writes to a log with add and a string" do
@@ -191,12 +191,12 @@
       skip "Removed due to inconsistent failure by the service to retrieve written_entries. Reinstate when service stabilizes."
       written_entries = entries_via_backoff("string").map &:payload
 
-      written_entries.must_include "Danger Will Robinson ('debug')!"
-      written_entries.must_include "Danger Will Robinson ('info')!"
-      written_entries.must_include "Danger Will Robinson ('warn')!"
-      written_entries.must_include "Danger Will Robinson ('error')!"
-      written_entries.must_include "Danger Will Robinson ('fatal')!"
-      written_entries.must_include "Danger Will Robinson ('unknown')!"
+      _(written_entries).must_include "Danger Will Robinson ('debug')!"
+      _(written_entries).must_include "Danger Will Robinson ('info')!"
+      _(written_entries).must_include "Danger Will Robinson ('warn')!"
+      _(written_entries).must_include "Danger Will Robinson ('error')!"
+      _(written_entries).must_include "Danger Will Robinson ('fatal')!"
+      _(written_entries).must_include "Danger Will Robinson ('unknown')!"
     end
 
     it "writes to a log with add and a constant" do
@@ -215,12 +215,12 @@
       skip "Removed due to inconsistent failure by the service to retrieve written_entries. Reinstate when service stabilizes."
       written_entries = entries_via_backoff("constant").map &:payload
 
-      written_entries.must_include "Danger Will Robinson (DEBUG)!"
-      written_entries.must_include "Danger Will Robinson (INFO)!"
-      written_entries.must_include "Danger Will Robinson (WARN)!"
-      written_entries.must_include "Danger Will Robinson (ERROR)!"
-      written_entries.must_include "Danger Will Robinson (FATAL)!"
-      written_entries.must_include "Danger Will Robinson (UNKNOWN)!"
+      _(written_entries).must_include "Danger Will Robinson (DEBUG)!"
+      _(written_entries).must_include "Danger Will Robinson (INFO)!"
+      _(written_entries).must_include "Danger Will Robinson (WARN)!"
+      _(written_entries).must_include "Danger Will Robinson (ERROR)!"
+      _(written_entries).must_include "Danger Will Robinson (FATAL)!"
+      _(written_entries).must_include "Danger Will Robinson (UNKNOWN)!"
     end
 
     it "writes to a log with named functions" do
@@ -239,12 +239,12 @@
       skip "Removed due to inconsistent failure by the service to retrieve written_entries. Reinstate when service stabilizes."
       written_entries = entries_via_backoff("method").map &:payload
 
-      written_entries.must_include "Danger Will Robinson (debug)!"
-      written_entries.must_include "Danger Will Robinson (info)!"
-      written_entries.must_include "Danger Will Robinson (warn)!"
-      written_entries.must_include "Danger Will Robinson (error)!"
-      written_entries.must_include "Danger Will Robinson (fatal)!"
-      written_entries.must_include "Danger Will Robinson (unknown)!"
+      _(written_entries).must_include "Danger Will Robinson (debug)!"
+      _(written_entries).must_include "Danger Will Robinson (info)!"
+      _(written_entries).must_include "Danger Will Robinson (warn)!"
+      _(written_entries).must_include "Danger Will Robinson (error)!"
+      _(written_entries).must_include "Danger Will Robinson (fatal)!"
+      _(written_entries).must_include "Danger Will Robinson (unknown)!"
     end
 
     def entries_via_backoff type
@@ -286,12 +286,12 @@ def entries_via_backoff type
       skip "Removed due to inconsistent failure by the service to retrieve written_entries. Reinstate when service stabilizes."
       written_entries = entries_via_backoff("symbol").map &:payload
 
-      written_entries.must_include "Danger Will Robinson (:debug)!"
-      written_entries.must_include "Danger Will Robinson (:info)!"
-      written_entries.must_include "Danger Will Robinson (:warn)!"
-      written_entries.must_include "Danger Will Robinson (:error)!"
-      written_entries.must_include "Danger Will Robinson (:fatal)!"
-      written_entries.must_include "Danger Will Robinson (:unknown)!"
+      _(written_entries).must_include "Danger Will Robinson (:debug)!"
+      _(written_entries).must_include "Danger Will Robinson (:info)!"
+      _(written_entries).must_include "Danger Will Robinson (:warn)!"
+      _(written_entries).must_include "Danger Will Robinson (:error)!"
+      _(written_entries).must_include "Danger Will Robinson (:fatal)!"
+      _(written_entries).must_include "Danger Will Robinson (:unknown)!"
     end
 
     it "writes to a log with add and a string" do
@@ -310,12 +310,12 @@ def entries_via_backoff type
       skip "Removed due to inconsistent failure by the service to retrieve written_entries. Reinstate when service stabilizes."
       written_entries = entries_via_backoff("string").map &:payload
 
-      written_entries.must_include "Danger Will Robinson ('debug')!"
-      written_entries.must_include "Danger Will Robinson ('info')!"
-      written_entries.must_include "Danger Will Robinson ('warn')!"
-      written_entries.must_include "Danger Will Robinson ('error')!"
-      written_entries.must_include "Danger Will Robinson ('fatal')!"
-      written_entries.must_include "Danger Will Robinson ('unknown')!"
+      _(written_entries).must_include "Danger Will Robinson ('debug')!"
+      _(written_entries).must_include "Danger Will Robinson ('info')!"
+      _(written_entries).must_include "Danger Will Robinson ('warn')!"
+      _(written_entries).must_include "Danger Will Robinson ('error')!"
+      _(written_entries).must_include "Danger Will Robinson ('fatal')!"
+      _(written_entries).must_include "Danger Will Robinson ('unknown')!"
     end
 
     it "writes to a log with add and a constant" do
@@ -334,12 +334,12 @@ def entries_via_backoff type
       skip "Removed due to inconsistent failure by the service to retrieve written_entries. Reinstate when service stabilizes."
       written_entries = entries_via_backoff("constant").map &:payload
 
-      written_entries.must_include "Danger Will Robinson (DEBUG)!"
-      written_entries.must_include "Danger Will Robinson (INFO)!"
-      written_entries.must_include "Danger Will Robinson (WARN)!"
-      written_entries.must_include "Danger Will Robinson (ERROR)!"
-      written_entries.must_include "Danger Will Robinson (FATAL)!"
-      written_entries.must_include "Danger Will Robinson (UNKNOWN)!"
+      _(written_entries).must_include "Danger Will Robinson (DEBUG)!"
+      _(written_entries).must_include "Danger Will Robinson (INFO)!"
+      _(written_entries).must_include "Danger Will Robinson (WARN)!"
+      _(written_entries).must_include "Danger Will Robinson (ERROR)!"
+      _(written_entries).must_include "Danger Will Robinson (FATAL)!"
+      _(written_entries).must_include "Danger Will Robinson (UNKNOWN)!"
     end
 
     it "writes to a log with named functions" do
@@ -358,12 +358,12 @@ def entries_via_backoff type
       skip "Removed due to inconsistent failure by the service to retrieve written_entries. Reinstate when service stabilizes."
       written_entries = entries_via_backoff("method").map &:payload
 
-      written_entries.must_include "Danger Will Robinson (debug)!"
-      written_entries.must_include "Danger Will Robinson (info)!"
-      written_entries.must_include "Danger Will Robinson (warn)!"
-      written_entries.must_include "Danger Will Robinson (error)!"
-      written_entries.must_include "Danger Will Robinson (fatal)!"
-      written_entries.must_include "Danger Will Robinson (unknown)!"
+      _(written_entries).must_include "Danger Will Robinson (debug)!"
+      _(written_entries).must_include "Danger Will Robinson (info)!"
+      _(written_entries).must_include "Danger Will Robinson (warn)!"
+      _(written_entries).must_include "Danger Will Robinson (error)!"
+      _(written_entries).must_include "Danger Will Robinson (fatal)!"
+      _(written_entries).must_include "Danger Will Robinson (unknown)!"
     end
 
     def entries_via_backoff type

diff --git a/google-cloud-logging/google-cloud-logging.gemspec b/google-cloud-logging/google-cloud-logging.gemspec
@@ -26,7 +26,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency "concurrent-ruby", "~> 1.1"
 
   gem.add_development_dependency "google-style", "~> 1.24.0"
-  gem.add_development_dependency "minitest", "~> 5.10"
+  gem.add_development_dependency "minitest", "~> 5.14"
   gem.add_development_dependency "minitest-autotest", "~> 1.0"
   gem.add_development_dependency "minitest-focus", "~> 1.1"
   gem.add_development_dependency "minitest-rg", "~> 5.2"

diff --git a/google-cloud-logging/integration/common_logging_test.rb b/google-cloud-logging/integration/common_logging_test.rb
@@ -27,8 +27,8 @@
       end
     end
 
-    response["logger_class"].must_equal "Google::Cloud::Logging::Logger"
-    response["writer_class"].must_equal "Google::Cloud::Logging::AsyncWriter"
+    _(response["logger_class"]).must_equal "Google::Cloud::Logging::Logger"
+    _(response["writer_class"]).must_equal "Google::Cloud::Logging::AsyncWriter"
   end
 
   it "submits logs on GAE" do
@@ -45,7 +45,7 @@
       logs.length == 1
     end
 
-    logs.length.must_equal 1
+    _(logs.length).must_equal 1
   end
 end
 

diff --git a/google-cloud-logging/integration/gae/logging_test.rb b/google-cloud-logging/integration/gae/logging_test.rb
@@ -27,9 +27,9 @@
       end
     end
 
-    response["monitored_resource"]["type"].must_equal "gae_app"
-    response["monitored_resource"]["labels"]["module_id"].wont_be_nil
-    response["monitored_resource"]["labels"]["version_id"].wont_be_nil
+    _(response["monitored_resource"]["type"]).must_equal "gae_app"
+    _(response["monitored_resource"]["labels"]["module_id"]).wont_be_nil
+    _(response["monitored_resource"]["labels"]["version_id"]).wont_be_nil
   end
 
   it "injects trace_id into each log entry" do
@@ -46,6 +46,6 @@
       logs.length == 1
     end
 
-    logs[0]["labels"]["traceId"].wont_be_nil
+    _(logs[0]["labels"]["traceId"]).wont_be_nil
   end
 end
diff --git a/google-cloud-logging/integration/gke/logging_test.rb b/google-cloud-logging/integration/gke/logging_test.rb
@@ -27,8 +27,8 @@
       end
     end
 
-    response["monitored_resource"]["type"].must_equal "container"
-    response["monitored_resource"]["labels"]["cluster_name"].wont_be_nil
-    response["monitored_resource"]["labels"]["namespace_id"].wont_be_nil
+    _(response["monitored_resource"]["type"]).must_equal "container"
+    _(response["monitored_resource"]["labels"]["cluster_name"]).wont_be_nil
+    _(response["monitored_resource"]["labels"]["namespace_id"]).wont_be_nil
   end
 end