## Description Git Cy test cleanup Doc https://www.notion.so/appsmith/Cypress-Git-Tests-Full-Migration-Plan-Technical-Migration-Document-21cfe271b0e2808e9bbfc52ff3f271d1?source=copy_link Fixes https://github.com/appsmithorg/appsmith/issues/41116 ## Automation /ok-to-test tags="@tag.Git" ### 🔍 Cypress test results <!-- This is an auto-generated comment: Cypress test results --> > [!TIP] > 🟢 🟢 🟢 All cypress tests have passed! 🎉 🎉 🎉 > Workflow run: <https://github.com/appsmithorg/appsmith/actions/runs/16609928353> > Commit: c44fe06457377789cee38114e809e7ce842a3870 > <a href="https://internal.appsmith.com/app/cypress-dashboard/rundetails-65890b3c81d7400d08fa9ee5?branch=master&workflowId=16609928353&attempt=1" target="_blank">Cypress dashboard</a>. > Tags: `@tag.Git` > Spec: > <hr>Wed, 30 Jul 2025 00:46:28 UTC <!-- end of auto-generated comment: Cypress test results --> ## Communication Should the DevRel and Marketing teams inform users about this change? - [ ] Yes - [ ] No <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit * **Chores** * Updated test intercepts and network request patterns to use new Git API endpoint structures. * Adjusted feature flag logic to enable a new Git API contracts flag for relevant tests. * Increased wait time for Git import operations to improve test reliability. * Refined and simplified test logic for Git discard, merge, and branch operations. * Added a new locator for pull count in Git sync UI tests. * Removed deprecated or redundant assertions and UI checks in Git-related tests. * Skipped import tests for older app versions due to backend compatibility issues. <!-- end of auto-generated comment: release notes by coderabbit.ai -->
111 lines
3.3 KiB
TypeScript
111 lines
3.3 KiB
TypeScript
import { LICENSE_FEATURE_FLAGS } from "../Constants";
|
|
import { ObjectsRegistry } from "./Registry";
|
|
|
|
const defaultFlags = {
|
|
rollout_remove_feature_walkthrough_enabled: false, // remove this flag from here when it's removed from code
|
|
release_git_modularisation_enabled: true,
|
|
release_git_api_contracts_enabled: true,
|
|
};
|
|
|
|
export const featureFlagIntercept = (
|
|
flags: Record<string, boolean> = {},
|
|
reload = true,
|
|
) => {
|
|
getConsolidatedDataApi({ ...flags, ...defaultFlags }, false);
|
|
const response = {
|
|
responseMeta: {
|
|
status: 200,
|
|
success: true,
|
|
},
|
|
data: {
|
|
...flags,
|
|
...defaultFlags,
|
|
},
|
|
errorDisplay: "",
|
|
};
|
|
cy.intercept("GET", "/api/v1/users/features", response);
|
|
if (reload) ObjectsRegistry.AggregateHelper.CypressReload();
|
|
};
|
|
|
|
export const getConsolidatedDataApi = (
|
|
flags: Record<string, boolean> = {},
|
|
reload = true,
|
|
) => {
|
|
cy.intercept("GET", "/api/v1/consolidated-api/*?*", (req) => {
|
|
delete req.headers["if-none-match"];
|
|
req.reply((res: any) => {
|
|
if (
|
|
res.statusCode === 200 ||
|
|
res.statusCode === 401 ||
|
|
res.statusCode === 500
|
|
) {
|
|
const originalResponse = res?.body;
|
|
try {
|
|
const updatedResponse = JSON.parse(JSON.stringify(originalResponse));
|
|
updatedResponse.data.featureFlags.data = { ...flags };
|
|
return res.send(updatedResponse);
|
|
} catch (e) {
|
|
cy.log(`Featureflags.ts error `, e);
|
|
}
|
|
}
|
|
});
|
|
}).as("getConsolidatedData");
|
|
if (reload) ObjectsRegistry.AggregateHelper.CypressReload();
|
|
};
|
|
|
|
export const featureFlagInterceptForLicenseFlags = () => {
|
|
cy.intercept(
|
|
{
|
|
method: "GET",
|
|
url: "/api/v1/users/features",
|
|
},
|
|
(req) => {
|
|
req.reply((res) => {
|
|
if (res) {
|
|
const originalResponse = res.body;
|
|
let modifiedResponse: any = {};
|
|
Object.keys(originalResponse.data).forEach((flag) => {
|
|
if (LICENSE_FEATURE_FLAGS.includes(flag)) {
|
|
modifiedResponse[flag] = originalResponse.data[flag];
|
|
}
|
|
});
|
|
modifiedResponse = {
|
|
...modifiedResponse,
|
|
release_app_sidebar_enabled: true,
|
|
};
|
|
res.send({
|
|
responseMeta: {
|
|
status: 200,
|
|
success: true,
|
|
},
|
|
data: { ...modifiedResponse },
|
|
errorDisplay: "",
|
|
});
|
|
}
|
|
});
|
|
},
|
|
).as("getLicenseFeatures");
|
|
|
|
cy.intercept("GET", "/api/v1/consolidated-api/*?*", (req) => {
|
|
req.reply((res: any) => {
|
|
delete req.headers["if-none-match"];
|
|
if (res.statusCode === 200) {
|
|
const originalResponse = res?.body;
|
|
const updatedResponse = JSON.parse(JSON.stringify(originalResponse));
|
|
updatedResponse.data.featureFlags.data = {};
|
|
Object.keys(originalResponse.data.featureFlags.data).forEach((flag) => {
|
|
if (LICENSE_FEATURE_FLAGS.includes(flag)) {
|
|
updatedResponse.data.featureFlags.data[flag] =
|
|
originalResponse.data.featureFlags.data[flag];
|
|
}
|
|
});
|
|
updatedResponse.data.featureFlags.data["release_app_sidebar_enabled"] =
|
|
true;
|
|
return res.send(updatedResponse);
|
|
}
|
|
});
|
|
}).as("getConsolidatedData");
|
|
|
|
ObjectsRegistry.AggregateHelper.CypressReload();
|
|
};
|