Skip to content
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
1 change: 0 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,5 @@ group :test do
gem 'mocha'
gem 'rack-test'
gem 'spinach'
gem 'turn'
gem 'webmock'
end
4 changes: 2 additions & 2 deletions test/hyperclient/link_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ module Hyperclient

it 'returns nil if the property is not present' do
link = Link.new('key', {}, entry_point)
link.send("_#{prop}").must_equal nil
link.send("_#{prop}").must_be_nil
end
end
end
Expand Down Expand Up @@ -301,7 +301,7 @@ module Hyperclient
end

resource.foos._embedded.orders.first.id.must_equal 1
resource.foos.first.must_equal nil
resource.foos.first.must_be_nil
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

must_equal nil would cause:

DEPRECATED: Use assert_nil if expecting nil from /Users/yuki/GitHub/hyperclient/test/hyperclient/link_test.rb:304. This will fail in Minitest 6.

end

it 'backtracks when navigating links' do
Expand Down
5 changes: 2 additions & 3 deletions test/test_helper.rb
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
$LOAD_PATH << 'lib'

require 'minitest/spec'
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This causes a circular dependency error:

/Users/yuki/.rbenv/versions/2.6.3/lib/ruby/gems/2.6.0/gems/minitest-5.11.3/lib/minitest.rb:987: warning: /Users/yuki/.rbenv/versions/2.6.3/lib/ruby/gems/2.6.0/gems/minitest-5.11.3/lib/minitest.rb:987: warning: loading in progress, circular require considered harmful - /Users/yuki/.rbenv/versions/2.6.3/lib/ruby/gems/2.6.0/gems/minitest-5.11.3/lib/minitest/test.rb
	from /Users/yuki/.rbenv/versions/2.6.3/lib/ruby/gems/2.6.0/gems/rake-12.3.3/lib/rake/rake_test_loader.rb:5:in  `<main>'
	from /Users/yuki/.rbenv/versions/2.6.3/lib/ruby/gems/2.6.0/gems/rake-12.3.3/lib/rake/rake_test_loader.rb:5:in  `select'
	from /Users/yuki/.rbenv/versions/2.6.3/lib/ruby/gems/2.6.0/gems/rake-12.3.3/lib/rake/rake_test_loader.rb:17:in  `block in <main>'
	from /Users/yuki/.rbenv/versions/2.6.3/lib/ruby/gems/2.6.0/gems/rake-12.3.3/lib/rake/rake_test_loader.rb:17:in  `require'
	from /Users/yuki/GitHub/hyperclient/test/faraday/connection_test.rb:1:in  `<top (required)>'
	from /Users/yuki/GitHub/hyperclient/test/faraday/connection_test.rb:1:in  `require_relative'
	from /Users/yuki/GitHub/hyperclient/test/test_helper.rb:3:in  `<top (required)>'
	from /Users/yuki/GitHub/hyperclient/test/test_helper.rb:3:in  `require'
	from /Users/yuki/.rbenv/versions/2.6.3/lib/ruby/gems/2.6.0/gems/minitest-5.11.3/lib/minitest/spec.rb:1:in  `<top (required)>'
	from /Users/yuki/.rbenv/versions/2.6.3/lib/ruby/gems/2.6.0/gems/minitest-5.11.3/lib/minitest/spec.rb:1:in  `require'
	from /Users/yuki/.rbenv/versions/2.6.3/lib/ruby/gems/2.6.0/gems/minitest-5.11.3/lib/minitest/test.rb:1:in  `<top (required)>'
	from /Users/yuki/.rbenv/versions/2.6.3/lib/ruby/gems/2.6.0/gems/minitest-5.11.3/lib/minitest/test.rb:1:in  `require'
	from /Users/yuki/.rbenv/versions/2.6.3/lib/ruby/gems/2.6.0/gems/minitest-5.11.3/lib/minitest.rb:987:in  `<top (required)>'
	from /Users/yuki/.rbenv/versions/2.6.3/lib/ruby/gems/2.6.0/gems/minitest-5.11.3/lib/minitest.rb:987:in  `require'

And it seems like this is unnecessary now, so just removing it.

require 'minitest/autorun'
require 'minitest/pride'
require 'mocha/setup'
require 'turn'
require 'json'

MiniTest::Unit::TestCase.class_eval do
MiniTest::Test.class_eval do
def stub_request(conn, adapter_class = Faraday::Adapter::Test, &stubs_block)
adapter_handler = conn.builder.handlers.find { |h| h.klass < Faraday::Adapter }
conn.builder.swap(adapter_handler, adapter_class, &stubs_block)
Expand Down