Skip to content

Commit

Permalink
Rewrite rest of the tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@oskarvu
oskarvu committed Dec 21, 2024
1 parent 242efaf commit d426eca
Show file tree
Hide file tree
Showing 10 changed files with 498 additions and 480 deletions.
2 changes: 1 addition & 1 deletion packages/app/src/features/dialogs/convert-stables/ConvertStablesDialog.PageObject.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { Locator, expect } from '@playwright/test'

export class ConvertStablesDialogPageObject extends DialogPageObject {
constructor(testContext: TestContext<any>) {
super({testContext, header: /Convert Tokens/})
super({ testContext, header: /Convert Tokens/ })
}

// # region locators
Expand Down
2 changes: 1 addition & 1 deletion packages/app/src/features/dialogs/convert-stables/ConvertStablesDialog.test-e2e.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ test.describe('Convert Stables Dialog', () => {
let convertStablesDialog: ConvertStablesDialogPageObject

test.beforeEach(async ({ page }) => {
const testContext =await setup(page, {
const testContext = await setup(page, {
blockchain: {
blockNumber: DEFAULT_BLOCK_NUMBER,
chainId: mainnet.id,
Expand Down
121 changes: 62 additions & 59 deletions packages/app/src/features/dialogs/convert-stables/e2e/base/UsdcToUsds.test-e2e.ts
View file
Original file line number Diff line number Diff line change
@@ -1,66 +1,69 @@
// import { SavingsPageObject } from '@/pages/Savings.PageObject'
// import { setupFork } from '@/test/e2e/forking/setupFork'
// import { setup } from '@/test/e2e/setup'
// import { test } from '@playwright/test'
// import { base } from 'viem/chains'
// import { ConvertStablesDialogPageObject } from '../../ConvertStablesDialog.PageObject'
import { SavingsPageObject } from '@/pages/Savings.PageObject'
import { BASE_DEFAULT_BLOCK_NUMBER } from '@/test/e2e/constants'
import { setup } from '@/test/e2e/setup'
import { test } from '@playwright/test'
import { base } from 'viem/chains'
import { ConvertStablesDialogPageObject } from '../../ConvertStablesDialog.PageObject'

// test.describe('Convert USDC to USDS', () => {
// const fork = setupFork({ chainId: base.id, blockNumber: 22143788n, useTenderlyVnet: true })
// let savingsPage: SavingsPageObject
// let convertStablesDialog: ConvertStablesDialogPageObject
test.describe('Convert USDC to USDS', () => {
let savingsPage: SavingsPageObject
let convertStablesDialog: ConvertStablesDialogPageObject

// test.beforeEach(async ({ page }) => {
// await setup(page, fork, {
// initialPage: 'savings',
// account: {
// type: 'connected-random',
// assetBalances: {
// ETH: 1,
// USDC: 10_000,
// },
// },
// })
test.beforeEach(async ({ page }) => {
const testContext = await setup(page, {
blockchain: {
blockNumber: BASE_DEFAULT_BLOCK_NUMBER,
chainId: base.id,
},
initialPage: 'savings',
account: {
type: 'connected-random',
assetBalances: {
ETH: 1,
USDC: 10_000,
},
},
})

// savingsPage = new SavingsPageObject(page)
// await savingsPage.clickConvertStablesButtonAction()
savingsPage = new SavingsPageObject(testContext)
await savingsPage.clickConvertStablesButtonAction()

// convertStablesDialog = new ConvertStablesDialogPageObject(page)
// await convertStablesDialog.selectAssetInAction('USDC')
// await convertStablesDialog.selectAssetOutAction('USDS')
// await convertStablesDialog.fillAmountInAction(10_000)
// })
convertStablesDialog = new ConvertStablesDialogPageObject(testContext)
await convertStablesDialog.selectAssetInAction('USDC')
await convertStablesDialog.selectAssetOutAction('USDS')
await convertStablesDialog.fillAmountInAction(10_000)
})

// test('uses psm convert action', async () => {
// await convertStablesDialog.actionsContainer.expectEnabledActionAtIndex(0)
// await convertStablesDialog.actionsContainer.expectActions([
// { type: 'approve', asset: 'USDC' },
// { type: 'psmConvert', inToken: 'USDC', outToken: 'USDS' },
// ])
// })
test('uses psm convert action', async () => {
await convertStablesDialog.actionsContainer.expectEnabledActionAtIndex(0)
await convertStablesDialog.actionsContainer.expectActions([
{ type: 'approve', asset: 'USDC' },
{ type: 'psmConvert', inToken: 'USDC', outToken: 'USDS' },
])
})

// test('displays transaction overview', async () => {
// await convertStablesDialog.expectTransactionOverview({
// routeItems: [
// {
// tokenAmount: '10,000.00 USDC',
// tokenUsdValue: '$10,000.00',
// },
// {
// tokenAmount: '10,000.00 USDS',
// tokenUsdValue: '$10,000.00',
// },
// ],
// outcome: '10,000.00 USDS',
// outcomeUsd: '$10,000.00',
// })
// })
test('displays transaction overview', async () => {
await convertStablesDialog.expectTransactionOverview({
routeItems: [
{
tokenAmount: '10,000.00 USDC',
tokenUsdValue: '$10,000.00',
},
{
tokenAmount: '10,000.00 USDS',
tokenUsdValue: '$10,000.00',
},
],
outcome: '10,000.00 USDS',
outcomeUsd: '$10,000.00',
})
})

// test('executes conversion', async () => {
// await convertStablesDialog.actionsContainer.acceptAllActionsAction(2)
// await convertStablesDialog.expectSuccessPage()
// await convertStablesDialog.clickBackToSavingsButton()
// await savingsPage.expectStablecoinsInWalletAssetBalance('USDC', '-')
// await savingsPage.expectStablecoinsInWalletAssetBalance('USDS', '10,000.00')
// })
// })
test('executes conversion', async () => {
await convertStablesDialog.actionsContainer.acceptAllActionsAction(2)
await convertStablesDialog.expectSuccessPage()
await convertStablesDialog.clickBackToSavingsButton()
await savingsPage.expectStablecoinsInWalletAssetBalance('USDC', '-')
await savingsPage.expectStablecoinsInWalletAssetBalance('USDS', '10,000.00')
})
})
121 changes: 62 additions & 59 deletions packages/app/src/features/dialogs/convert-stables/e2e/base/UsdsToUsdc.test-e2e.ts
View file
Original file line number Diff line number Diff line change
@@ -1,66 +1,69 @@
// import { SavingsPageObject } from '@/pages/Savings.PageObject'
// import { setupFork } from '@/test/e2e/forking/setupFork'
// import { setup } from '@/test/e2e/setup'
// import { test } from '@playwright/test'
// import { base } from 'viem/chains'
// import { ConvertStablesDialogPageObject } from '../../ConvertStablesDialog.PageObject'
import { SavingsPageObject } from '@/pages/Savings.PageObject'
import { BASE_DEFAULT_BLOCK_NUMBER } from '@/test/e2e/constants'
import { setup } from '@/test/e2e/setup'
import { test } from '@playwright/test'
import { base } from 'viem/chains'
import { ConvertStablesDialogPageObject } from '../../ConvertStablesDialog.PageObject'

// test.describe('Convert USDS to USDC', () => {
// const fork = setupFork({ chainId: base.id, blockNumber: 22143788n, useTenderlyVnet: true })
// let savingsPage: SavingsPageObject
// let convertStablesDialog: ConvertStablesDialogPageObject
test.describe('Convert USDS to USDC', () => {
let savingsPage: SavingsPageObject
let convertStablesDialog: ConvertStablesDialogPageObject

// test.beforeEach(async ({ page }) => {
// await setup(page, fork, {
// initialPage: 'savings',
// account: {
// type: 'connected-random',
// assetBalances: {
// ETH: 1,
// USDS: 10_000,
// },
// },
// })
test.beforeEach(async ({ page }) => {
const testContext = await setup(page, {
blockchain: {
blockNumber: BASE_DEFAULT_BLOCK_NUMBER,
chainId: base.id,
},
initialPage: 'savings',
account: {
type: 'connected-random',
assetBalances: {
ETH: 1,
USDS: 10_000,
},
},
})

// savingsPage = new SavingsPageObject(page)
// await savingsPage.clickConvertStablesButtonAction()
savingsPage = new SavingsPageObject(testContext)
await savingsPage.clickConvertStablesButtonAction()

// convertStablesDialog = new ConvertStablesDialogPageObject(page)
// await convertStablesDialog.selectAssetInAction('USDS')
// await convertStablesDialog.selectAssetOutAction('USDC')
// await convertStablesDialog.fillAmountInAction(10_000)
// })
convertStablesDialog = new ConvertStablesDialogPageObject(testContext)
await convertStablesDialog.selectAssetInAction('USDS')
await convertStablesDialog.selectAssetOutAction('USDC')
await convertStablesDialog.fillAmountInAction(10_000)
})

// test('uses psm convert action', async () => {
// await convertStablesDialog.actionsContainer.expectEnabledActionAtIndex(0)
// await convertStablesDialog.actionsContainer.expectActions([
// { type: 'approve', asset: 'USDS' },
// { type: 'psmConvert', inToken: 'USDS', outToken: 'USDC' },
// ])
// })
test('uses psm convert action', async () => {
await convertStablesDialog.actionsContainer.expectEnabledActionAtIndex(0)
await convertStablesDialog.actionsContainer.expectActions([
{ type: 'approve', asset: 'USDS' },
{ type: 'psmConvert', inToken: 'USDS', outToken: 'USDC' },
])
})

// test('displays transaction overview', async () => {
// await convertStablesDialog.expectTransactionOverview({
// routeItems: [
// {
// tokenAmount: '10,000.00 USDS',
// tokenUsdValue: '$10,000.00',
// },
// {
// tokenAmount: '10,000.00 USDC',
// tokenUsdValue: '$10,000.00',
// },
// ],
// outcome: '10,000.00 USDC',
// outcomeUsd: '$10,000.00',
// })
// })
test('displays transaction overview', async () => {
await convertStablesDialog.expectTransactionOverview({
routeItems: [
{
tokenAmount: '10,000.00 USDS',
tokenUsdValue: '$10,000.00',
},
{
tokenAmount: '10,000.00 USDC',
tokenUsdValue: '$10,000.00',
},
],
outcome: '10,000.00 USDC',
outcomeUsd: '$10,000.00',
})
})

// test('executes conversion', async () => {
// await convertStablesDialog.actionsContainer.acceptAllActionsAction(2)
// await convertStablesDialog.expectSuccessPage()
// await convertStablesDialog.clickBackToSavingsButton()
// await savingsPage.expectStablecoinsInWalletAssetBalance('USDS', '-')
// await savingsPage.expectStablecoinsInWalletAssetBalance('USDC', '10,000.00')
// })
// })
test('executes conversion', async () => {
await convertStablesDialog.actionsContainer.acceptAllActionsAction(2)
await convertStablesDialog.expectSuccessPage()
await convertStablesDialog.clickBackToSavingsButton()
await savingsPage.expectStablecoinsInWalletAssetBalance('USDS', '-')
await savingsPage.expectStablecoinsInWalletAssetBalance('USDC', '10,000.00')
})
})
Loading

0 comments on commit d426eca

Please sign in to comment.