Skip to content

Commit 4e241f8

Browse files
rmosolgormosolgo
authored
Merge pull request #4916 from rmosolgo/replace-nil-assertions
Update specs to use assert_nil
2 parents b167d08 + 7e5dd80 commit 4e241f8

File tree

13 files changed

+73
-61
lines changed

13 files changed

+73
-61
lines changed

‎spec/graphql/execution/interpreter_spec.rb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -535,8 +535,8 @@ def execute_multiplex(multiplex:)
535535

536536
assert_equal 3, res["data"]["findMany"].size
537537
assert_equal "RAV", res["data"]["findMany"][0]["sym"]
538-
assert_equal nil, res["data"]["findMany"][1]
539-
assert_equal nil, res["data"]["findMany"][2]
538+
assert_nil res["data"]["findMany"][1]
539+
assert_nil res["data"]["findMany"][2]
540540
assert_equal false, res.key?("errors")
541541

542542
assert_equal Hash, res["data"].class

‎spec/graphql/schema/input_object_spec.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
describe "type info" do
1818
it "has it" do
1919
assert_equal "EnsembleInput", input_object.graphql_name
20-
assert_equal nil, input_object.description
20+
assert_nil input_object.description
2121
assert_equal 1, input_object.arguments.size
2222
end
2323

‎spec/graphql/schema/loader_spec.rb‎

Lines changed: 45 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -154,74 +154,81 @@ def self.coerce_result(value, _ctx)
154154
}
155155

