Skip to content

Commit

Permalink
Merge pull request #333 from OasisDEX/cosmetic-improvements
Browse files Browse the repository at this point in the history 
Cosmetic improvements
  • Loading branch information
@juan-langa
juan-langa authored May 29, 2024
2 parents 9348b0a + eecfb3a commit 8b143a0
Show file tree
Hide file tree
Showing 7 changed files with 103 additions and 103 deletions.
6 changes: 3 additions & 3 deletions src/pages/common/productsList/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ export class ProductsList {
parseFloat(element.split('%')[0])
);
// Log for debugging purposes
console.log('=== allBorrowRatesNumbers: ', allBorrowRatesNumbers);
console.log('allBorrowRatesNumbers: ', allBorrowRatesNumbers);

expect(
allBorrowRatesNumbers.every((rate) => rate > 0),
Expand All @@ -99,7 +99,7 @@ export class ProductsList {
parseFloat(element.split('x')[0])
);
// Log for debugging purposes
console.log('=== allMaxMultiplesNumbers: ', allMaxMultiplesNumbers);
console.log('allMaxMultiplesNumbers: ', allMaxMultiplesNumbers);

expect(
allMaxMultiplesNumbers.every((rate) => rate > 0),
Expand All @@ -117,7 +117,7 @@ export class ProductsList {
const allPoolsManagement = await this.poolLocator.locator('td:nth-child(3)').allInnerTexts();

// Log for debugging purposes
console.log('=== allPoolsManagement: ', allPoolsManagement);
console.log('allPoolsManagement: ', allPoolsManagement);

expect(
allPoolsManagement.every((managementType) => ['Active', 'Passive'].includes(managementType)),
Expand Down
92 changes: 46 additions & 46 deletions tests/noWallet/borrowPage.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ test.describe('Borrow page', async () => {
});

numberOfPools.forEach((poolIndex) => {
test(`It should open position page for all available BORROW pools - Page 1 - ${poolIndex} @regression`, async ({
test(`It should open position page for all available BORROW pools - Page 1 - ${poolIndex}`, async ({
app,
}) => {
await app.borrow.open();
Expand All @@ -50,11 +50,11 @@ test.describe('Borrow page', async () => {
const strategy = await app.homepage.productHub.list.nthPool(poolIndex).getStrategy();
const protocol = await app.homepage.productHub.list.nthPool(poolIndex).getProtocol();
const network = await app.homepage.productHub.list.nthPool(poolIndex).getNetwork();
console.log('++++ Pool Index: ', poolIndex);
console.log('++++ Pool: ', pool);
console.log('++++ Strategy: ', strategy);
console.log('++++ Protocol: ', protocol);
console.log('++++ Network: ', network);
console.log('Pool Index: ', poolIndex);
console.log('Pool: ', pool);
console.log('Strategy: ', strategy);
console.log('Protocol: ', protocol);
console.log('Network: ', network);

await app.homepage.productHub.list.nthPool(poolIndex).shouldBevisible();
await app.homepage.productHub.list.nthPool(poolIndex).open();
Expand Down Expand Up @@ -85,11 +85,11 @@ test.describe('Borrow page', async () => {
const strategy = await app.homepage.productHub.list.nthPool(poolIndex).getStrategy();
const protocol = await app.homepage.productHub.list.nthPool(poolIndex).getProtocol();
const network = await app.homepage.productHub.list.nthPool(poolIndex).getNetwork();
console.log('++++ Pool Index: ', poolIndex);
console.log('++++ Pool: ', pool);
console.log('++++ Strategy: ', strategy);
console.log('++++ Protocol: ', protocol);
console.log('++++ Network: ', network);
console.log('Pool Index: ', poolIndex);
console.log('Pool: ', pool);
console.log('Strategy: ', strategy);
console.log('Protocol: ', protocol);
console.log('Network: ', network);

await app.homepage.productHub.list.nthPool(poolIndex).shouldBevisible();
await app.homepage.productHub.list.nthPool(poolIndex).open();
Expand Down Expand Up @@ -122,11 +122,11 @@ test.describe('Borrow page', async () => {
const strategy = await app.homepage.productHub.list.nthPool(poolIndex).getStrategy();
const protocol = await app.homepage.productHub.list.nthPool(poolIndex).getProtocol();
const network = await app.homepage.productHub.list.nthPool(poolIndex).getNetwork();
console.log('++++ Pool Index: ', poolIndex);
console.log('++++ Pool: ', pool);
console.log('++++ Strategy: ', strategy);
console.log('++++ Protocol: ', protocol);
console.log('++++ Network: ', network);
console.log('Pool Index: ', poolIndex);
console.log('Pool: ', pool);
console.log('Strategy: ', strategy);
console.log('Protocol: ', protocol);
console.log('Network: ', network);

await app.homepage.productHub.list.nthPool(poolIndex).shouldBevisible();
await app.homepage.productHub.list.nthPool(poolIndex).open();
Expand Down Expand Up @@ -161,11 +161,11 @@ test.describe('Borrow page', async () => {
const strategy = await app.homepage.productHub.list.nthPool(poolIndex).getStrategy();
const protocol = await app.homepage.productHub.list.nthPool(poolIndex).getProtocol();
const network = await app.homepage.productHub.list.nthPool(poolIndex).getNetwork();
console.log('++++ Pool Index: ', poolIndex);
console.log('++++ Pool: ', pool);
console.log('++++ Strategy: ', strategy);
console.log('++++ Protocol: ', protocol);
console.log('++++ Network: ', network);
console.log('Pool Index: ', poolIndex);
console.log('Pool: ', pool);
console.log('Strategy: ', strategy);
console.log('Protocol: ', protocol);
console.log('Network: ', network);

await app.homepage.productHub.list.nthPool(poolIndex).shouldBevisible();
await app.homepage.productHub.list.nthPool(poolIndex).open();
Expand Down Expand Up @@ -202,11 +202,11 @@ test.describe('Borrow page', async () => {
const strategy = await app.homepage.productHub.list.nthPool(poolIndex).getStrategy();
const protocol = await app.homepage.productHub.list.nthPool(poolIndex).getProtocol();
const network = await app.homepage.productHub.list.nthPool(poolIndex).getNetwork();
console.log('++++ Pool Index: ', poolIndex);
console.log('++++ Pool: ', pool);
console.log('++++ Strategy: ', strategy);
console.log('++++ Protocol: ', protocol);
console.log('++++ Network: ', network);
console.log('Pool Index: ', poolIndex);
console.log('Pool: ', pool);
console.log('Strategy: ', strategy);
console.log('Protocol: ', protocol);
console.log('Network: ', network);

await app.homepage.productHub.list.nthPool(poolIndex).shouldBevisible();
await app.homepage.productHub.list.nthPool(poolIndex).open();
Expand Down Expand Up @@ -245,11 +245,11 @@ test.describe('Borrow page', async () => {
const strategy = await app.homepage.productHub.list.nthPool(poolIndex).getStrategy();
const protocol = await app.homepage.productHub.list.nthPool(poolIndex).getProtocol();
const network = await app.homepage.productHub.list.nthPool(poolIndex).getNetwork();
console.log('++++ Pool Index: ', poolIndex);
console.log('++++ Pool: ', pool);
console.log('++++ Strategy: ', strategy);
console.log('++++ Protocol: ', protocol);
console.log('++++ Network: ', network);
console.log('Pool Index: ', poolIndex);
console.log('Pool: ', pool);
console.log('Strategy: ', strategy);
console.log('Protocol: ', protocol);
console.log('Network: ', network);

await app.homepage.productHub.list.nthPool(poolIndex).shouldBevisible();
await app.homepage.productHub.list.nthPool(poolIndex).open();
Expand Down Expand Up @@ -290,11 +290,11 @@ test.describe('Borrow page', async () => {
const strategy = await app.homepage.productHub.list.nthPool(poolIndex).getStrategy();
const protocol = await app.homepage.productHub.list.nthPool(poolIndex).getProtocol();
const network = await app.homepage.productHub.list.nthPool(poolIndex).getNetwork();
console.log('++++ Pool Index: ', poolIndex);
console.log('++++ Pool: ', pool);
console.log('++++ Strategy: ', strategy);
console.log('++++ Protocol: ', protocol);
console.log('++++ Network: ', network);
console.log('Pool Index: ', poolIndex);
console.log('Pool: ', pool);
console.log('Strategy: ', strategy);
console.log('Protocol: ', protocol);
console.log('Network: ', network);

await app.homepage.productHub.list.nthPool(poolIndex).shouldBevisible();
await app.homepage.productHub.list.nthPool(poolIndex).open();
Expand Down Expand Up @@ -337,11 +337,11 @@ test.describe('Borrow page', async () => {
const strategy = await app.homepage.productHub.list.nthPool(poolIndex).getStrategy();
const protocol = await app.homepage.productHub.list.nthPool(poolIndex).getProtocol();
const network = await app.homepage.productHub.list.nthPool(poolIndex).getNetwork();
console.log('++++ Pool Index: ', poolIndex);
console.log('++++ Pool: ', pool);
console.log('++++ Strategy: ', strategy);
console.log('++++ Protocol: ', protocol);
console.log('++++ Network: ', network);
console.log('Pool Index: ', poolIndex);
console.log('Pool: ', pool);
console.log('Strategy: ', strategy);
console.log('Protocol: ', protocol);
console.log('Network: ', network);

await app.homepage.productHub.list.nthPool(poolIndex).shouldBevisible();
await app.homepage.productHub.list.nthPool(poolIndex).open();
Expand Down Expand Up @@ -386,11 +386,11 @@ test.describe('Borrow page', async () => {
const strategy = await app.homepage.productHub.list.nthPool(poolIndex).getStrategy();
const protocol = await app.homepage.productHub.list.nthPool(poolIndex).getProtocol();
const network = await app.homepage.productHub.list.nthPool(poolIndex).getNetwork();
console.log('++++ Pool Index: ', poolIndex);
console.log('++++ Pool: ', pool);
console.log('++++ Strategy: ', strategy);
console.log('++++ Protocol: ', protocol);
console.log('++++ Network: ', network);
console.log('Pool Index: ', poolIndex);
console.log('Pool: ', pool);
console.log('Strategy: ', strategy);
console.log('Protocol: ', protocol);
console.log('Network: ', network);

await app.homepage.productHub.list.nthPool(poolIndex).shouldBevisible();
await app.homepage.productHub.list.nthPool(poolIndex).open();
Expand Down
2 changes: 1 addition & 1 deletion tests/noWallet/earnPage.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ test.describe('Earn page', async () => {
});

numberOfPools.forEach((poolIndex) => {
test(`It should open position page for all available EARN pools - Page 1 - ${poolIndex} @regression`, async ({
test(`It should open position page for all available EARN pools - Page 1 - ${poolIndex}`, async ({
app,
}) => {
await app.earn.open();
Expand Down
26 changes: 13 additions & 13 deletions tests/noWallet/homepage.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,11 +81,11 @@ test.describe('Homepage', async () => {
const strategy = await app.homepage.productHub.list.nthPool(poolIndex).getStrategy();
const protocol = await app.homepage.productHub.list.nthPool(poolIndex).getProtocol();
const network = await app.homepage.productHub.list.nthPool(poolIndex).getNetwork();
console.log('++++ Pool Index: ', poolIndex);
console.log('++++ Pool: ', pool);
console.log('++++ Strategy: ', strategy);
console.log('++++ Protocol: ', protocol);
console.log('++++ Network: ', network);
console.log('Pool Index: ', poolIndex);
console.log('Pool: ', pool);
console.log('Strategy: ', strategy);
console.log('Protocol: ', protocol);
console.log('Network: ', network);

await app.homepage.productHub.list.nthPool(poolIndex).shouldBevisible();
await app.homepage.productHub.list.nthPool(poolIndex).open();
Expand All @@ -109,10 +109,10 @@ test.describe('Homepage', async () => {
const pool = await app.homepage.productHub.list.nthPool(poolIndex).getPool();
const protocol = await app.homepage.productHub.list.nthPool(poolIndex).getProtocol();
const network = await app.homepage.productHub.list.nthPool(poolIndex).getNetwork();
console.log('++++ Pool Index: ', poolIndex);
console.log('++++ Pool: ', pool);
console.log('++++ Protocol: ', protocol);
console.log('++++ Network: ', network);
console.log('Pool Index: ', poolIndex);
console.log('Pool: ', pool);
console.log('Protocol: ', protocol);
console.log('Network: ', network);

await app.homepage.productHub.list.nthPool(poolIndex).shouldBevisible();
await app.homepage.productHub.list.nthPool(poolIndex).open();
Expand All @@ -136,10 +136,10 @@ test.describe('Homepage', async () => {
const pool = await app.homepage.productHub.list.nthPool(poolIndex).getPool();
const protocol = await app.homepage.productHub.list.nthPool(poolIndex).getProtocol();
const network = await app.homepage.productHub.list.nthPool(poolIndex).getNetwork();
console.log('++++ Pool Index: ', poolIndex);
console.log('++++ Pool: ', pool);
console.log('++++ Protocol: ', protocol);
console.log('++++ Network: ', network);
console.log('Pool Index: ', poolIndex);
console.log('Pool: ', pool);
console.log('Protocol: ', protocol);
console.log('Network: ', network);

await app.homepage.productHub.list.nthPool(poolIndex).shouldBevisible();
await app.homepage.productHub.list.nthPool(poolIndex).open();
Expand Down
72 changes: 36 additions & 36 deletions tests/noWallet/multiplyPage.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const numberOfPoolsPage7 = Array.from({ length: 8 }, (_, index) => 0 + index);

test.describe('Multiply page', async () => {
numberOfPools.forEach((poolIndex) => {
test(`It should open position page for all available MULTIPLY pools - Page 1 - ${poolIndex} @regression`, async ({
test(`It should open position page for all available MULTIPLY pools - Page 1 - ${poolIndex}`, async ({
app,
}) => {
await app.multiply.open();
Expand All @@ -19,11 +19,11 @@ test.describe('Multiply page', async () => {
const strategy = await app.homepage.productHub.list.nthPool(poolIndex).getStrategy();
const protocol = await app.homepage.productHub.list.nthPool(poolIndex).getProtocol();
const network = await app.homepage.productHub.list.nthPool(poolIndex).getNetwork();
console.log('++++ Pool Index: ', poolIndex);
console.log('++++ Pool: ', pool);
console.log('++++ Strategy: ', strategy);
console.log('++++ Protocol: ', protocol);
console.log('++++ Network: ', network);
console.log('Pool Index: ', poolIndex);
console.log('Pool: ', pool);
console.log('Strategy: ', strategy);
console.log('Protocol: ', protocol);
console.log('Network: ', network);

await app.homepage.productHub.list.nthPool(poolIndex).shouldBevisible();
await app.homepage.productHub.list.nthPool(poolIndex).open();
Expand Down Expand Up @@ -54,11 +54,11 @@ test.describe('Multiply page', async () => {
const strategy = await app.homepage.productHub.list.nthPool(poolIndex).getStrategy();
const protocol = await app.homepage.productHub.list.nthPool(poolIndex).getProtocol();
const network = await app.homepage.productHub.list.nthPool(poolIndex).getNetwork();
console.log('++++ Pool Index: ', poolIndex);
console.log('++++ Pool: ', pool);
console.log('++++ Strategy: ', strategy);
console.log('++++ Protocol: ', protocol);
console.log('++++ Network: ', network);
console.log('Pool Index: ', poolIndex);
console.log('Pool: ', pool);
console.log('Strategy: ', strategy);
console.log('Protocol: ', protocol);
console.log('Network: ', network);

await app.homepage.productHub.list.nthPool(poolIndex).shouldBevisible();
await app.homepage.productHub.list.nthPool(poolIndex).open();
Expand Down Expand Up @@ -91,11 +91,11 @@ test.describe('Multiply page', async () => {
const strategy = await app.homepage.productHub.list.nthPool(poolIndex).getStrategy();
const protocol = await app.homepage.productHub.list.nthPool(poolIndex).getProtocol();
const network = await app.homepage.productHub.list.nthPool(poolIndex).getNetwork();
console.log('++++ Pool Index: ', poolIndex);
console.log('++++ Pool: ', pool);
console.log('++++ Strategy: ', strategy);
console.log('++++ Protocol: ', protocol);
console.log('++++ Network: ', network);
console.log('Pool Index: ', poolIndex);
console.log('Pool: ', pool);
console.log('Strategy: ', strategy);
console.log('Protocol: ', protocol);
console.log('Network: ', network);

await app.homepage.productHub.list.nthPool(poolIndex).shouldBevisible();
await app.homepage.productHub.list.nthPool(poolIndex).open();
Expand Down Expand Up @@ -130,11 +130,11 @@ test.describe('Multiply page', async () => {
const strategy = await app.homepage.productHub.list.nthPool(poolIndex).getStrategy();
const protocol = await app.homepage.productHub.list.nthPool(poolIndex).getProtocol();
const network = await app.homepage.productHub.list.nthPool(poolIndex).getNetwork();
console.log('++++ Pool Index: ', poolIndex);
console.log('++++ Pool: ', pool);
console.log('++++ Strategy: ', strategy);
console.log('++++ Protocol: ', protocol);
console.log('++++ Network: ', network);
console.log('Pool Index: ', poolIndex);
console.log('Pool: ', pool);
console.log('Strategy: ', strategy);
console.log('Protocol: ', protocol);
console.log('Network: ', network);

await app.homepage.productHub.list.nthPool(poolIndex).shouldBevisible();
await app.homepage.productHub.list.nthPool(poolIndex).open();
Expand Down Expand Up @@ -171,11 +171,11 @@ test.describe('Multiply page', async () => {
const strategy = await app.homepage.productHub.list.nthPool(poolIndex).getStrategy();
const protocol = await app.homepage.productHub.list.nthPool(poolIndex).getProtocol();
const network = await app.homepage.productHub.list.nthPool(poolIndex).getNetwork();
console.log('++++ Pool Index: ', poolIndex);
console.log('++++ Pool: ', pool);
console.log('++++ Strategy: ', strategy);
console.log('++++ Protocol: ', protocol);
console.log('++++ Network: ', network);
console.log('Pool Index: ', poolIndex);
console.log('Pool: ', pool);
console.log('Strategy: ', strategy);
console.log('Protocol: ', protocol);
console.log('Network: ', network);

await app.homepage.productHub.list.nthPool(poolIndex).shouldBevisible();
await app.homepage.productHub.list.nthPool(poolIndex).open();
Expand Down Expand Up @@ -214,11 +214,11 @@ test.describe('Multiply page', async () => {
const strategy = await app.homepage.productHub.list.nthPool(poolIndex).getStrategy();
const protocol = await app.homepage.productHub.list.nthPool(poolIndex).getProtocol();
const network = await app.homepage.productHub.list.nthPool(poolIndex).getNetwork();
console.log('++++ Pool Index: ', poolIndex);
console.log('++++ Pool: ', pool);
console.log('++++ Strategy: ', strategy);
console.log('++++ Protocol: ', protocol);
console.log('++++ Network: ', network);
console.log('Pool Index: ', poolIndex);
console.log('Pool: ', pool);
console.log('Strategy: ', strategy);
console.log('Protocol: ', protocol);
console.log('Network: ', network);

await app.homepage.productHub.list.nthPool(poolIndex).shouldBevisible();
await app.homepage.productHub.list.nthPool(poolIndex).open();
Expand Down Expand Up @@ -259,11 +259,11 @@ test.describe('Multiply page', async () => {
const strategy = await app.homepage.productHub.list.nthPool(poolIndex).getStrategy();
const protocol = await app.homepage.productHub.list.nthPool(poolIndex).getProtocol();
const network = await app.homepage.productHub.list.nthPool(poolIndex).getNetwork();
console.log('++++ Pool Index: ', poolIndex);
console.log('++++ Pool: ', pool);
console.log('++++ Strategy: ', strategy);
console.log('++++ Protocol: ', protocol);
console.log('++++ Network: ', network);
console.log('Pool Index: ', poolIndex);
console.log('Pool: ', pool);
console.log('Strategy: ', strategy);
console.log('Protocol: ', protocol);
console.log('Network: ', network);

await app.homepage.productHub.list.nthPool(poolIndex).shouldBevisible();
await app.homepage.productHub.list.nthPool(poolIndex).open();
Expand Down
4 changes: 2 additions & 2 deletions utils/general.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ export const comparePositionsData = (stagingPositions, productionPositions) => {
Object.keys(stagingPosition).every((key) => stagingPosition[key] === productionPosition[key])
);
if (!positionResult) {
console.log('+++ Inconsistent Position Data - Staging: ', stagingPosition);
console.log('+++ Inconsistent Position Data - Production: ', productionPositions[0]);
console.log('Inconsistent Position Data - Staging: ', stagingPosition);
console.log('Inconsistent Position Data - Production: ', productionPositions[0]);
}
return positionResult;
});
Expand Down
Loading

0 comments on commit 8b143a0

Please sign in to comment.