Skip to content

Commit 0e4fcc3

Browse files
junarugasodabrew
authored andcommitted
Suppress Fixnum and Bignum warnings on Ruby 2.4. (#907)
1 parent 8d6f29f commit 0e4fcc3

File tree

4 files changed

+20
-16
lines changed

4 files changed

+20
-16
lines changed

spec/mysql2/client_spec.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -570,7 +570,7 @@ def run_gc
570570
end
571571

572572
it "#socket should return a Fixnum (file descriptor from C)" do
573-
expect(@client.socket).to be_an_instance_of(Fixnum)
573+
expect(@client.socket).to be_an_instance_of(0.class)
574574
expect(@client.socket).not_to eql(0)
575575
end
576576

@@ -846,7 +846,7 @@ def run_gc
846846
info = @client.info
847847
expect(info).to be_an_instance_of(Hash)
848848
expect(info).to have_key(:id)
849-
expect(info[:id]).to be_an_instance_of(Fixnum)
849+
expect(info[:id]).to be_an_instance_of(0.class)
850850
expect(info).to have_key(:version)
851851
expect(info[:version]).to be_an_instance_of(String)
852852
end
@@ -873,7 +873,7 @@ def run_gc
873873
server_info = @client.server_info
874874
expect(server_info).to be_an_instance_of(Hash)
875875
expect(server_info).to have_key(:id)
876-
expect(server_info[:id]).to be_an_instance_of(Fixnum)
876+
expect(server_info[:id]).to be_an_instance_of(0.class)
877877
expect(server_info).to have_key(:version)
878878
expect(server_info[:version]).to be_an_instance_of(String)
879879
end
@@ -962,7 +962,7 @@ def run_gc
962962
end
963963

964964
it "#thread_id should be a Fixnum" do
965-
expect(@client.thread_id).to be_an_instance_of(Fixnum)
965+
expect(@client.thread_id).to be_an_instance_of(0.class)
966966
end
967967

968968
it "should respond to #ping" do

spec/mysql2/result_spec.rb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@
204204
end
205205

206206
it "should return Fixnum for a TINYINT value" do
207-
expect([Fixnum, Bignum]).to include(@test_result['tiny_int_test'].class)
207+
expect(num_classes).to include(@test_result['tiny_int_test'].class)
208208
expect(@test_result['tiny_int_test']).to eql(1)
209209
end
210210

@@ -248,27 +248,27 @@
248248
end
249249

250250
it "should return Fixnum for a SMALLINT value" do
251-
expect([Fixnum, Bignum]).to include(@test_result['small_int_test'].class)
251+
expect(num_classes).to include(@test_result['small_int_test'].class)
252252
expect(@test_result['small_int_test']).to eql(10)
253253
end
254254

255255
it "should return Fixnum for a MEDIUMINT value" do
256-
expect([Fixnum, Bignum]).to include(@test_result['medium_int_test'].class)
256+
expect(num_classes).to include(@test_result['medium_int_test'].class)
257257
expect(@test_result['medium_int_test']).to eql(10)
258258
end
259259

260260
it "should return Fixnum for an INT value" do
261-
expect([Fixnum, Bignum]).to include(@test_result['int_test'].class)
261+
expect(num_classes).to include(@test_result['int_test'].class)
262262
expect(@test_result['int_test']).to eql(10)
263263
end
264264

265265
it "should return Fixnum for a BIGINT value" do
266-
expect([Fixnum, Bignum]).to include(@test_result['big_int_test'].class)
266+
expect(num_classes).to include(@test_result['big_int_test'].class)
267267
expect(@test_result['big_int_test']).to eql(10)
268268
end
269269

270270
it "should return Fixnum for a YEAR value" do
271-
expect([Fixnum, Bignum]).to include(@test_result['year_test'].class)
271+
expect(num_classes).to include(@test_result['year_test'].class)
272272
expect(@test_result['year_test']).to eql(2009)
273273
end
274274

spec/mysql2/statement_spec.rb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ def stmt_count
372372
end
373373

374374
it "should return Fixnum for a TINYINT value" do
375-
expect([Fixnum, Bignum]).to include(@test_result['tiny_int_test'].class)
375+
expect(num_classes).to include(@test_result['tiny_int_test'].class)
376376
expect(@test_result['tiny_int_test']).to eql(1)
377377
end
378378

@@ -420,27 +420,27 @@ def stmt_count
420420
end
421421

422422
it "should return Fixnum for a SMALLINT value" do
423-
expect([Fixnum, Bignum]).to include(@test_result['small_int_test'].class)
423+
expect(num_classes).to include(@test_result['small_int_test'].class)
424424
expect(@test_result['small_int_test']).to eql(10)
425425
end
426426

427427
it "should return Fixnum for a MEDIUMINT value" do
428-
expect([Fixnum, Bignum]).to include(@test_result['medium_int_test'].class)
428+
expect(num_classes).to include(@test_result['medium_int_test'].class)
429429
expect(@test_result['medium_int_test']).to eql(10)
430430
end
431431

432432
it "should return Fixnum for an INT value" do
433-
expect([Fixnum, Bignum]).to include(@test_result['int_test'].class)
433+
expect(num_classes).to include(@test_result['int_test'].class)
434434
expect(@test_result['int_test']).to eql(10)
435435
end
436436

437437
it "should return Fixnum for a BIGINT value" do
438-
expect([Fixnum, Bignum]).to include(@test_result['big_int_test'].class)
438+
expect(num_classes).to include(@test_result['big_int_test'].class)
439439
expect(@test_result['big_int_test']).to eql(10)
440440
end
441441

442442
it "should return Fixnum for a YEAR value" do
443-
expect([Fixnum, Bignum]).to include(@test_result['year_test'].class)
443+
expect(num_classes).to include(@test_result['year_test'].class)
444444
expect(@test_result['year_test']).to eql(2009)
445445
end
446446

spec/spec_helper.rb

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,10 @@ def new_client(option_overrides = {})
3636
end
3737
end
3838

39+
def num_classes
40+
0.class == Integer ? [Integer] : [Fixnum, Bignum]
41+
end
42+
3943
config.before :each do
4044
@client = new_client
4145
end

0 commit comments

Comments
 (0)