156156
describe "load" do
157+
def assert_equal_or_nil(expected_value, actual_value)
158+
if expected_value.nil?
159+
assert_nil actual_value
160+
else
161+
assert_equal expected_value, actual_value
162+
end
163+
end
157164
def assert_deep_equal(expected_type, actual_type)
158165
if actual_type.is_a?(Array)
159166
actual_type.each_with_index do |obj, index|
160167
assert_deep_equal expected_type[index], obj
161168
end
162169
elsif actual_type.is_a?(GraphQL::Schema::Field)
163-
assert_equal expected_type.graphql_name, actual_type.graphql_name
164-
assert_equal expected_type.description, actual_type.description
165-
assert_equal expected_type.deprecation_reason, actual_type.deprecation_reason
166-
assert_equal expected_type.arguments.keys.sort, actual_type.arguments.keys.sort
170+
assert_equal_or_nil expected_type.graphql_name, actual_type.graphql_name
171+
assert_equal_or_nil expected_type.description, actual_type.description
172+
assert_equal_or_nil expected_type.deprecation_reason, actual_type.deprecation_reason
173+
assert_equal_or_nil expected_type.arguments.keys.sort, actual_type.arguments.keys.sort
167174
assert_deep_equal expected_type.arguments.values.sort_by(&:graphql_name), actual_type.arguments.values.sort_by(&:graphql_name)
168175
elsif actual_type.is_a?(GraphQL::Schema::EnumValue)
169-
assert_equal expected_type.graphql_name, actual_type.graphql_name
170-
assert_equal expected_type.description, actual_type.description
171-
assert_equal expected_type.deprecation_reason, actual_type.deprecation_reason
176+
assert_equal_or_nil expected_type.graphql_name, actual_type.graphql_name
177+
assert_equal_or_nil expected_type.description, actual_type.description
178+
assert_equal_or_nil expected_type.deprecation_reason, actual_type.deprecation_reason
172179
elsif actual_type.is_a?(GraphQL::Schema::Argument)
173-
assert_equal expected_type.graphql_name, actual_type.graphql_name
174-
assert_equal expected_type.description, actual_type.description
175-
assert_equal expected_type.deprecation_reason, actual_type.deprecation_reason
180+
assert_equal_or_nil expected_type.graphql_name, actual_type.graphql_name
181+
assert_equal_or_nil expected_type.description, actual_type.description
182+
assert_equal_or_nil expected_type.deprecation_reason, actual_type.deprecation_reason
176183
assert_deep_equal expected_type.type, actual_type.type
177184
elsif actual_type.is_a?(GraphQL::Schema::NonNull) || actual_type.is_a?(GraphQL::Schema::List)
178-
assert_equal expected_type.class, actual_type.class
185+
assert_equal_or_nil expected_type.class, actual_type.class
179186
assert_deep_equal expected_type.of_type, actual_type.of_type
180187
elsif actual_type < GraphQL::Schema
181-
assert_equal expected_type.query.graphql_name, actual_type.query.graphql_name
182-
assert_equal expected_type.mutation.graphql_name, actual_type.mutation.graphql_name
183-
assert_equal expected_type.directives.keys.sort, actual_type.directives.keys.sort
188+
assert_equal_or_nil expected_type.query.graphql_name, actual_type.query.graphql_name
189+
assert_equal_or_nil expected_type.mutation.graphql_name, actual_type.mutation.graphql_name
190+
assert_equal_or_nil expected_type.directives.keys.sort, actual_type.directives.keys.sort
184191
assert_deep_equal expected_type.directives.values.sort_by(&:graphql_name), actual_type.directives.values.sort_by(&:graphql_name)
185-
assert_equal expected_type.types.keys.sort, actual_type.types.keys.sort
192+
assert_equal_or_nil expected_type.types.keys.sort, actual_type.types.keys.sort
186193
assert_deep_equal expected_type.types.values.sort_by(&:graphql_name), actual_type.types.values.sort_by(&:graphql_name)
187-
assert_equal expected_type.description, actual_type.description
194+
assert_equal_or_nil expected_type.description, actual_type.description
188195
elsif actual_type < GraphQL::Schema::Object
189-
assert_equal expected_type.graphql_name, actual_type.graphql_name
190-
assert_equal expected_type.description, actual_type.description
191-
assert_equal expected_type.interfaces.map(&:graphql_name).sort, actual_type.interfaces.map(&:graphql_name).sort
196+
assert_equal_or_nil expected_type.graphql_name, actual_type.graphql_name
197+
assert_equal_or_nil expected_type.description, actual_type.description
198+
assert_equal_or_nil expected_type.interfaces.map(&:graphql_name).sort, actual_type.interfaces.map(&:graphql_name).sort
192199
assert_deep_equal expected_type.interfaces.sort_by(&:graphql_name), actual_type.interfaces.sort_by(&:graphql_name)
193-
assert_equal expected_type.fields.keys.sort, actual_type.fields.keys.sort
200+
assert_equal_or_nil expected_type.fields.keys.sort, actual_type.fields.keys.sort
194201
assert_deep_equal expected_type.fields.values.sort_by(&:graphql_name), actual_type.fields.values.sort_by(&:graphql_name)
195202
elsif actual_type < GraphQL::Schema::Interface
196-
assert_equal expected_type.graphql_name, actual_type.graphql_name
197-
assert_equal expected_type.description, actual_type.description
198-
assert_equal expected_type.fields.keys.sort, actual_type.fields.keys.sort
203+
assert_equal_or_nil expected_type.graphql_name, actual_type.graphql_name
204+
assert_equal_or_nil expected_type.description, actual_type.description
205+
assert_equal_or_nil expected_type.fields.keys.sort, actual_type.fields.keys.sort
199206
assert_deep_equal expected_type.fields.values.sort_by(&:graphql_name), actual_type.fields.values.sort_by(&:graphql_name)
200207
elsif actual_type < GraphQL::Schema::Union
201-
assert_equal expected_type.graphql_name, actual_type.graphql_name
202-
assert_equal expected_type.description, actual_type.description
203-
assert_equal expected_type.possible_types.map(&:graphql_name).sort, actual_type.possible_types.map(&:graphql_name).sort
208+
assert_equal_or_nil expected_type.graphql_name, actual_type.graphql_name
209+
assert_equal_or_nil expected_type.description, actual_type.description
210+
assert_equal_or_nil expected_type.possible_types.map(&:graphql_name).sort, actual_type.possible_types.map(&:graphql_name).sort
204211
assert_deep_equal expected_type.possible_types.sort_by(&:graphql_name), actual_type.possible_types.sort_by(&:graphql_name)
205212
elsif actual_type < GraphQL::Schema::Scalar
206-
assert_equal expected_type.graphql_name, actual_type.graphql_name
207-
assert_equal expected_type.specified_by_url, actual_type.specified_by_url
213+
assert_equal_or_nil expected_type.graphql_name, actual_type.graphql_name
214+
assert_equal_or_nil expected_type.specified_by_url, actual_type.specified_by_url
208215
elsif actual_type < GraphQL::Schema::Enum
209-
assert_equal expected_type.graphql_name, actual_type.graphql_name
210-
assert_equal expected_type.description, actual_type.description
216+
assert_equal_or_nil expected_type.graphql_name, actual_type.graphql_name
217+
assert_equal_or_nil expected_type.description, actual_type.description
211218
assert_deep_equal expected_type.values.values.sort_by(&:graphql_name), actual_type.values.values.sort_by(&:graphql_name)
212219
elsif actual_type < GraphQL::Schema::InputObject
213-
assert_equal expected_type.graphql_name, actual_type.graphql_name
214-
assert_equal expected_type.arguments.keys.sort, actual_type.arguments.keys.sort
220+
assert_equal_or_nil expected_type.graphql_name, actual_type.graphql_name
221+
assert_equal_or_nil expected_type.arguments.keys.sort, actual_type.arguments.keys.sort
215222
assert_deep_equal expected_type.arguments.values.sort_by(&:graphql_name), actual_type.arguments.values.sort_by(&:graphql_name)
216223
elsif actual_type < GraphQL::Schema::Directive
217-
assert_equal expected_type.graphql_name, actual_type.graphql_name
218-
assert_equal expected_type.description, actual_type.description
219-
assert_equal expected_type.repeatable?, actual_type.repeatable?
220-
assert_equal expected_type.locations.sort, actual_type.locations.sort
221-
assert_equal expected_type.arguments.keys.sort, actual_type.arguments.keys.sort
224+
assert_equal_or_nil expected_type.graphql_name, actual_type.graphql_name
225+
assert_equal_or_nil expected_type.description, actual_type.description
226+
assert_equal_or_nil expected_type.repeatable?, actual_type.repeatable?
227+
assert_equal_or_nil expected_type.locations.sort, actual_type.locations.sort
228+
assert_equal_or_nil expected_type.arguments.keys.sort, actual_type.arguments.keys.sort
222229
assert_deep_equal expected_type.arguments.values.sort_by(&:graphql_name), actual_type.arguments.values.sort_by(&:graphql_name)
223230
else
224-
assert_equal expected_type, actual_type
231+
assert_equa_or_nil expected_type, actual_type
225232
end
226233
end
227234

