Skip to content

Commit d677446

Browse files
dwrothgh-action-runner
authored andcommitted
Fix generated default mock initializer for lowercase type names (#712)
1 parent 7c4f3b8 commit d677446

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

Tests/ApolloCodegenTests/CodeGeneration/Templates/MockObjectTemplateTests.swift

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -547,6 +547,7 @@ class MockObjectTemplateTests: XCTestCase {
547547

548548
func test__render__givenSchemaTypeAndDefaultParameterFlagOn_generatesDefaultValueForRequiredFields() {
549549
// given
550+
let aardvark: GraphQLType = .entity(GraphQLObjectType.mock("aardvark"))
550551
let Cat: GraphQLType = .entity(GraphQLObjectType.mock("Cat"))
551552
let Animal: GraphQLType = .entity(GraphQLInterfaceType.mock("Animal", implementingObjects: [GraphQLObjectType.mock("Duck")]))
552553
let Pet: GraphQLType = .entity(GraphQLUnionType.mock("Pet", types: [GraphQLObjectType.mock("Goldfish"), GraphQLObjectType.mock("Hamster")]))
@@ -558,6 +559,7 @@ class MockObjectTemplateTests: XCTestCase {
558559
"stringNestedList": .mock("stringNestedList", type: .nonNull(.list(.nonNull(.list(.nonNull(.string())))))),
559560
"customScalar": .mock("customScalar", type: .nonNull(.scalar(.mock(name: "CustomScalar")))),
560561
"customScalarList": .mock("customScalarList", type: .nonNull(.list(.nonNull(.scalar(.mock(name: "CustomScalar")))))),
562+
"lowercaseObject": .mock("object", type: .nonNull(aardvark)),
561563
"object": .mock("object", type: .nonNull(Cat)),
562564
"objectList": .mock("objectList", type: .nonNull(.list(.nonNull(Cat)))),
563565
"objectNestedList": .mock("objectNestedList", type: .nonNull(.list(.nonNull(.list(.nonNull(Cat)))))),
@@ -585,6 +587,7 @@ class MockObjectTemplateTests: XCTestCase {
585587
interface: (any AnyMock) = Mock<Duck>(),
586588
interfaceList: [(any AnyMock)] = [],
587589
interfaceNestedList: [[(any AnyMock)]] = [],
590+
lowercaseObject: Mock<Aardvark> = Mock<Aardvark>(),
588591
object: Mock<Cat> = Mock<Cat>(),
589592
objectList: [Mock<Cat>] = [],
590593
objectNestedList: [[Mock<Cat>]] = [],
@@ -603,6 +606,7 @@ class MockObjectTemplateTests: XCTestCase {
603606
_setEntity(interface, for: \\.interface)
604607
_setList(interfaceList, for: \\.interfaceList)
605608
_setList(interfaceNestedList, for: \\.interfaceNestedList)
609+
_setEntity(lowercaseObject, for: \\.lowercaseObject)
606610
_setEntity(object, for: \\.object)
607611
_setList(objectList, for: \\.objectList)
608612
_setList(objectNestedList, for: \\.objectNestedList)

apollo-ios-codegen/Sources/ApolloCodegenLib/FileGenerators/DefaultMockValueProviding.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ extension GraphQLEnumType: DefaultMockValueProviding {
5454

5555
extension GraphQLObjectType: DefaultMockValueProviding {
5656
func defaultMockValue(config: ApolloCodegen.ConfigurationContext) -> String {
57-
return "Mock<\(name)>()"
57+
return "Mock<\(self.render(as: .typename))>()"
5858
}
5959
}
6060

0 commit comments

Comments
 (0)