Skip to content

Commit

Permalink
chore: Update tests for compatibility with minitest 5.16 (#778)
Browse files Browse the repository at this point in the history
  • Loading branch information
@dazuma
dazuma committed Jun 17, 2022
1 parent 641c5f5 commit dc48099
Show file tree
Hide file tree
Showing 9 changed files with 32 additions and 32 deletions.
2 changes: 1 addition & 1 deletion gapic-common/gapic-common.gemspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ Gem::Specification.new do |spec|

spec.add_development_dependency "google-cloud-core", "~> 1.5"
spec.add_development_dependency "google-style", "~> 1.26.0"
spec.add_development_dependency "minitest", "~> 5.14"
spec.add_development_dependency "minitest", "~> 5.16"
spec.add_development_dependency "minitest-autotest", "~> 1.0"
spec.add_development_dependency "minitest-focus", "~> 1.1"
spec.add_development_dependency "minitest-rg", "~> 5.2"
Expand Down
10 changes: 5 additions & 5 deletions gapic-common/test/gapic/grpc/stub_test.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ def test_with_channel

mock = Minitest::Mock.new
mock.expect :nil?, false
mock.expect :new, nil, ["service:port", nil, channel_override: fake_channel, interceptors: []]
mock.expect :new, nil, ["service:port", nil], channel_override: fake_channel, interceptors: []

Gapic::ServiceStub.new mock, endpoint: "service:port", credentials: fake_channel

Expand All @@ -63,7 +63,7 @@ def test_with_channel_credentials

mock = Minitest::Mock.new
mock.expect :nil?, false
mock.expect :new, nil, ["service:port", fake_channel_creds, channel_args: {}, interceptors: []]
mock.expect :new, nil, ["service:port", fake_channel_creds], channel_args: {}, interceptors: []

Gapic::ServiceStub.new mock, endpoint: "service:port", credentials: fake_channel_creds

Expand All @@ -75,7 +75,7 @@ def test_with_symbol_credentials

mock = Minitest::Mock.new
mock.expect :nil?, false
mock.expect :new, nil, ["service:port", creds, channel_args: {}, interceptors: []]
mock.expect :new, nil, ["service:port", creds], channel_args: {}, interceptors: []

Gapic::ServiceStub.new mock, endpoint: "service:port", credentials: creds

Expand All @@ -87,7 +87,7 @@ def test_with_credentials
GRPC::Core::ChannelCredentials.stub :new, FakeChannelCredentials.method(:new) do
mock = Minitest::Mock.new
mock.expect :nil?, false
mock.expect :new, nil, ["service:port", FakeCallCredentials, channel_args: {}, interceptors: []]
mock.expect :new, nil, ["service:port", FakeCallCredentials], channel_args: {}, interceptors: []

Gapic::ServiceStub.new mock, endpoint: "service:port", credentials: FakeCredentials.new

Expand All @@ -101,7 +101,7 @@ def test_with_proc
GRPC::Core::ChannelCredentials.stub :new, FakeChannelCredentials.method(:new) do
mock = Minitest::Mock.new
mock.expect :nil?, false
mock.expect :new, nil, ["service:port", FakeCallCredentials, channel_args: {}, interceptors: []]
mock.expect :new, nil, ["service:port", FakeCallCredentials], channel_args: {}, interceptors: []

credentials_proc = ->{}

Expand Down
14 changes: 7 additions & 7 deletions gapic-generator-ads/Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ GEM
nokogiri (>= 1.5.9)
middleware (0.1.0)
mini_portile2 (2.8.0)
minitest (5.15.0)
minitest (5.16.0)
minitest-focus (1.3.1)
minitest (>= 4, < 6)
nokogiri (1.13.6)
Expand All @@ -64,17 +64,17 @@ GEM
thor
thread_safe
racc (1.6.0)
rack (2.2.3)
rack (2.2.3.1)
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.4.2)
rails-html-sanitizer (1.4.3)
loofah (~> 2.3)
rainbow (3.1.1)
rake (13.0.6)
regexp_parser (2.4.0)
regexp_parser (2.5.0)
rexml (3.2.5)
rubocop (1.28.2)
parallel (~> 1.10)
Expand All @@ -85,7 +85,7 @@ GEM
rubocop-ast (>= 1.17.0, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 3.0)
rubocop-ast (1.17.0)
rubocop-ast (1.18.0)
parser (>= 3.1.1.0)
ruby-progressbar (1.11.0)
thor (1.2.1)
Expand All @@ -102,9 +102,9 @@ DEPENDENCIES
gapic-generator-ads!
google-style (~> 1.25.1)
grpc-tools (~> 1.41.0)
minitest (~> 5.0)
minitest (~> 5.16)
minitest-focus (~> 1.0)
rake (>= 12.0)

BUNDLED WITH
2.3.13
2.3.7
2 changes: 1 addition & 1 deletion gapic-generator-ads/gapic-generator-ads.gemspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ Gem::Specification.new do |spec|

