Skip to content

Commit 46a8187

Browse files
tamirdtamird
committed
Use constants
1 parent 3c611f9 commit 46a8187

File tree

4 files changed

+53
-53
lines changed

4 files changed

+53
-53
lines changed

‎spec/mysql2/client_spec.rb

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -709,19 +709,19 @@ def run_gc
709709

710710
it "should default to the connection's encoding if Encoding.default_internal is nil" do
711711
with_internal_encoding nil do
712-
expect(@client.info[:version].encoding).to eql(Encoding.find('utf-8'))
712+
expect(@client.info[:version].encoding).to eql(Encoding::UTF_8)
713713

714714
client2 = Mysql2::Client.new(DatabaseCredentials['root'].merge(:encoding => 'ascii'))
715-
expect(client2.info[:version].encoding).to eql(Encoding.find('us-ascii'))
715+
expect(client2.info[:version].encoding).to eql(Encoding::ASCII)
716716
end
717717
end
718718

719719
it "should use Encoding.default_internal" do
720-
with_internal_encoding 'utf-8' do
720+
with_internal_encoding Encoding::UTF_8 do
721721
expect(@client.info[:version].encoding).to eql(Encoding.default_internal)
722722
end
723723

724-
with_internal_encoding 'us-ascii' do
724+
with_internal_encoding Encoding::ASCII do
725725
expect(@client.info[:version].encoding).to eql(Encoding.default_internal)
726726
end
727727
end
@@ -752,19 +752,19 @@ def run_gc
752752

753753
it "should default to the connection's encoding if Encoding.default_internal is nil" do
754754
with_internal_encoding nil do
755-
expect(@client.server_info[:version].encoding).to eql(Encoding.find('utf-8'))
755+
expect(@client.server_info[:version].encoding).to eql(Encoding::UTF_8)
756756

757757
client2 = Mysql2::Client.new(DatabaseCredentials['root'].merge(:encoding => 'ascii'))
758-
expect(client2.server_info[:version].encoding).to eql(Encoding.find('us-ascii'))
758+
expect(client2.server_info[:version].encoding).to eql(Encoding::ASCII)
759759
end
760760
end
761761

762762
it "should use Encoding.default_internal" do
763-
with_internal_encoding 'utf-8' do
763+
with_internal_encoding Encoding::UTF_8 do
764764
expect(@client.server_info[:version].encoding).to eql(Encoding.default_internal)
765765
end
766766

767-
with_internal_encoding 'us-ascii' do
767+
with_internal_encoding Encoding::ASCII do
768768
expect(@client.server_info[:version].encoding).to eql(Encoding.default_internal)
769769
end
770770
end

‎spec/mysql2/error_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
end
7373

7474
it "returns error messages and sql state in Encoding.default_internal if set" do
75-
with_internal_encoding 'UTF-16LE' do
75+
with_internal_encoding Encoding::UTF_16LE do
7676
expect(error.message.encoding).to eql(Encoding.default_internal)
7777
expect(error.message).to be_valid_encoding
7878

‎spec/mysql2/result_spec.rb

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -348,22 +348,22 @@
348348
it "should default to the connection's encoding if Encoding.default_internal is nil" do
349349
with_internal_encoding nil do
350350
result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
351-
expect(result['enum_test'].encoding).to eql(Encoding.find('utf-8'))
351+
expect(result['enum_test'].encoding).to eql(Encoding::UTF_8)
352352

353353
client2 = Mysql2::Client.new(DatabaseCredentials['root'].merge(:encoding => 'ascii'))
354354
result = client2.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
355-
expect(result['enum_test'].encoding).to eql(Encoding.find('us-ascii'))
355+
expect(result['enum_test'].encoding).to eql(Encoding::ASCII)
356356
client2.close
357357
end
358358
end
359359

360360
it "should use Encoding.default_internal" do
361-
with_internal_encoding 'utf-8' do
361+
with_internal_encoding Encoding::UTF_8 do
362362
result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
363363
expect(result['enum_test'].encoding).to eql(Encoding.default_internal)
364364
end
365365

366-
with_internal_encoding 'us-ascii' do
366+
with_internal_encoding Encoding::ASCII do
367367
result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
368368
expect(result['enum_test'].encoding).to eql(Encoding.default_internal)
369369
end
@@ -381,22 +381,22 @@
381381
it "should default to the connection's encoding if Encoding.default_internal is nil" do
382382
with_internal_encoding nil do
383383
result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
384-
expect(result['set_test'].encoding).to eql(Encoding.find('utf-8'))
384+
expect(result['set_test'].encoding).to eql(Encoding::UTF_8)
385385

386386
client2 = Mysql2::Client.new(DatabaseCredentials['root'].merge(:encoding => 'ascii'))
387387
result = client2.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
388-
expect(result['set_test'].encoding).to eql(Encoding.find('us-ascii'))
388+
expect(result['set_test'].encoding).to eql(Encoding::ASCII)
389389
client2.close
390390
end
391391
end
392392

