Skip to content

Commit 652d9a9

Browse files
Use be_nil and be_true/be_false everywhere in specs (#15867)
Transforms all `eq nil` and `eq true`/`eq false` calls in specs to `be_nil` and `be_true`/`be_false` to enforce a consistent style. We're already using `be_*` in the vast majority of cases. Less than 10% of expectations are using the `eq` style.
1 parent d5c8962 commit 652d9a9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+239
-239
lines changed

spec/compiler/codegen/const_spec.cr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -566,6 +566,6 @@ describe "Codegen: const" do
566566
567567
CONST = foo
568568
CONST.nil?
569-
)).to_b.should eq(true)
569+
)).to_b.should be_true
570570
end
571571
end

spec/compiler/codegen/macro_spec.cr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -596,7 +596,7 @@ describe "Code gen: macro" do
596596
end
597597
end
598598
Foo(1).new.foo
599-
)).to_b.should eq(true)
599+
)).to_b.should be_true
600600
end
601601

602602
it "can access type variables of a tuple" do
@@ -1867,7 +1867,7 @@ describe "Code gen: macro" do
18671867
end
18681868
18691869
Foo.new.bar
1870-
)).to_b.should eq(true)
1870+
)).to_b.should be_true
18711871
end
18721872

18731873
it "does block unpacking inside macro expression (#13707)" do

spec/compiler/codegen/regex_literal_spec.cr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ describe "Code gen: regex literal spec" do
1212
end
1313
end
1414
Foo.check_regex
15-
)).to_b.should eq(true)
15+
)).to_b.should be_true
1616
end
1717
end

spec/compiler/crystal/tools/doc/type_spec.cr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ describe Doc::Type do
140140
generator = Doc::Generator.new program, [""]
141141
macros_module = program.types["Crystal"].types["Macros"]
142142
astnode = generator.type(macros_module.types["ASTNode"])
143-
astnode.superclass.should eq(nil)
143+
astnode.superclass.should be_nil
144144
# Sanity check: subclasses of ASTNode has the right superclass
145145
generator.type(macros_module.types["Arg"]).superclass.should eq(astnode)
146146
end

spec/compiler/crystal/tools/repl_spec.cr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ describe Crystal::Repl do
1414
repl.load_prelude
1515

1616
success_value(repl.parse_and_interpret("1 + 2")).value.should eq(3)
17-
success_value(repl.parse_and_interpret("def foo; 1 + 2; end")).value.should eq(nil)
17+
success_value(repl.parse_and_interpret("def foo; 1 + 2; end")).value.should be_nil
1818
success_value(repl.parse_and_interpret("foo")).value.should eq(3)
1919
end
2020

spec/compiler/interpreter/bugs_spec.cr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ describe Crystal::Repl::Interpreter do
136136
end
137137

138138
it "does multidispatch on virtual struct" do
139-
interpret(<<-CRYSTAL).should eq(true)
139+
interpret(<<-CRYSTAL).should be_true
140140
abstract struct Base
141141
end
142142
@@ -187,7 +187,7 @@ describe Crystal::Repl::Interpreter do
187187
end
188188

189189
it "does multidispatch on virtual struct union nil" do
190-
interpret(<<-CRYSTAL).should eq(true)
190+
interpret(<<-CRYSTAL).should be_true
191191
abstract struct Foo
192192
@value = 1
193193
end

spec/compiler/interpreter/casts_spec.cr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ describe Crystal::Repl::Interpreter do
2525
end
2626

2727
it "casts from mixed union type to another mixed union type for caller" do
28-
interpret(<<-CRYSTAL).should eq(true)
28+
interpret(<<-CRYSTAL).should be_true
2929
a = 1 == 1 ? 1 : (1 == 1 ? 20_i16 : nil)
3030
if a
3131
a < 2
@@ -49,7 +49,7 @@ describe Crystal::Repl::Interpreter do
4949
end
5050

