Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Unpin mocha version and fix deprecation warnings for mocha v1.11.1 #480

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sshkit.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Gem::Specification.new do |gem|
gem.add_development_dependency('rainbow', '~> 2.2.2')
gem.add_development_dependency('rake')
gem.add_development_dependency('rubocop', "~> 0.49.1")
gem.add_development_dependency('mocha', '~> 1.9.0')
gem.add_development_dependency('mocha')

gem.add_development_dependency('bcrypt_pbkdf')
gem.add_development_dependency('ed25519', '>= 1.2', '< 2.0')
Expand Down
2 changes: 1 addition & 1 deletion test/helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
require 'tempfile'
require 'minitest/autorun'
require 'minitest/reporters'
require 'mocha/setup'
require 'mocha/minitest'
require 'stringio'
require 'json'

Expand Down
2 changes: 1 addition & 1 deletion test/unit/formatters/test_pretty.rb
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ def test_does_not_log_command_when_verbosity_is_too_low

def test_can_write_to_output_which_just_supports_append
# Note output doesn't have to be an IO, it only needs to support <<
output = stub(:<<)
output = stub(:<< => nil)
pretty = SSHKit::Formatter::Pretty.new(output)
simulate_command_lifecycle(pretty)
end
Expand Down