Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: @defer directive is duplicated when schema already has one #235

Merged
merged 4 commits into from
Jan 11, 2024
Merged

fix: @defer directive is duplicated when schema already has one #235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
31e9053
Don't add defer directive to schema
calvincestari Jan 10, 2024
89280d2
Refactor tests
calvincestari Jan 10, 2024
3fd42dd
Rebuild swift JS bundle
calvincestari Jan 10, 2024
a1b2762
Skip codegen defer tests
calvincestari Jan 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
70 changes: 70 additions & 0 deletions Tests/ApolloCodegenTests/CodeGenIR/IRRootFieldBuilderTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4427,6 +4427,8 @@ class IRRootFieldBuilderTests: XCTestCase {
}

func test__deferredFragments__givenDeferredInlineFragment_hasDeferredFragmentsTrue() async throws {
throw XCTSkip("Skipped in PR #235 - must be reverted when the feature/defer-execution-networking branch is merged into main!")

// given
schemaSDL = """
type Query {
Expand Down Expand Up @@ -4467,6 +4469,8 @@ class IRRootFieldBuilderTests: XCTestCase {
}

func test__deferredFragments__givenDeferredInlineFragmentWithCondition_hasDeferredFragmentsTrue() async throws {
throw XCTSkip("Skipped in PR #235 - must be reverted when the feature/defer-execution-networking branch is merged into main!")

// given
schemaSDL = """
type Query {
Expand Down Expand Up @@ -4507,6 +4511,8 @@ class IRRootFieldBuilderTests: XCTestCase {
}

func test__deferredFragments__givenDeferredInlineFragmentWithConditionFalse_hasDeferredFragmentsFalse() async throws {
throw XCTSkip("Skipped in PR #235 - must be reverted when the feature/defer-execution-networking branch is merged into main!")

// given
schemaSDL = """
type Query {
Expand Down Expand Up @@ -4547,6 +4553,8 @@ class IRRootFieldBuilderTests: XCTestCase {
}

func test__deferredFragments__givenDeferredNamedFragment_onDifferentTypeCase_hasDeferredFragmentsTrue() async throws {
throw XCTSkip("Skipped in PR #235 - must be reverted when the feature/defer-execution-networking branch is merged into main!")

// given
schemaSDL = """
type Query {
Expand Down Expand Up @@ -4586,6 +4594,8 @@ class IRRootFieldBuilderTests: XCTestCase {
}

func test__deferredFragments__givenDeferredInlineFragment_withinNamedFragment_hasDeferredFragmentsTrue() async throws {
throw XCTSkip("Skipped in PR #235 - must be reverted when the feature/defer-execution-networking branch is merged into main!")

// given
schemaSDL = """
type Query {
Expand Down Expand Up @@ -4630,6 +4640,8 @@ class IRRootFieldBuilderTests: XCTestCase {
}

func test__deferredFragments__givenDeferredNamedFragment_withSelectionOnDifferentTypeCase_hasDeferredFragmentsTrue() async throws {
throw XCTSkip("Skipped in PR #235 - must be reverted when the feature/defer-execution-networking branch is merged into main!")

// given
schemaSDL = """
type Query {
Expand Down Expand Up @@ -4683,6 +4695,8 @@ class IRRootFieldBuilderTests: XCTestCase {
// MARK: Deferred Fragments - Inline Fragments

func test__deferredFragments__givenDeferredInlineFragmentWithoutTypeCase_buildsDeferredInlineFragment() async throws {
throw XCTSkip("Skipped in PR #235 - must be reverted when the feature/defer-execution-networking branch is merged into main!")

// given
schemaSDL = """
type Query {
Expand Down Expand Up @@ -4749,6 +4763,8 @@ class IRRootFieldBuilderTests: XCTestCase {
}

func test__deferredFragments__givenDeferredInlineFragmentOnSameTypeCase_buildsDeferredInlineFragment() async throws {
throw XCTSkip("Skipped in PR #235 - must be reverted when the feature/defer-execution-networking branch is merged into main!")

// given
schemaSDL = """
type Query {
Expand Down Expand Up @@ -4810,6 +4826,8 @@ class IRRootFieldBuilderTests: XCTestCase {
}

func test__deferredFragments__givenDeferredInlineFragmentOnDifferentTypeCase_buildsDeferredInlineFragment() async throws {
throw XCTSkip("Skipped in PR #235 - must be reverted when the feature/defer-execution-networking branch is merged into main!")

// given
schemaSDL = """
type Query {
Expand Down Expand Up @@ -4896,6 +4914,8 @@ class IRRootFieldBuilderTests: XCTestCase {
}

func test__deferredFragments__givenDeferredInlineFragmentWithVariableCondition_buildsDeferredInlineFragmentWithVariable() async throws {
throw XCTSkip("Skipped in PR #235 - must be reverted when the feature/defer-execution-networking branch is merged into main!")

// given
schemaSDL = """
type Query {
Expand Down Expand Up @@ -4982,6 +5002,8 @@ class IRRootFieldBuilderTests: XCTestCase {
}

func test__deferredFragments__givenDeferredInlineFragmentWithTrueCondition_buildsDeferredInlineFragment() async throws {
throw XCTSkip("Skipped in PR #235 - must be reverted when the feature/defer-execution-networking branch is merged into main!")

// given
schemaSDL = """
type Query {
Expand Down Expand Up @@ -5068,6 +5090,8 @@ class IRRootFieldBuilderTests: XCTestCase {
}

func test__deferredFragments__givenDeferredInlineFragmentWithFalseCondition_doesNotBuildDeferredInlineFragment() async throws {
throw XCTSkip("Skipped in PR #235 - must be reverted when the feature/defer-execution-networking branch is merged into main!")

// given
schemaSDL = """
type Query {
Expand Down Expand Up @@ -5141,6 +5165,8 @@ class IRRootFieldBuilderTests: XCTestCase {
}

func test__deferredFragments__givenSiblingDeferredInlineFragmentsOnSameTypeCase_doesNotMergeDeferredFragments() async throws {
throw XCTSkip("Skipped in PR #235 - must be reverted when the feature/defer-execution-networking branch is merged into main!")

// given
schemaSDL = """
type Query {
Expand Down Expand Up @@ -5247,6 +5273,8 @@ class IRRootFieldBuilderTests: XCTestCase {
}

func test__deferredFragments__givenSiblingDeferredInlineFragmentsOnDifferentTypeCase_doesNotMergeDeferredFragments() async throws {
throw XCTSkip("Skipped in PR #235 - must be reverted when the feature/defer-execution-networking branch is merged into main!")

// given
schemaSDL = """
type Query {
Expand Down Expand Up @@ -5342,6 +5370,8 @@ class IRRootFieldBuilderTests: XCTestCase {
}

func test__deferredFragments__givenDeferredInlineFragmentWithSiblingOnSameTypeCase_doesNotMergeDeferredFragment() async throws {
throw XCTSkip("Skipped in PR #235 - must be reverted when the feature/defer-execution-networking branch is merged into main!")

// given
schemaSDL = """
type Query {
Expand Down Expand Up @@ -5431,6 +5461,8 @@ class IRRootFieldBuilderTests: XCTestCase {
}

func test__deferredFragments__givenDeferredInlineFragmentWithSiblingOnDifferentTypeCase_doesNotMergeDeferredFragment() async throws {
throw XCTSkip("Skipped in PR #235 - must be reverted when the feature/defer-execution-networking branch is merged into main!")

// given
schemaSDL = """
type Query {
Expand Down Expand Up @@ -5542,6 +5574,8 @@ class IRRootFieldBuilderTests: XCTestCase {
}

func test__deferredFragments__givenNestedDeferredInlineFragments_buildsNestedDeferredFragments_doesNotMergeDeferredFragments() async throws {
throw XCTSkip("Skipped in PR #235 - must be reverted when the feature/defer-execution-networking branch is merged into main!")

// given
schemaSDL = """
type Query {
Expand Down Expand Up @@ -5660,6 +5694,8 @@ class IRRootFieldBuilderTests: XCTestCase {
// MARK: Deferred Fragments - Inline Fragments (with @include/@skip)

func test__deferredFragments__givenBothDeferAndIncludeDirectives_onSameTypeCase_buildsInclusionTypeCaseWithNestedDeferredInlineFragment() async throws {
throw XCTSkip("Skipped in PR #235 - must be reverted when the feature/defer-execution-networking branch is merged into main!")

// given
schemaSDL = """
type Query {
Expand Down Expand Up @@ -5721,6 +5757,8 @@ class IRRootFieldBuilderTests: XCTestCase {
}

func test__deferredFragments__givenBothDeferAndIncludeDirectives_directivesOrderShouldNotAffectGeneratedFragments() async throws {
throw XCTSkip("Skipped in PR #235 - must be reverted when the feature/defer-execution-networking branch is merged into main!")

// given
schemaSDL = """
type Query {
Expand Down Expand Up @@ -5797,6 +5835,8 @@ class IRRootFieldBuilderTests: XCTestCase {
}

func test__deferredFragments__givenBothDeferAndIncludeDirectives_onDifferentTypeCases_shouldNotNestFragments() async throws {
throw XCTSkip("Skipped in PR #235 - must be reverted when the feature/defer-execution-networking branch is merged into main!")

// given
schemaSDL = """
type Query {
Expand Down Expand Up @@ -5902,6 +5942,8 @@ class IRRootFieldBuilderTests: XCTestCase {
}

func test__deferredFragments__givenBothDeferAndSkipDirectives_onSameTypeCase_buildsInclusionTypeCaseWithNestedDeferredInlineFragment() async throws {
throw XCTSkip("Skipped in PR #235 - must be reverted when the feature/defer-execution-networking branch is merged into main!")

// given
schemaSDL = """
type Query {
Expand Down Expand Up @@ -5963,6 +6005,8 @@ class IRRootFieldBuilderTests: XCTestCase {
}

func test__deferredFragments__givenBothDeferAndSkipDirectives_directivesOrderShouldNotAffectGeneratedFragments() async throws {
throw XCTSkip("Skipped in PR #235 - must be reverted when the feature/defer-execution-networking branch is merged into main!")

// given
schemaSDL = """
type Query {
Expand Down Expand Up @@ -6039,6 +6083,8 @@ class IRRootFieldBuilderTests: XCTestCase {
}

func test__deferredFragments__givenBothDeferAndSkipDirectives_onDifferentTypeCases_shouldNotNestFragments() async throws {
throw XCTSkip("Skipped in PR #235 - must be reverted when the feature/defer-execution-networking branch is merged into main!")

// given
schemaSDL = """
type Query {
Expand Down Expand Up @@ -6146,6 +6192,8 @@ class IRRootFieldBuilderTests: XCTestCase {
// MARK: Deferred Fragments - Named Fragments

func test__deferredFragments__givenDeferredNamedFragmentOnSameTypeCase_buildsDeferredNamedFragment() async throws {
throw XCTSkip("Skipped in PR #235 - must be reverted when the feature/defer-execution-networking branch is merged into main!")

// given
schemaSDL = """
type Query {
Expand Down Expand Up @@ -6204,6 +6252,8 @@ class IRRootFieldBuilderTests: XCTestCase {
}

func test__deferredFragments__givenDeferredNamedFragmentOnDifferentTypeCase_buildsDeferredNamedFragment() async throws {
throw XCTSkip("Skipped in PR #235 - must be reverted when the feature/defer-execution-networking branch is merged into main!")

// given
schemaSDL = """
type Query {
Expand Down Expand Up @@ -6284,6 +6334,8 @@ class IRRootFieldBuilderTests: XCTestCase {
}

func test__deferredFragments__givenDeferredNamedFragmentWithVariableCondition_buildsDeferredNamedFragmentWithVariable() async throws {
throw XCTSkip("Skipped in PR #235 - must be reverted when the feature/defer-execution-networking branch is merged into main!")

// given
schemaSDL = """
type Query {
Expand Down Expand Up @@ -6365,6 +6417,8 @@ class IRRootFieldBuilderTests: XCTestCase {
}

func test__deferredFragments__givenDeferredNamedFragmentWithTrueCondition_buildsDeferredNamedFragment() async throws {
throw XCTSkip("Skipped in PR #235 - must be reverted when the feature/defer-execution-networking branch is merged into main!")

// given
schemaSDL = """
type Query {
Expand Down Expand Up @@ -6445,6 +6499,8 @@ class IRRootFieldBuilderTests: XCTestCase {
}

func test__deferredFragments__givenDeferredNamedFragmentWithFalseCondition_doesNotBuildDeferredNamedFragment() async throws {
throw XCTSkip("Skipped in PR #235 - must be reverted when the feature/defer-execution-networking branch is merged into main!")

// given
schemaSDL = """
type Query {
Expand Down Expand Up @@ -6516,6 +6572,8 @@ class IRRootFieldBuilderTests: XCTestCase {
}

func test__deferredFragments__givenDeferredInlineFragment_insideNamedFragment_buildsDeferredInlineFragment_insideNamedFragment() async throws {
throw XCTSkip("Skipped in PR #235 - must be reverted when the feature/defer-execution-networking branch is merged into main!")

// given
schemaSDL = """
type Query {
Expand Down Expand Up @@ -6607,6 +6665,8 @@ class IRRootFieldBuilderTests: XCTestCase {
}

func test__deferredFragments__givenDeferredInlineFragmentOnDifferentTypeCase_insideNamedFragment_buildsDeferredInlineFragment_insideNamedFragment() async throws {
throw XCTSkip("Skipped in PR #235 - must be reverted when the feature/defer-execution-networking branch is merged into main!")

// given
schemaSDL = """
type Query {
Expand Down Expand Up @@ -6683,6 +6743,8 @@ class IRRootFieldBuilderTests: XCTestCase {
}

func test__deferredFragments__givenDeferredNamedFragmentWithMatchingDeferredTypeCase_buildsInlineFragmentWithMergedFragmentSelection() async throws {
throw XCTSkip("Skipped in PR #235 - must be reverted when the feature/defer-execution-networking branch is merged into main!")

// given
schemaSDL = """
type Query {
Expand Down Expand Up @@ -6767,6 +6829,8 @@ class IRRootFieldBuilderTests: XCTestCase {
// MARK: Deferred Fragments - Named Fragments (with @include/@skip)

func test__deferredFragments__givenBothDeferAndIncludeDirectives_onSameNamedFragment_buildsNestedDeferredNamedFragment() async throws {
throw XCTSkip("Skipped in PR #235 - must be reverted when the feature/defer-execution-networking branch is merged into main!")

// given
schemaSDL = """
type Query {
Expand Down Expand Up @@ -6843,6 +6907,8 @@ class IRRootFieldBuilderTests: XCTestCase {
}

func test__deferredFragments__givenBothDeferAndIncludeDirectives_onDifferentNamedFragment_shouldNotNestFragment() async throws {
throw XCTSkip("Skipped in PR #235 - must be reverted when the feature/defer-execution-networking branch is merged into main!")

// given
schemaSDL = """
type Query {
Expand Down Expand Up @@ -6971,6 +7037,8 @@ class IRRootFieldBuilderTests: XCTestCase {
}

func test__deferredFragments__givenBothDeferAndSkipDirectives_onSameNamedFragment_buildsNestedDeferredNamedFragment() async throws {
throw XCTSkip("Skipped in PR #235 - must be reverted when the feature/defer-execution-networking branch is merged into main!")

// given
schemaSDL = """
type Query {
Expand Down Expand Up @@ -7046,6 +7114,8 @@ class IRRootFieldBuilderTests: XCTestCase {
}

func test__deferredFragments__givenBothDeferAndSkipDirectives_onDifferentNamedFragment_shouldNotNestFragment() async throws {
throw XCTSkip("Skipped in PR #235 - must be reverted when the feature/defer-execution-networking branch is merged into main!")

// given
schemaSDL = """
type Query {
Expand Down
6 changes: 6 additions & 0 deletions Tests/ApolloCodegenTests/CodeGeneration/Templates/OperationDefinitionTemplateTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,8 +285,10 @@
// MARK: - Defer Properties

func test__generate__givenQueryWithDeferredInlineFragment_generatesDeferredPropertyTrue() async throws {
throw XCTSkip("Skipped in PR #235 - must be reverted when the feature/defer-execution-networking branch is merged into main!")

// given
schemaSDL = """

Check warning on line 291 in Tests/ApolloCodegenTests/CodeGeneration/Templates/OperationDefinitionTemplateTests.swift

View workflow job for this annotation

GitHub Actions / Codegen Lib Unit Tests - macOS 

code after 'throw' will never be executed
type Query {
allAnimals: [Animal!]
}
Expand Down Expand Up @@ -323,8 +325,10 @@
}

func test__generate__givenQueryWithDeferredNamedFragment_generatesDeferredPropertyTrue() async throws {
throw XCTSkip("Skipped in PR #235 - must be reverted when the feature/defer-execution-networking branch is merged into main!")

// given
schemaSDL = """

Check warning on line 331 in Tests/ApolloCodegenTests/CodeGeneration/Templates/OperationDefinitionTemplateTests.swift

View workflow job for this annotation

GitHub Actions / Codegen Lib Unit Tests - macOS 

code after 'throw' will never be executed
type Query {
allAnimals: [Animal!]
}
Expand Down Expand Up @@ -363,8 +367,10 @@
}

func test__generate__givenQueryWithNamedFragment_withDeferredTypeCase_generatesDeferredPropertyTrue() async throws {
throw XCTSkip("Skipped in PR #235 - must be reverted when the feature/defer-execution-networking branch is merged into main!")

// given
schemaSDL = """

Check warning on line 373 in Tests/ApolloCodegenTests/CodeGeneration/Templates/OperationDefinitionTemplateTests.swift

View workflow job for this annotation

GitHub Actions / Codegen Lib Unit Tests - macOS 

code after 'throw' will never be executed
type Query {
allAnimals: [Animal!]
}
Expand Down