5151
it "casts from nilable type to mixed union type (2)" do
52-
interpret(<<-CRYSTAL).should eq(true)
52+
interpret(<<-CRYSTAL).should be_true
5353
y = 1 == 1 ? "a" : nil
5454
x = true
5555
x = y

spec/compiler/interpreter/constants_spec.cr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ require "./spec_helper"
44
describe Crystal::Repl::Interpreter do
55
context "constants" do
66
it "returns nil in the assignment" do
7-
interpret(<<-CRYSTAL).should eq(nil)
7+
interpret(<<-CRYSTAL).should be_nil
88
A = 123
99
CRYSTAL
1010
end

spec/compiler/interpreter/control_flow_spec.cr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ describe Crystal::Repl::Interpreter do
7070
end
7171

7272
it "interprets while, returns nil" do
73-
interpret(<<-CRYSTAL).should eq(nil)
73+
interpret(<<-CRYSTAL).should be_nil
7474
a = 0
7575
while a < 10
7676
a = a + 1

spec/compiler/interpreter/primitives_spec.cr

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ describe Crystal::Repl::Interpreter do
9595
end
9696

9797
it "uses a string pool" do
98-
interpret(<<-CRYSTAL).should eq(true)
98+
interpret(<<-CRYSTAL).should be_true
9999
"a".object_id == "a".object_id
100100
CRYSTAL
101101
end
@@ -153,7 +153,7 @@ describe Crystal::Repl::Interpreter do
153153
end
154154

155155
it "doesn't declare variable with no type" do
156-
interpret(<<-CRYSTAL).should eq(nil)
156+
interpret(<<-CRYSTAL).should be_nil
157157
x = nil
158158
if x
159159
y = x
@@ -162,7 +162,7 @@ describe Crystal::Repl::Interpreter do
162162
end
163163

164164
it "doesn't declare variable with no type inside method" do
165-
interpret(<<-CRYSTAL).should eq(nil)
165+
interpret(<<-CRYSTAL).should be_nil
166166
def foo(x)
167167
if x
168168
y = x
@@ -702,19 +702,19 @@ describe Crystal::Repl::Interpreter do
702702

703703
context "logical operations" do
704704
it "interprets not for nil" do
705-
interpret("!nil").should eq(true)
705+
interpret("!nil").should be_true
706706
end
707707

708708
it "interprets not for nil type" do
709709
interpret("x = 1; !(x = 2; nil); x").should eq(2)
710710
end
711711

712712
it "interprets not for bool true" do
713-
interpret("!true").should eq(false)
713+
interpret("!true").should be_false
714714
end
715715

716716
it "interprets not for bool false" do
717-
interpret("!false").should eq(true)
717+
interpret("!false").should be_true
718718
end
719719

720720
it "discards nil not" do
@@ -726,35 +726,35 @@ describe Crystal::Repl::Interpreter do
726726
end
727727

728728
it "interprets not for bool false" do
729-
interpret("!false").should eq(true)
729+
interpret("!false").should be_true
730730
end
731731

732732
it "interprets not for mixed union (nil)" do
733-
interpret("!(1 == 1 ? nil : 2)").should eq(true)
733+
interpret("!(1 == 1 ? nil : 2)").should be_true
734734
end
735735

736736
it "interprets not for mixed union (false)" do
737-
interpret("!(1 == 1 ? false : 2)").should eq(true)
737+
interpret("!(1 == 1 ? false : 2)").should be_true
738738
end
739739

740740
it "interprets not for mixed union (true)" do
741-
interpret("!(1 == 1 ? true : 2)").should eq(false)
741+
interpret("!(1 == 1 ? true : 2)").should be_false
742742
end
743743

744744
it "interprets not for mixed union (other)" do
745-
interpret("!(1 == 1 ? 2 : true)").should eq(false)
745+
interpret("!(1 == 1 ? 2 : true)").should be_false
746746
end
747747

748748
it "interprets not for nilable type (false)" do
749-
interpret(%(!(1 == 1 ? "hello" : nil))).should eq(false)
749+
interpret(%(!(1 == 1 ? "hello" : nil))).should be_false
750750
end
751751