393393
it "should use Encoding.default_internal" do
394-
with_internal_encoding 'utf-8' do
394+
with_internal_encoding Encoding::UTF_8 do
395395
result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
396396
expect(result['set_test'].encoding).to eql(Encoding.default_internal)
397397
end
398398

399-
with_internal_encoding 'us-ascii' do
399+
with_internal_encoding Encoding::ASCII do
400400
result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
401401
expect(result['set_test'].encoding).to eql(Encoding.default_internal)
402402
end
@@ -414,19 +414,19 @@
414414
it "should default to binary if Encoding.default_internal is nil" do
415415
with_internal_encoding nil do
416416
result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
417-
expect(result['binary_test'].encoding).to eql(Encoding.find('binary'))
417+
expect(result['binary_test'].encoding).to eql(Encoding::BINARY)
418418
end
419419
end
420420

421421
it "should not use Encoding.default_internal" do
422-
with_internal_encoding 'utf-8' do
422+
with_internal_encoding Encoding::UTF_8 do
423423
result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
424-
expect(result['binary_test'].encoding).to eql(Encoding.find('binary'))
424+
expect(result['binary_test'].encoding).to eql(Encoding::BINARY)
425425
end
426426

427-
with_internal_encoding 'us-ascii' do
427+
with_internal_encoding Encoding::ASCII do
428428
result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
429-
expect(result['binary_test'].encoding).to eql(Encoding.find('binary'))
429+
expect(result['binary_test'].encoding).to eql(Encoding::BINARY)
430430
end
431431
end
432432
end
@@ -456,41 +456,41 @@
456456
it "should default to binary if Encoding.default_internal is nil" do
457457
with_internal_encoding nil do
458458
result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
459-
expect(result['binary_test'].encoding).to eql(Encoding.find('binary'))
459+
expect(result['binary_test'].encoding).to eql(Encoding::BINARY)
460460
end
461461
end
462462

463463
it "should not use Encoding.default_internal" do
464-
with_internal_encoding 'utf-8' do
464+
with_internal_encoding Encoding::UTF_8 do
465465
result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
466-
expect(result['binary_test'].encoding).to eql(Encoding.find('binary'))
466+
expect(result['binary_test'].encoding).to eql(Encoding::BINARY)
467467
end
468468

469-
with_internal_encoding 'us-ascii' do
469+
with_internal_encoding Encoding::ASCII do
470470
result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
471-
expect(result['binary_test'].encoding).to eql(Encoding.find('binary'))
471+
expect(result['binary_test'].encoding).to eql(Encoding::BINARY)
472472
end
473473
end
474474
else
475475
it "should default to utf-8 if Encoding.default_internal is nil" do
476476
with_internal_encoding nil do
477477
result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
478-
expect(result[field].encoding).to eql(Encoding.find('utf-8'))
478+
expect(result[field].encoding).to eql(Encoding::UTF_8)
479479

480480
client2 = Mysql2::Client.new(DatabaseCredentials['root'].merge(:encoding => 'ascii'))
481481
result = client2.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
482-
expect(result[field].encoding).to eql(Encoding.find('us-ascii'))
482+
expect(result[field].encoding).to eql(Encoding::ASCII)
483483
client2.close
484484
end
485485
end
486486

487487
it "should use Encoding.default_internal" do
488-
with_internal_encoding 'utf-8' do
488+
with_internal_encoding Encoding::UTF_8 do
489489
result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
490490
expect(result[field].encoding).to eql(Encoding.default_internal)
491491
end
492492

493-
with_internal_encoding 'us-ascii' do
493+
with_internal_encoding Encoding::ASCII do
494494
result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
495495
expect(result[field].encoding).to eql(Encoding.default_internal)
496496
end

‎spec/mysql2/statement_spec.rb

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -414,22 +414,22 @@
414414
it "should default to the connection's encoding if Encoding.default_internal is nil" do
415415
with_internal_encoding nil do
416416
result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
417-
expect(result['enum_test'].encoding).to eql(Encoding.find('utf-8'))
417+
expect(result['enum_test'].encoding).to eql(Encoding::UTF_8)
418418

419419
client2 = Mysql2::Client.new(DatabaseCredentials['root'].merge(:encoding => 'ascii'))
420420
result = client2.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
421-
expect(result['enum_test'].encoding).to eql(Encoding.find('us-ascii'))
421+
expect(result['enum_test'].encoding).to eql(Encoding::US_ASCII)
422422
client2.close
423423
end
424424
end
425425

426426
it "should use Encoding.default_internal" do
427-
with_internal_encoding 'utf-8' do
427+
with_internal_encoding Encoding::UTF_8 do
428428
result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
429429
expect(result['enum_test'].encoding).to eql(Encoding.default_internal)
430430
end
431431