‎spec/graphql/schema/member/has_arguments_spec.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ def add(left:, right:)
2323

2424
it "doesn't require authorization when arguments with default values aren't present in the query" do
2525
assert_equal 5, DefaultArgumentAuthSchema.execute("{ add(left: 3, right: 2) }", context: { is_authorized: true })["data"].fetch("add")
26-
assert_equal nil, DefaultArgumentAuthSchema.execute("{ add(left: 3, right: 2) }", context: { is_authorized: false })["data"].fetch("add")
26+
assert_nil DefaultArgumentAuthSchema.execute("{ add(left: 3, right: 2) }", context: { is_authorized: false })["data"].fetch("add")
2727
assert_equal 4, DefaultArgumentAuthSchema.execute("{ add(left: 3) }", context: { is_authorized: false })["data"].fetch("add")
2828
end
2929
end

‎spec/graphql/schema/resolver_spec.rb‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -935,21 +935,21 @@ def load_input(input); end
935935
it "preserves `nil` when nullable argument is provided `null`" do
936936
res = exec_query("mutation { mutationWithNullableLoadsArgument(labelId: null) { inputs } }")
937937

938-
assert_equal nil, res["errors"]
938+
assert_nil res["errors"]
939939
assert_equal '{"label":null}', res["data"]["mutationWithNullableLoadsArgument"]["inputs"]
940940
end
941941

942942
it "preserves `nil` when nullable list argument is provided `null`" do
943943
res = exec_query("mutation { mutationWithNullableLoadsArgument(labelIds: null) { inputs } }")
944944

945-
assert_equal nil, res["errors"]
945+
assert_nil res["errors"]
946946
assert_equal '{"labels":null}', res["data"]["mutationWithNullableLoadsArgument"]["inputs"]
947947
end
948948

949949
it "omits omitted nullable argument" do
950950
res = exec_query("mutation { mutationWithNullableLoadsArgument { inputs } }")
951951

952-
assert_equal nil, res["errors"]
952+
assert_nil res["errors"]
953953
assert_equal "{}", res["data"]["mutationWithNullableLoadsArgument"]["inputs"]
954954
end
955955