752752
it "interprets not for nilable type (true)" do
753-
interpret(%(!(1 == 1 ? nil : "hello"))).should eq(true)
753+
interpret(%(!(1 == 1 ? nil : "hello"))).should be_true
754754
end
755755

756756
it "interprets not for nilable proc type (true)" do
757-
interpret(<<-CRYSTAL).should eq(true)
757+
interpret(<<-CRYSTAL).should be_true
758758
a =
759759
if 1 == 1
760760
nil
@@ -766,7 +766,7 @@ describe Crystal::Repl::Interpreter do
766766
end
767767

768768
it "interprets not for nilable proc type (false)" do
769-
interpret(<<-CRYSTAL).should eq(false)
769+
interpret(<<-CRYSTAL).should be_false
770770
a =
771771
if 1 == 1
772772
->{ 1 }
@@ -778,7 +778,7 @@ describe Crystal::Repl::Interpreter do
778778
end
779779

780780
it "interprets not for generic class instance type" do
781-
interpret(<<-CRYSTAL).should eq(false)
781+
interpret(<<-CRYSTAL).should be_false
782782
class Foo(T)
783783
end
784784
@@ -788,7 +788,7 @@ describe Crystal::Repl::Interpreter do
788788
end
789789

790790
it "interprets not for nilable type (false)" do
791-
interpret(<<-CRYSTAL).should eq(false)
791+
interpret(<<-CRYSTAL).should be_false
792792
class Foo
793793
end
794794
@@ -805,7 +805,7 @@ describe Crystal::Repl::Interpreter do
805805
end
806806

807807
it "interprets not for nilable type (true)" do
808-
interpret(<<-CRYSTAL).should eq(true)
808+
interpret(<<-CRYSTAL).should be_true
809809
class Foo
810810
end
811811
@@ -822,7 +822,7 @@ describe Crystal::Repl::Interpreter do
822822
end
823823

824824
it "interprets not for module (#12918)" do
825-
interpret(<<-CRYSTAL).should eq(false)
825+
interpret(<<-CRYSTAL).should be_false
826826
module MyModule; end
827827
828828
class One
@@ -834,7 +834,7 @@ describe Crystal::Repl::Interpreter do
834834
end
835835

836836
it "interprets not for generic module" do
837-
interpret(<<-CRYSTAL).should eq(false)
837+
interpret(<<-CRYSTAL).should be_false
838838
module MyModule(T); end
839839
840840
class One
@@ -846,15 +846,15 @@ describe Crystal::Repl::Interpreter do
846846
end
847847

848848
it "interprets not for generic module metaclass" do
849-
interpret(<<-CRYSTAL).should eq(false)
849+
interpret(<<-CRYSTAL).should be_false
850850
module MyModule(T); end
851851
852852
!MyModule(Int32)
853853
CRYSTAL
854854
end
855855

856856
it "interprets not for generic class instance metaclass" do
857-
interpret(<<-CRYSTAL).should eq(false)
857+
interpret(<<-CRYSTAL).should be_false
858858
class MyClass(T); end
859859
860860
!MyClass(Int32)

spec/compiler/interpreter/types_spec.cr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ describe Crystal::Repl::Interpreter do
107107
end
108108

109109
it "interprets crystal_type_id for virtual metaclass type (#12228)" do
110-
interpret(<<-CRYSTAL).should eq(true)
110+
interpret(<<-CRYSTAL).should be_true
111111
class P
112112
end
113113

spec/compiler/interpreter/unions_spec.cr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ describe Crystal::Repl::Interpreter do
1111
end
1212

1313
it "put and remove from union, together with is_a? (falsey case)" do
14-
interpret(<<-CRYSTAL).should eq(true)
14+
interpret(<<-CRYSTAL).should be_true
1515
a = 1 == 2 ? 2 : true
1616
a.is_a?(Int32) ? true : a
1717
CRYSTAL

0 commit comments

Comments
 (0)