432-
with_internal_encoding 'us-ascii' do
432+
with_internal_encoding Encoding::ASCII do
433433
result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
434434
expect(result['enum_test'].encoding).to eql(Encoding.default_internal)
435435
end
@@ -447,22 +447,22 @@
447447
it "should default to the connection's encoding if Encoding.default_internal is nil" do
448448
with_internal_encoding nil do
449449
result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
450-
expect(result['set_test'].encoding).to eql(Encoding.find('utf-8'))
450+
expect(result['set_test'].encoding).to eql(Encoding::UTF_8)
451451

452452
client2 = Mysql2::Client.new(DatabaseCredentials['root'].merge(:encoding => 'ascii'))
453453
result = client2.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
454-
expect(result['set_test'].encoding).to eql(Encoding.find('us-ascii'))
454+
expect(result['set_test'].encoding).to eql(Encoding::US_ASCII)
455455
client2.close
456456
end
457457
end
458458

459459
it "should use Encoding.default_internal" do
460-
with_internal_encoding 'utf-8' do
460+
with_internal_encoding Encoding::UTF_8 do
461461
result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
462462
expect(result['set_test'].encoding).to eql(Encoding.default_internal)
463463
end
464464

465-
with_internal_encoding 'us-ascii' do
465+
with_internal_encoding Encoding::ASCII do
466466
result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
467467
expect(result['set_test'].encoding).to eql(Encoding.default_internal)
468468
end
@@ -480,19 +480,19 @@
480480
it "should default to binary if Encoding.default_internal is nil" do
481481
with_internal_encoding nil do
482482
result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
483-
expect(result['binary_test'].encoding).to eql(Encoding.find('binary'))
483+
expect(result['binary_test'].encoding).to eql(Encoding::BINARY)
484484
end
485485
end
486486

487487
it "should not use Encoding.default_internal" do
488-
with_internal_encoding 'utf-8' do
488+
with_internal_encoding Encoding::UTF_8 do
489489
result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
490-
expect(result['binary_test'].encoding).to eql(Encoding.find('binary'))
490+
expect(result['binary_test'].encoding).to eql(Encoding::BINARY)
491491
end
492492

493-
with_internal_encoding 'us-ascii' do
493+
with_internal_encoding Encoding::ASCII do
494494
result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
495-
expect(result['binary_test'].encoding).to eql(Encoding.find('binary'))
495+
expect(result['binary_test'].encoding).to eql(Encoding::BINARY)
496496
end
497497
end
498498
end
@@ -522,41 +522,41 @@
522522
it "should default to binary if Encoding.default_internal is nil" do
523523
with_internal_encoding nil do
524524
result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
525-
expect(result['binary_test'].encoding).to eql(Encoding.find('binary'))
525+
expect(result['binary_test'].encoding).to eql(Encoding::BINARY)
526526
end
527527
end
528528

529529
it "should not use Encoding.default_internal" do
530-
with_internal_encoding 'utf-8' do
530+
with_internal_encoding Encoding::UTF_8 do
531531
result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
532-
expect(result['binary_test'].encoding).to eql(Encoding.find('binary'))
532+
expect(result['binary_test'].encoding).to eql(Encoding::BINARY)
533533
end
534534

535-
with_internal_encoding 'us-ascii' do
535+
with_internal_encoding Encoding::ASCII do
536536
result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
537-
expect(result['binary_test'].encoding).to eql(Encoding.find('binary'))
537+
expect(result['binary_test'].encoding).to eql(Encoding::BINARY)
538538
end
539539
end
540540
else
541541
it "should default to utf-8 if Encoding.default_internal is nil" do
542542
with_internal_encoding nil do
543543
result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
544-
expect(result[field].encoding).to eql(Encoding.find('utf-8'))
544+
expect(result[field].encoding).to eql(Encoding::UTF_8)
545545

546546
client2 = Mysql2::Client.new(DatabaseCredentials['root'].merge(:encoding => 'ascii'))
547547
result = client2.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
548-
expect(result[field].encoding).to eql(Encoding.find('us-ascii'))
548+
expect(result[field].encoding).to eql(Encoding::US_ASCII)
549549
client2.close
550550
end
551551
end
552552

553553
it "should use Encoding.default_internal" do
554-
with_internal_encoding 'utf-8' do
554+
with_internal_encoding Encoding::UTF_8 do
555555
result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
556556
expect(result[field].encoding).to eql(Encoding.default_internal)
557557
end
558558

559-
with_internal_encoding 'us-ascii' do
559+
with_internal_encoding Encoding::ASCII do
560560
result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
561561
expect(result[field].encoding).to eql(Encoding.default_internal)
562562
end

0 commit comments

Comments
 (0)