spec.add_development_dependency "google-style", "~> 1.25.1"
spec.add_development_dependency "grpc-tools", "~> 1.41.0"
spec.add_development_dependency "minitest", "~> 5.0"
spec.add_development_dependency "minitest", "~> 5.16"
spec.add_development_dependency "minitest-focus", "~> 1.0"
spec.add_development_dependency "rake", ">= 12.0"
end
14 changes: 7 additions & 7 deletions gapic-generator-cloud/Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ GEM
method_source (1.0.0)
middleware (0.1.0)
mini_portile2 (2.8.0)
minitest (5.15.0)
minitest (5.16.0)
minitest-autotest (1.1.1)
minitest-server (~> 1.0)
path_expander (~> 1.0)
Expand All @@ -76,17 +76,17 @@ GEM
coderay (~> 1.1)
method_source (~> 1.0)
racc (1.6.0)
rack (2.2.3)
rack (2.2.3.1)
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.4.2)
rails-html-sanitizer (1.4.3)
loofah (~> 2.3)
rainbow (3.1.1)
rake (13.0.6)
regexp_parser (2.4.0)
regexp_parser (2.5.0)
rexml (3.2.5)
rubocop (1.28.2)
parallel (~> 1.10)
Expand All @@ -97,7 +97,7 @@ GEM
rubocop-ast (>= 1.17.0, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 3.0)
rubocop-ast (1.17.0)
rubocop-ast (1.18.0)
parser (>= 3.1.1.0)
ruby-progressbar (1.11.0)
thor (1.2.1)
Expand All @@ -113,11 +113,11 @@ DEPENDENCIES
gapic-generator!
gapic-generator-cloud!
grpc-tools (~> 1.41.0)
minitest (~> 5.0)
minitest (~> 5.16)
minitest-autotest (~> 1.0)
minitest-focus (~> 1.0)
pry (>= 0.14)
rake (>= 12.0)

BUNDLED WITH
2.3.13
2.3.7
2 changes: 1 addition & 1 deletion gapic-generator-cloud/gapic-generator-cloud.gemspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ Gem::Specification.new do |spec|
spec.add_dependency "protobuf", "~> 3.8"

spec.add_development_dependency "grpc-tools", "~> 1.41.0"
spec.add_development_dependency "minitest", "~> 5.0"
spec.add_development_dependency "minitest", "~> 5.16"
spec.add_development_dependency "minitest-autotest", "~> 1.0"
spec.add_development_dependency "minitest-focus", "~> 1.0"
spec.add_development_dependency "pry", ">= 0.14"
Expand Down
16 changes: 8 additions & 8 deletions gapic-generator/Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ GEM
method_source (1.0.0)
middleware (0.1.0)
mini_portile2 (2.8.0)
minitest (5.15.0)
minitest (5.16.0)
minitest-autotest (1.1.1)
minitest-server (~> 1.0)
path_expander (~> 1.0)
Expand All @@ -67,18 +67,18 @@ GEM
coderay (~> 1.1)
method_source (~> 1.0)
racc (1.6.0)
rack (2.2.3)
rack (2.2.3.1)
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.4.2)
rails-html-sanitizer (1.4.3)
loofah (~> 2.3)
rainbow (3.1.1)
rake (13.0.6)
redcarpet (3.5.1)
regexp_parser (2.4.0)
regexp_parser (2.5.0)
rexml (3.2.5)
rubocop (1.28.2)
parallel (~> 1.10)
Expand All @@ -89,7 +89,7 @@ GEM
rubocop-ast (>= 1.17.0, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 3.0)
rubocop-ast (1.17.0)
rubocop-ast (1.18.0)
parser (>= 3.1.1.0)
ruby-progressbar (1.11.0)
thor (1.2.1)
Expand All @@ -98,7 +98,7 @@ GEM
thread_safe (~> 0.1)
unicode-display_width (2.1.0)
webrick (1.7.0)
yard (0.9.27)
yard (0.9.28)
webrick (~> 1.7.0)

PLATFORMS
Expand All @@ -108,7 +108,7 @@ DEPENDENCIES
gapic-generator!
google-style (~> 1.25.1)
grpc-tools (~> 1.41.0)
minitest (~> 5.0)
minitest (~> 5.16)
minitest-autotest (~> 1.0)
minitest-focus (~> 1.0)
pry (>= 0.14)
Expand All @@ -117,4 +117,4 @@ DEPENDENCIES
yard (~> 0.9)

BUNDLED WITH
2.3.13
2.3.7
2 changes: 1 addition & 1 deletion gapic-generator/gapic-generator.gemspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ Gem::Specification.new do |spec|

spec.add_development_dependency "google-style", "~> 1.25.1"
spec.add_development_dependency "grpc-tools", "~> 1.41.0"
spec.add_development_dependency "minitest", "~> 5.0"
spec.add_development_dependency "minitest", "~> 5.16"
spec.add_development_dependency "minitest-autotest", "~> 1.0"
spec.add_development_dependency "minitest-focus", "~> 1.0"
spec.add_development_dependency "pry", ">= 0.14"
Expand Down
2 changes: 1 addition & 1 deletion gapic/gapic.gemspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ Gem::Specification.new do |spec|
spec.required_ruby_version = ">= 2.5"

spec.add_development_dependency "google-style", "~> 1.25.1"
spec.add_development_dependency "minitest", "~> 5.11"
spec.add_development_dependency "minitest", "~> 5.16"
spec.add_development_dependency "minitest-autotest", "~> 1.0"
spec.add_development_dependency "minitest-focus", "~> 1.1"
spec.add_development_dependency "minitest-rg", "~> 5.2"
Expand Down

0 comments on commit dc48099

Please sign in to comment.