Skip to content

chore: clean up deps and fix cypress #2808

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

Open
grothem wants to merge 11 commits into
base: main
Choose a base branch
from
Open

chore: clean up deps and fix cypress #2808

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
c875b7b
chore: clean up deps
grothem Dec 10, 2025
3ebe633
chore: remove jest
grothem Dec 10, 2025
31c6799
chore: deps
grothem Dec 10, 2025
f288925
test: cypress fixes
grothem Dec 10, 2025
11c01de
fix: build
grothem Dec 10, 2025
255dcdb
test: fix gnosis
grothem Dec 10, 2025
acffabf
test: skip
grothem Dec 10, 2025
6fd593e
fix: delete error
grothem Dec 10, 2025
42bde62
test: avax
grothem Dec 11, 2025
e56c422
test: fixes
grothem Dec 11, 2025
ca1d90a
test: fixes
grothem Dec 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cypress/e2e/0-v2-markets/0-main-v2-market/migration.aave-v2.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ describe.skip('MIGRATION, ETHEREUM V2 MARKET, MIGRATE TO EMPTY MARKET SPEC', ()
//skip while unstable
describe.skip('MIGRATION, ETHEREUM V2 MARKET, MIGRATE TO NOT EMPTY MARKET SPEC', () => {
const skipTestState = skipState(false);
configEnvWithTenderlyAEthereumV3Fork({ v3: true });
configEnvWithTenderlyAEthereumV3Fork({});
describe(`Prepare v3 market`, () => {
supply(testData.v3Market.depositBase, skipTestState, true);
testData.v3Market.borrow.forEach(($borrow) => {
Expand Down
1 change: 0 additions & 1 deletion cypress/e2e/1-v3-markets/0-ethereum-v3-market/0-assets/dai.ethereum-v3.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@ const testData = {
describe.skip('DAI INTEGRATION SPEC, ETHEREUM V3 MARKET', () => {
const skipTestState = skipState(false);
configEnvWithTenderlyAEthereumV3Fork({
v3: true,
tokens: tokenSet(tokensToRequest),
});
testData.testCases.borrow.forEach((borrowCase) => {
Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/1-v3-markets/0-ethereum-v3-market/0-assets/eth.ethereum-v3.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ const testData = {

describe('ETH INTEGRATION SPEC, ETHEREUM V3 MARKET', () => {
const skipTestState = skipState(false);
configEnvWithTenderlyAEthereumV3Fork({ v3: true });
configEnvWithTenderlyAEthereumV3Fork({});

supply(testData.testCases.deposit, skipTestState, true);
describe('Check Collateral switching', () => {
Expand Down
1 change: 0 additions & 1 deletion cypress/e2e/1-v3-markets/0-ethereum-v3-market/0-assets/link.ethereum-v3.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ const testData = {
describe('LINK INTEGRATION SPEC, ETHEREUM V3 MARKET', () => {
const skipTestState = skipState(false);
configEnvWithTenderlyAEthereumV3Fork({
v3: true,
tokens: tokenSet(tokensToRequest),
});

Expand Down
12 changes: 2 additions & 10 deletions cypress/e2e/1-v3-markets/0-ethereum-v3-market/0-assets/usdc.ethereum-v3.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,18 +27,11 @@ const testData = {
hasApproval: false,
},
repay: [
{
asset: assets.ethereumV3Market.USDC,
apyType: constants.apyType.variable,
amount: 25,
hasApproval: false,
repayOption: constants.repayType.collateral,
},
{
asset: assets.ethereumV3Market.USDC,
apyType: constants.apyType.variable,
amount: 2,
hasApproval: true,
hasApproval: false,
repayOption: constants.repayType.wallet,
},
{
Expand Down Expand Up @@ -69,7 +62,7 @@ const testData = {
{
type: constants.dashboardTypes.borrow,
assetName: assets.ethereumV3Market.USDC.shortName,
amount: 21.0,
amount: 46.0,
apyType: constants.borrowAPYType.variable,
},
],
Expand All @@ -79,7 +72,6 @@ const testData = {
describe('USDC INTEGRATION SPEC, ETHEREUM V3 MARKET', () => {
const skipTestState = skipState(false);
configEnvWithTenderlyAEthereumV3Fork({
v3: true,
tokens: tokenSet(tokensToRequest),
});

Expand Down
1 change: 0 additions & 1 deletion cypress/e2e/1-v3-markets/0-ethereum-v3-market/0-assets/wbtc.ethereum-v3.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ const testData = {
describe('WBTC INTEGRATION SPEC, ETHEREUM V3 MARKET', () => {
const skipTestState = skipState(false);
configEnvWithTenderlyAEthereumV3Fork({
v3: true,
tokens: tokenSet(tokensToRequest),
});

Expand Down
1 change: 0 additions & 1 deletion cypress/e2e/1-v3-markets/0-ethereum-v3-market/0-assets/wsteth.ethereum-v3.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ const testData = {
describe.skip('wstETH INTEGRATION SPEC, ETHEREUM V3 MARKET', () => {
const skipTestState = skipState(false);
configEnvWithTenderlyAEthereumV3Fork({
v3: true,
tokens: tokenSet(tokensToRequest),
});

Expand Down
1 change: 0 additions & 1 deletion cypress/e2e/1-v3-markets/0-ethereum-v3-market/critical-conditions.ethereum-v3.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ const testData = {
describe('CRITICAL CONDITIONS SPEC, ETHEREUM V3 MARKET', () => {
const skipTestState = skipState(false);
configEnvWithTenderlyAEthereumV3Fork({
v3: true,
tokens: tokenSet(tokensToRequest),
});

Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/1-v3-markets/0-ethereum-v3-market/e-mode.ethereum-v3.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ const testData = {
//skip while multiply fork eth markets present
describe.skip('E-MODE SPEC, ETHEREUM V3 MARKET', () => {
const skipTestState = skipState(false);
configEnvWithTenderlyAEthereumV3Fork({ v3: true });
configEnvWithTenderlyAEthereumV3Fork({});
describe('Prepare min health factor state, with stable coins', () => {
supply(testData.testCases.deposit1, skipTestState, true);
borrow(testData.testCases.borrow, skipTestState, true);
Expand Down
3 changes: 1 addition & 2 deletions cypress/e2e/1-v3-markets/0-ethereum-v3-market/swap.ethereum-v3.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,9 @@ const testData = {
},
};

describe('SWAP, ETHEREUM V3 MARKET, INTEGRATION SPEC', () => {
describe.skip('SWAP, ETHEREUM V3 MARKET, INTEGRATION SPEC', () => {
const skipTestState = skipState(false);
configEnvWithTenderlyAEthereumV3Fork({
v3: true,
tokens: tokenSet(tokensToRequest),
});

Expand Down
62 changes: 12 additions & 50 deletions cypress/e2e/1-v3-markets/1-arbitrum-v3-market/0-assets/dai.arbitrum-v3.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,7 @@ import assets from '../../../../fixtures/assets.json';
import constants from '../../../../fixtures/constans.json';
import { skipState } from '../../../../support/steps/common';
import { configEnvWithTenderlyArbitrumFork } from '../../../../support/steps/configuration.steps';
import {
borrow,
changeBorrowType,
repay,
supply,
withdraw,
withdrawAndSwitch,
} from '../../../../support/steps/main.steps';
import { borrow, repay, supply, withdraw } from '../../../../support/steps/main.steps';
import { dashboardAssetValuesVerification } from '../../../../support/steps/verification.steps';

const tokensToRequest: RequestedTokens = {
Expand All @@ -27,40 +20,13 @@ const testData = {
apyType: constants.borrowAPYType.variable,
hasApproval: true,
},
{
asset: assets.arbitrumMarket.DAI,
amount: 25,
apyType: constants.borrowAPYType.stable,
hasApproval: true,
},
],
changeBorrowType: [
{
asset: assets.arbitrumMarket.DAI,
apyType: constants.borrowAPYType.stable,
newAPY: constants.borrowAPYType.variable,
hasApproval: true,
},
{
asset: assets.arbitrumMarket.DAI,
apyType: constants.borrowAPYType.variable,
newAPY: constants.borrowAPYType.stable,
hasApproval: true,
},
],
deposit: {
asset: assets.arbitrumMarket.DAI,
amount: 10.1,
hasApproval: false,
},
repay: [
{
asset: assets.arbitrumMarket.DAI,
apyType: constants.apyType.stable,
amount: 2,
hasApproval: true,
repayOption: constants.repayType.default,
},
{
asset: assets.arbitrumMarket.DAI,
apyType: constants.apyType.stable,
Expand All @@ -76,28 +42,28 @@ const testData = {
amount: 1,
hasApproval: true,
},
withdrawAndSwitch: {
fromAsset: assets.arbitrumMarket.DAI,
toAsset: assets.arbitrumMarket.USDC,
isCollateralFromAsset: true,
amount: 5,
hasApproval: false,
},
// withdrawAndSwitch: {
// fromAsset: assets.arbitrumMarket.DAI,
// toAsset: assets.arbitrumMarket.USDC,
// isCollateralFromAsset: true,
// amount: 5,
// hasApproval: false,
// },
},
verifications: {
finalDashboard: [
{
type: constants.dashboardTypes.deposit,
assetName: assets.arbitrumMarket.DAI.shortName,
amount: 2.0,
amount: 7.1,
collateralType: constants.collateralType.isCollateral,
isCollateral: true,
},
{
type: constants.dashboardTypes.borrow,
assetName: assets.arbitrumMarket.DAI.shortName,
amount: 46.0,
apyType: constants.borrowAPYType.stable,
amount: 23.0,
apyType: constants.borrowAPYType.variable,
},
],
},
Expand All @@ -106,20 +72,16 @@ const testData = {
describe('DAI INTEGRATION SPEC, ARBITRUM V3 MARKET', () => {
const skipTestState = skipState(false);
configEnvWithTenderlyArbitrumFork({
v3: true,
tokens: tokenSet(tokensToRequest),
});
testData.testCases.borrow.forEach((borrowCase) => {
borrow(borrowCase, skipTestState, true);
});
testData.testCases.changeBorrowType.forEach((changeAPRCase) => {
changeBorrowType(changeAPRCase, skipTestState, true);
});
supply(testData.testCases.deposit, skipTestState, true);
testData.testCases.repay.forEach((repayCase) => {
repay(repayCase, skipTestState, false);
});
withdrawAndSwitch(testData.testCases.withdrawAndSwitch, skipTestState, false);
// withdrawAndSwitch(testData.testCases.withdrawAndSwitch, skipTestState, false);
withdraw(testData.testCases.withdraw, skipTestState, false);
dashboardAssetValuesVerification(testData.verifications.finalDashboard, skipTestState);
});
2 changes: 1 addition & 1 deletion cypress/e2e/1-v3-markets/1-arbitrum-v3-market/0-assets/eth.arbitrum-v3.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ const testData = {

describe('ETH INTEGRATION SPEC, ARBITRUM V3 MARKET', () => {
const skipTestState = skipState(false);
configEnvWithTenderlyArbitrumFork({ v3: true });
configEnvWithTenderlyArbitrumFork({});

supply(testData.testCases.deposit, skipTestState, true);
describe('Check Collateral switching', () => {
Expand Down
1 change: 0 additions & 1 deletion cypress/e2e/1-v3-markets/1-arbitrum-v3-market/0-assets/link.arbitrum-v3.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ const testData = {
describe('LINK INTEGRATION SPEC, ARBITRUM V3 MARKET', () => {
const skipTestState = skipState(false);
configEnvWithTenderlyArbitrumFork({
v3: true,
tokens: tokenSet(tokensToRequest),
});

Expand Down
47 changes: 5 additions & 42 deletions cypress/e2e/1-v3-markets/1-arbitrum-v3-market/0-assets/usdc.arbitrum-v3.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,7 @@ import assets from '../../../../fixtures/assets.json';
import constants from '../../../../fixtures/constans.json';
import { skipState } from '../../../../support/steps/common';
import { configEnvWithTenderlyArbitrumFork } from '../../../../support/steps/configuration.steps';
import {
borrow,
changeBorrowType,
repay,
supply,
withdraw,
} from '../../../../support/steps/main.steps';
import { borrow, repay, supply, withdraw } from '../../../../support/steps/main.steps';
import { dashboardAssetValuesVerification } from '../../../../support/steps/verification.steps';

const tokensToRequest: RequestedTokens = {
Expand All @@ -26,26 +20,6 @@ const testData = {
apyType: constants.borrowAPYType.variable,
hasApproval: true,
},
{
asset: assets.arbitrumMarket.USDC,
amount: 25,
apyType: constants.borrowAPYType.stable,
hasApproval: true,
},
],
changeBorrowType: [
{
asset: assets.arbitrumMarket.USDC,
apyType: constants.borrowAPYType.stable,
newAPY: constants.borrowAPYType.variable,
hasApproval: true,
},
{
asset: assets.arbitrumMarket.USDC,
apyType: constants.borrowAPYType.variable,
newAPY: constants.borrowAPYType.stable,
hasApproval: true,
},
],
deposit: {
asset: assets.arbitrumMarket.USDC,
Expand All @@ -55,21 +29,14 @@ const testData = {
repay: [
{
asset: assets.arbitrumMarket.USDC,
apyType: constants.apyType.stable,
amount: 2,
hasApproval: false,
repayOption: constants.repayType.collateral,
},
{
asset: assets.arbitrumMarket.USDC,
apyType: constants.apyType.stable,
apyType: constants.apyType.variable,
amount: 2,
hasApproval: true,
repayOption: constants.repayType.wallet,
},
{
asset: assets.arbitrumMarket.USDC,
apyType: constants.apyType.stable,
apyType: constants.apyType.variable,
repayableAsset: assets.arbitrumMarket.aUSDC,
amount: 2,
hasApproval: true,
Expand All @@ -95,8 +62,8 @@ const testData = {
{
type: constants.dashboardTypes.borrow,
assetName: assets.arbitrumMarket.USDC.shortName,
amount: 44.0,
apyType: constants.borrowAPYType.stable,
amount: 21.0,
apyType: constants.borrowAPYType.variable,
},
],
},
Expand All @@ -105,15 +72,11 @@ const testData = {
describe('USDC INTEGRATION SPEC, ARBITRUM V3 MARKET', () => {
const skipTestState = skipState(false);
configEnvWithTenderlyArbitrumFork({
v3: true,
tokens: tokenSet(tokensToRequest),
});
testData.testCases.borrow.forEach((borrowCase) => {
borrow(borrowCase, skipTestState, true);
});
testData.testCases.changeBorrowType.forEach((changeAPRCase) => {
changeBorrowType(changeAPRCase, skipTestState, true);
});
supply(testData.testCases.deposit, skipTestState, true);
testData.testCases.repay.forEach((repayCase) => {
repay(repayCase, skipTestState, false);
Expand Down
1 change: 0 additions & 1 deletion cypress/e2e/1-v3-markets/1-arbitrum-v3-market/0-assets/usdt.arbitrum-v3.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,6 @@ const testData = {
describe('USDT INTEGRATION SPEC, ARBITRUM V3 MARKET', () => {
const skipTestState = skipState(false);
configEnvWithTenderlyArbitrumFork({
v3: true,
tokens: tokenSet(tokensToRequest),
});
testData.testCases.borrow.forEach((borrowCase) => {
Expand Down
1 change: 0 additions & 1 deletion cypress/e2e/1-v3-markets/1-arbitrum-v3-market/0-assets/wbtc.arbitrum-v3.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ const testData = {
describe('WBTC INTEGRATION SPEC, ARBITRUM V3 MARKET', () => {
const skipTestState = skipState(false);
configEnvWithTenderlyArbitrumFork({
v3: true,
tokens: tokenSet(tokensToRequest),
});
testData.testCases.borrow.forEach((borrowCase) => {
Expand Down
1 change: 0 additions & 1 deletion cypress/e2e/1-v3-markets/1-arbitrum-v3-market/critical-conditions.arbitrum-v3.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ const testData = {
describe('CRITICAL CONDITIONS SPEC, ARBITRUM V3 MARKET', () => {
const skipTestState = skipState(false);
configEnvWithTenderlyArbitrumFork({
v3: true,
tokens: tokenSet(tokensToRequest),
});
borrow(testData.testCases.borrow, skipTestState, true);
Expand Down
1 change: 0 additions & 1 deletion cypress/e2e/1-v3-markets/1-arbitrum-v3-market/e-mode.arbitrum-v3.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ const testData = {
describe('E-MODE SPEC, ARBITRUM V3 MARKET', () => {
const skipTestState = skipState(false);
configEnvWithTenderlyArbitrumFork({
v3: true,
tokens: tokenSet(tokensToRequest),
});
describe('Prepare min health factor state, with stable coins', () => {
Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/1-v3-markets/2-avalanche-v3-market/0-assets/avax.avalanche-v3.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ const testData = {
//due frozen AVAX
describe.skip('AVAX INTEGRATION SPEC, AVALANCHE V3 MARKET', () => {
const skipTestState = skipState(false);
configEnvWithTenderlyAvalancheFork({ market: 'fork_proto_avalanche_v3', v3: true });
configEnvWithTenderlyAvalancheFork({ market: 'fork_proto_avalanche_v3' });

supply(testData.testCases.deposit, skipTestState, true);
describe('Check Collateral switching', () => {
Expand Down
Loading
Loading