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.

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

CC-33200: Adjusted docker envs. #10

Merged
merged 4 commits into from
Mar 29, 2024
Merged

CC-33200: Adjusted docker envs. #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
75f51c7
Adjusted docker envs.
dmiseev Mar 29, 2024
c6b2453
Adjusted docker envs.
dmiseev Mar 29, 2024
1392652
Adjusted docker envs.
dmiseev Mar 29, 2024
b15c507
Adjusted env vars.
dmiseev Mar 29, 2024
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
6 changes: 3 additions & 3 deletions cypress.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const protocolMap: { [key: string]: 'http' | 'https' } = {
http: 'http',
https: 'https',
};
const protocol = protocolMap[getEnvVar('ENV_PROTOCOL', 'SPRYKER_SSL_ENABLE')];
const protocol = protocolMap[getEnvVar('ENV_PROTOCOL', 'SPRYKER_SSL_ENABLED')];
const backofficeHost = getEnvVar('ENV_BACKOFFICE_HOST', 'SPRYKER_BE_HOST');
const merchantPortalHost = getEnvVar('ENV_MERCHANT_PORTAL_HOST', 'SPRYKER_MP_HOST');
const glueBackendHost = getEnvVar('ENV_GLUE_BACKEND_HOST', 'SPRYKER_GLUE_BACKEND_HOST');
Expand Down Expand Up @@ -39,8 +39,8 @@ export default defineConfig({
openMode: 0,
},
},
viewportWidth: parseInt(process.env.VIEWPORT_WIDGTH ?? '1000', 10),
viewportHeight: parseInt(process.env.VIEWPORT_HEIGHT ?? '660', 10),
viewportWidth: parseInt(process.env.VIEWPORT_WIDGTH ?? '1920', 10),
viewportHeight: parseInt(process.env.VIEWPORT_HEIGHT ?? '1080', 10),
});

function getEnvVar(primary: string, fallback: string): string {
Expand Down
7 changes: 6 additions & 1 deletion cypress/support/pages/backoffice/backoffice-page.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,12 @@ export class BackofficePage extends AbstractPage {
const interceptAlias = this.faker.string.uuid();

cy.intercept('GET', params.url).as(interceptAlias);
cy.wait(`@${interceptAlias}`).its('response.body.recordsFiltered').should('eq', expectedCount);
cy.wait(`@${interceptAlias}`)
.its('response.body.recordsFiltered')
.should((total) => {
const valueToBeAtMost = expectedCount + Cypress.currentRetry;
assert.isAtMost(total, valueToBeAtMost);
});
};
}

Expand Down
1 change: 0 additions & 1 deletion docker-compose.cypress.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ services:
env_file:
- ${DEPLOYMENT_PATH}/env/cli/testing.env # depends on application setup
- ${DEPLOYMENT_PATH}/env/cli/de.env
- ${DEPLOYMENT_PATH}/terraform/cli/de.env
labels:
'spryker.app.name': cypress-tests
'spryker.app.type': cypress-tests
Expand Down
Loading