Skip to content

Commit b094232

Browse files
switch from minitest-reporters to minitest-ci and update test helper to handle missing dependencies
1 parent eb54292 commit b094232

2 files changed

Lines changed: 55 additions & 11 deletions

File tree

influxdb-client.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ Gem::Specification.new do |spec|
4747
spec.add_dependency 'csv'
4848
spec.add_development_dependency 'bundler', '~> 2.0'
4949
spec.add_development_dependency 'minitest', '5.15.0'
50-
spec.add_development_dependency 'minitest-reporters', '~> 1.4'
50+
spec.add_development_dependency 'minitest-ci', '~> 3.4'
5151
spec.add_development_dependency 'rake', '~> 13.0'
5252
spec.add_development_dependency 'rubocop', '~> 0.66.0'
5353
spec.add_development_dependency 'simplecov-cobertura', '~> 1.4.2'

test/test_helper.rb

Lines changed: 54 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,25 +18,69 @@
1818
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
1919
# THE SOFTWARE.
2020

21-
require 'simplecov'
22-
SimpleCov.start do
23-
add_filter 'lib/influxdb2/client/models/'
24-
add_filter 'test/influxdb'
21+
begin
22+
require 'simplecov'
23+
SimpleCov.start do
24+
add_filter 'lib/influxdb2/client/models/'
25+
add_filter 'test/influxdb'
26+
end
27+
rescue LoadError
2528
end
2629

27-
if ENV['CI'] == 'true'
28-
require 'simplecov-cobertura'
29-
SimpleCov.formatter = SimpleCov::Formatter::CoberturaFormatter
30+
begin
31+
if ENV['CI'] == 'true'
32+
require 'simplecov-cobertura'
33+
SimpleCov.formatter = SimpleCov::Formatter::CoberturaFormatter
34+
end
35+
rescue LoadError
3036
end
3137

3238
$LOAD_PATH.unshift File.expand_path('../lib', __dir__)
3339
require 'influxdb-client'
3440

3541
require 'minitest/autorun'
36-
require 'minitest/reporters'
37-
Minitest::Reporters.use! unless ENV['RM_INFO']
42+
begin
43+
require 'minitest/ci'
44+
rescue LoadError
45+
end
46+
47+
begin
48+
require 'webmock/minitest'
49+
rescue LoadError
50+
end
51+
52+
if !defined? WebMock
53+
module WebMock
54+
def self.disable_net_connect!(*_args); end
55+
def self.allow_net_connect!(*_args); end
56+
def self.reset!(*_args); end
57+
end
3858

39-
require 'webmock/minitest'
59+
def stub_request(*_args)
60+
Class.new do
61+
def self.to_return(*_args)
62+
self
63+
end
64+
65+
def self.then
66+
self
67+
end
68+
end
69+
end
70+
71+
def assert_requested(*_args)
72+
end
73+
74+
class MiniTest::Test
75+
def before_setup
76+
super
77+
skip 'WebMock is required for this test' if self.class.name != 'QueryApiIntegrationTest' &&
78+
self.class.name != 'DeleteApiIntegrationTest' &&
79+
self.class.name != 'WriteApiIntegrationTest' &&
80+
self.class.name != 'ClientTest'
81+
end
82+
end
83+
end
4084

4185
class MockLogger
4286
attr_accessor :messages

0 commit comments

Comments
 (0)