‎spec/graphql/schema/validator/allow_blank_validator_spec.rb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@
1515
it "rejects blank by default" do
1616
schema = build_schema(String, {length: { minimum: 5 }})
1717
result = schema.execute("query($str: String) { validated(value: $str) }", variables: { str: ValidatorHelpers::BlankString.new })
18-
assert_equal nil, result["data"]["validated"]
18+
assert_nil result["data"]["validated"]
1919
assert_equal ["value is too short (minimum is 5)"], result["errors"].map { |e| e["message"] }
2020
end
2121

2222
it "can be used standalone" do
2323
schema = build_schema(String, { allow_blank: false })
2424
result = schema.execute("query($str: String) { validated(value: $str) }", variables: { str: ValidatorHelpers::BlankString.new })
25-
assert_equal nil, result["data"]["validated"]
25+
assert_nil result["data"]["validated"]
2626
assert_equal ["value can't be blank"], result["errors"].map { |e| e["message"] }
2727
end
2828
end

‎spec/graphql/schema/validator/allow_null_validator_spec.rb‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,32 +8,32 @@
88
it "allows nil when permitted" do
99
schema = build_schema(String, {length: { minimum: 5 }, allow_null: true})
1010
result = schema.execute("query($str: String) { validated(value: $str) }", variables: { str: nil })
11-
assert_equal nil, result["data"]["validated"]
11+
assert_nil result["data"]["validated"]
1212
refute result.key?("errors")
1313
end
1414

1515
it "rejects null by default" do
1616
schema = build_schema(String, {length: { minimum: 5 }})
1717
result = schema.execute("query($str: String) { validated(value: $str) }", variables: { str: nil })
18-
assert_equal nil, result["data"]["validated"]
18+
assert_nil result["data"]["validated"]
1919
assert_equal ["value is too short (minimum is 5)"], result["errors"].map { |e| e["message"] }
2020
end
2121

2222
it "can be used standalone" do
2323
schema = build_schema(String, { allow_null: false })
2424
result = schema.execute("query($str: String) { validated(value: $str) }", variables: { str: nil })
25-
assert_equal nil, result["data"]["validated"]
25+
assert_nil result["data"]["validated"]
2626
assert_equal ["value can't be null"], result["errors"].map { |e| e["message"] }
2727
end
2828

2929
it "allows nil when no validations are configured" do
3030
schema = build_schema(String, {})
3131
result = schema.execute("query($str: String) { validated(value: $str) }", variables: { str: nil })
32-
assert_equal nil, result["data"]["validated"]
32+
assert_nil result["data"]["validated"]
3333
refute result.key?("errors")
3434

3535
result = schema.execute("query { validated }")
36-
assert_equal nil, result["data"]["validated"]
36+
assert_nil result["data"]["validated"]
3737
refute result.key?("errors")
3838
end
3939
end

‎spec/graphql/schema/validator/length_validator_spec.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
schema = build_schema(String, {length: { minimum: 5 }, allow_null: true, allow_blank: false})
2222
result = schema.execute("{ validated(value: null) }")
23-
assert_equal nil, result["data"]["validated"]
23+
assert_nil result["data"]["validated"]
2424
refute result.key?("errors")
2525

2626
result = schema.execute("query($str: String!) { validated(value: $str) }", variables: { str: blank_string })

‎spec/graphql/schema_spec.rb‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ class CustomSubscriptions < GraphQL::Subscriptions::ActionCableSubscriptions
4747
extra_types ExtraType
4848
query_analyzer Object.new
4949
multiplex_analyzer Object.new
50+
validate_timeout 100
5051
rescue_from(StandardError) { }
5152
use GraphQL::Backtrace
5253
use GraphQL::Subscriptions::ActionCableSubscriptions, action_cable: nil, action_cable_coder: JSON

‎spec/graphql/subscriptions_spec.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -736,7 +736,7 @@ def str
736736
failedEvent(id: $id) { str, int }
737737
}
738738
GRAPHQL
739-
assert_equal nil, res["data"]
739+
assert_nil res["data"]
740740
assert_equal "unauthorized", res["errors"][0]["message"]
741741

742742
assert_equal 0, subscriptions_by_topic.size

0 commit comments

Comments
 (0)