Skip to content
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.

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

Fix CI by using bisq backend servers. #19

Merged
merged 1 commit into from
Dec 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 frontend/cypress/e2e/mainnet/mainnet.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@
* @param {DOMRect} rect2 the bounding client rectangle of the second element
* @returns {boolean}
*/
const areOverlapping = (rect1, rect2) => {

Check warning on line 14 in frontend/cypress/e2e/mainnet/mainnet.spec.ts

View workflow job for this annotation

GitHub Actions / Frontend (dev) - node 20

Missing return type on function

Check warning on line 14 in frontend/cypress/e2e/mainnet/mainnet.spec.ts

View workflow job for this annotation

GitHub Actions / Frontend (dev) - node 21

Missing return type on function
// if one rectangle is on the left side of the other
if (rect1.right < rect2.left || rect2.right < rect1.left) {
return false

Check warning on line 17 in frontend/cypress/e2e/mainnet/mainnet.spec.ts

View workflow job for this annotation

GitHub Actions / Frontend (dev) - node 20

Missing semicolon

Check warning on line 17 in frontend/cypress/e2e/mainnet/mainnet.spec.ts

View workflow job for this annotation

GitHub Actions / Frontend (dev) - node 21

Missing semicolon
}

// if one rectangle is above the other
if (rect1.bottom < rect2.top || rect2.bottom < rect1.top) {
return false

Check warning on line 22 in frontend/cypress/e2e/mainnet/mainnet.spec.ts

View workflow job for this annotation

GitHub Actions / Frontend (dev) - node 20

Missing semicolon

Check warning on line 22 in frontend/cypress/e2e/mainnet/mainnet.spec.ts

View workflow job for this annotation

GitHub Actions / Frontend (dev) - node 21

Missing semicolon
}

// the rectangles must overlap
Expand Down Expand Up @@ -335,7 +335,7 @@
});
});

it('loads skeleton when changes between networks', () => {
it.skip('loads skeleton when changes between networks', () => {
cy.visit('/');
cy.waitForSkeletonGone();

Expand Down
2 changes: 1 addition & 1 deletion frontend/cypress/e2e/signet/signet.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ describe('Signet', () => {
});


if (baseModule === 'mempool') {
if (false /* signet not supported by mempool.bisq.services */) {
it('loads the dashboard', () => {
cy.visit('/signet');
cy.waitForSkeletonGone();
Expand Down
2 changes: 1 addition & 1 deletion frontend/cypress/e2e/testnet/testnet.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ describe('Testnet', () => {
cy.intercept('/api/tx/*/outspends').as('tx-outspends');
});

if (baseModule === 'mempool') {
if (false /* testnet not supported by mempool.bisq.services */) {

it('loads the dashboard', () => {
cy.visit('/testnet');
Expand Down
2 changes: 1 addition & 1 deletion frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
"cypress:run": "cypress run",
"cypress:run:record": "cypress run --record",
"cypress:open:ci": "node update-config.js TESTNET_ENABLED=true SIGNET_ENABLED=true LIQUID_ENABLED=true BISQ_ENABLED=true ITEMS_PER_PAGE=25 && npm run generate-config && start-server-and-test serve:local-prod 4200 cypress:open",
"cypress:run:ci": "node update-config.js TESTNET_ENABLED=true SIGNET_ENABLED=true LIQUID_ENABLED=true BISQ_ENABLED=true ITEMS_PER_PAGE=25 && npm run generate-config && start-server-and-test serve:local-prod 4200 cypress:run:record",
"cypress:run:ci": "node update-config.js TESTNET_ENABLED=true SIGNET_ENABLED=true LIQUID_ENABLED=true BISQ_ENABLED=true ITEMS_PER_PAGE=25 && npm run generate-config && start-server-and-test serve:local-prod 4200 cypress:run",
"cypress:open:ci:staging": "node update-config.js TESTNET_ENABLED=true SIGNET_ENABLED=true LIQUID_ENABLED=true BISQ_ENABLED=true ITEMS_PER_PAGE=25 && npm run generate-config && start-server-and-test serve:local-staging 4200 cypress:open",
"cypress:run:ci:staging": "node update-config.js TESTNET_ENABLED=true SIGNET_ENABLED=true LIQUID_ENABLED=true BISQ_ENABLED=true ITEMS_PER_PAGE=25 && npm run generate-config && start-server-and-test serve:local-staging 4200 cypress:run:record"
},
Expand Down
8 changes: 4 additions & 4 deletions frontend/proxy.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@ PROXY_CONFIG = [
'!/liquidtestnet', '!/liquidtestnet/**', '!/liquidtestnet/',
'/testnet/api/**', '/signet/api/**'
],
target: "https://mempool.space",
target: "https://mempool.bisq.services",
ws: true,
secure: false,
changeOrigin: true
},
{
context: ['/api/v1/ws'],
target: "https://mempool.space",
target: "https://mempool.bisq.services",
ws: true,
secure: false,
changeOrigin: true,
Expand Down Expand Up @@ -68,7 +68,7 @@ PROXY_CONFIG = [
},
{
context: ['/resources/mining-pools/**'],
target: "https://mempool.space",
target: "https://mempool.bisq.services",
secure: false,
changeOrigin: true
}
Expand All @@ -86,7 +86,7 @@ if (configContent && configContent.BASE_MODULE == "liquid") {
} else {
PROXY_CONFIG.push({
context: ['/resources/assets.json', '/resources/assets.minimal.json', '/resources/worldmap.json'],
target: "https://mempool.space",
target: "https://mempool.bisq.services",
secure: false,
changeOrigin: true,
});
Expand Down
Loading