@@ -32,12 +32,8 @@ const CreateContractMutation = graphql(`
3232
3333test . concurrent ( 'schema check with successful contract checks' , async ( { expect } ) => {
3434 const { createOrg, ownerToken } = await initSeed ( ) . createOwner ( ) ;
35- const { createProject, setFeatureFlag } = await createOrg ( ) ;
36- const { createTargetAccessToken, target, setNativeFederation } = await createProject (
37- ProjectType . Federation ,
38- ) ;
39- await setFeatureFlag ( 'compareToPreviousComposableVersion' , true ) ;
40- await setNativeFederation ( true ) ;
35+ const { createProject } = await createOrg ( ) ;
36+ const { createTargetAccessToken, target } = await createProject ( ProjectType . Federation ) ;
4137
4238 // Create a token with write rights
4339 const writeToken = await createTargetAccessToken ( { } ) ;
@@ -99,12 +95,8 @@ test.concurrent('schema check with successful contract checks', async ({ expect
9995
10096test . concurrent ( 'schema check with failing contract composition' , async ( { expect } ) => {
10197 const { createOrg, ownerToken } = await initSeed ( ) . createOwner ( ) ;
102- const { createProject, setFeatureFlag } = await createOrg ( ) ;
103- const { createTargetAccessToken, target, setNativeFederation } = await createProject (
104- ProjectType . Federation ,
105- ) ;
106- await setFeatureFlag ( 'compareToPreviousComposableVersion' , true ) ;
107- await setNativeFederation ( true ) ;
98+ const { createProject } = await createOrg ( ) ;
99+ const { createTargetAccessToken, target } = await createProject ( ProjectType . Federation ) ;
108100
109101 // Create a token with write rights
110102 const writeToken = await createTargetAccessToken ( { } ) ;
@@ -180,12 +172,8 @@ test.concurrent(
180172 'schema check with failing contract composition (multiple contracts)' ,
181173 async ( { expect } ) => {
182174 const { createOrg, ownerToken } = await initSeed ( ) . createOwner ( ) ;
183- const { createProject, setFeatureFlag } = await createOrg ( ) ;
184- const { createTargetAccessToken, target, setNativeFederation } = await createProject (
185- ProjectType . Federation ,
186- ) ;
187- await setFeatureFlag ( 'compareToPreviousComposableVersion' , true ) ;
188- await setNativeFederation ( true ) ;
175+ const { createProject } = await createOrg ( ) ;
176+ const { createTargetAccessToken, target } = await createProject ( ProjectType . Federation ) ;
189177
190178 // Create a token with write rights
191179 const writeToken = await createTargetAccessToken ( { } ) ;
@@ -381,12 +369,10 @@ test.concurrent(
381369 'approve failed schema check that has breaking change in contract check -> updates the status to successful and attaches meta information to the breaking change' ,
382370 async ( { expect } ) => {
383371 const { createOrg, ownerToken } = await initSeed ( ) . createOwner ( ) ;
384- const { createProject, organization, setFeatureFlag } = await createOrg ( ) ;
385- const { createTargetAccessToken, project, target, setNativeFederation } = await createProject (
372+ const { createProject, organization } = await createOrg ( ) ;
373+ const { createTargetAccessToken, project, target } = await createProject (
386374 ProjectType . Federation ,
387375 ) ;
388- await setFeatureFlag ( 'compareToPreviousComposableVersion' , true ) ;
389- await setNativeFederation ( true ) ;
390376
391377 // Create a token with write rights
392378 const writeToken = await createTargetAccessToken ( { } ) ;
@@ -547,8 +533,6 @@ test.concurrent(
547533 const { createTargetAccessToken, project, target, setNativeFederation } = await createProject (
548534 ProjectType . Federation ,
549535 ) ;
550- await setFeatureFlag ( 'compareToPreviousComposableVersion' , true ) ;
551- await setNativeFederation ( true ) ;
552536
553537 // Create a token with write rights
554538 const writeToken = await createTargetAccessToken ( { } ) ;
@@ -739,12 +723,10 @@ test.concurrent(
739723 'approving a schema check with contextId containing breaking changes does not allow the changes for subsequent checks with a different contextId' ,
740724 async ( { expect } ) => {
741725 const { createOrg, ownerToken } = await initSeed ( ) . createOwner ( ) ;
742- const { createProject, organization, setFeatureFlag } = await createOrg ( ) ;
743- const { createTargetAccessToken, project, target, setNativeFederation } = await createProject (
726+ const { createProject, organization } = await createOrg ( ) ;
727+ const { createTargetAccessToken, project, target } = await createProject (
744728 ProjectType . Federation ,
745729 ) ;
746- await setFeatureFlag ( 'compareToPreviousComposableVersion' , true ) ;
747- await setNativeFederation ( true ) ;
748730
749731 // Create a token with write rights
750732 const writeToken = await createTargetAccessToken ( { } ) ;
@@ -928,12 +910,10 @@ test.concurrent(
928910 'subsequent schema check with shared contextId that contains new breaking changes that have not been approved fails' ,
929911 async ( { expect } ) => {
930912 const { createOrg, ownerToken } = await initSeed ( ) . createOwner ( ) ;
931- const { createProject, organization, setFeatureFlag } = await createOrg ( ) ;
932- const { createTargetAccessToken, project, target, setNativeFederation } = await createProject (
913+ const { createProject, organization } = await createOrg ( ) ;
914+ const { createTargetAccessToken, project, target } = await createProject (
933915 ProjectType . Federation ,
934916 ) ;
935- await setFeatureFlag ( 'compareToPreviousComposableVersion' , true ) ;
936- await setNativeFederation ( true ) ;
937917
938918 // Create a token with write rights
939919 const writeToken = await createTargetAccessToken ( { } ) ;
@@ -1128,12 +1108,10 @@ test.concurrent(
11281108 'schema check that has no composition errors in contract check -> can be approved' ,
11291109 async ( { expect } ) => {
11301110 const { createOrg, ownerToken } = await initSeed ( ) . createOwner ( ) ;
1131- const { createProject, organization, setFeatureFlag } = await createOrg ( ) ;
1132- const { createTargetAccessToken, project, target, setNativeFederation } = await createProject (
1111+ const { createProject, organization } = await createOrg ( ) ;
1112+ const { createTargetAccessToken, project, target } = await createProject (
11331113 ProjectType . Federation ,
11341114 ) ;
1135- await setFeatureFlag ( 'compareToPreviousComposableVersion' , true ) ;
1136- await setNativeFederation ( true ) ;
11371115
11381116 // Create a token with write rights
11391117 const writeToken = await createTargetAccessToken ( { } ) ;
@@ -1237,12 +1215,10 @@ test.concurrent(
12371215 'schema check that has composition errors in contract check -> can not be approved' ,
12381216 async ( { expect } ) => {
12391217 const { createOrg, ownerToken } = await initSeed ( ) . createOwner ( ) ;
1240- const { createProject, organization, setFeatureFlag } = await createOrg ( ) ;
1218+ const { createProject, organization } = await createOrg ( ) ;
12411219 const { createTargetAccessToken, project, target, setNativeFederation } = await createProject (
12421220 ProjectType . Federation ,
12431221 ) ;
1244- await setFeatureFlag ( 'compareToPreviousComposableVersion' , true ) ;
1245- await setNativeFederation ( true ) ;
12461222
12471223 // Create a token with write rights
12481224 const writeToken = await createTargetAccessToken ( { } ) ;
0 commit comments