Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
c02a6ce
Updated Cypress version to 13.15.2
can-angun Nov 11, 2024
6329838
Merge branch 'next' into QT-235v2
can-angun Nov 11, 2024
a10ea73
Updated numTestsKeptInMemory as 0
can-angun Nov 11, 2024
c4b51d1
Merge branch 'QT-235v2' of github.com:Countly/countly-server into QT-…
can-angun Nov 11, 2024
e030d80
Empty-Commit
can-angun Nov 11, 2024
9a429eb
Empty-Commit
can-angun Nov 11, 2024
0945c16
Empty-Commit
can-angun Nov 11, 2024
62bd678
Updated browser as electron
can-angun Nov 11, 2024
7fd584e
Empty-Commit
can-angun Nov 11, 2024
e6f2760
Updated cypress run
can-angun Nov 11, 2024
0a1a70f
Updated cypress run script
can-angun Nov 11, 2024
4cb5d54
Updated cypress run script
can-angun Nov 11, 2024
c53ab18
Updated cypress run script
can-angun Nov 11, 2024
4b43615
Empty-Commit
can-angun Nov 12, 2024
f5fc4b5
Added Memory Usage After Tests
can-angun Nov 12, 2024
e239a2a
Updated browser
can-angun Nov 12, 2024
6a74b04
Added electron to config
can-angun Nov 13, 2024
d372053
Added no runner ui command
can-angun Nov 13, 2024
7575312
Empty-Commit
can-angun Nov 13, 2024
f1594d1
Empty-Commit
can-angun Nov 13, 2024
6ea6ef2
Empty-Commit
can-angun Nov 13, 2024
3459f78
Empty-Commit
can-angun Nov 13, 2024
946634a
Empty-Commit
can-angun Nov 13, 2024
4cfc77b
Empty-Commit
can-angun Nov 13, 2024
b310cb4
Empty-Commit
can-angun Nov 13, 2024
84b1de0
Merge branch 'next' into QT-235v2
can-angun Nov 13, 2024
0ecf14b
Empty-Commit
can-angun Nov 14, 2024
6fa1189
Merge branch 'QT-235v2' of github.com:Countly/countly-server into QT-…
can-angun Nov 14, 2024
530edd4
Empty-Commit
can-angun Nov 14, 2024
6c2564c
Empty-Commit
can-angun Nov 15, 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
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ jobs:
cd ui-tests
npm install
xvfb-run --auto-servernum --server-args="-screen 0 1280x1024x24" \
npm run cy:run:dashboard --headless --no-sandbox --disable-gpu --disable-dev-shm-usage
npm run cy:run:dashboard

- name: Upload UI tests artifacts
if: ${{ failure() }}
Expand Down Expand Up @@ -381,7 +381,7 @@ jobs:
cd ui-tests
npm install
xvfb-run --auto-servernum --server-args="-screen 0 1280x1024x24" \
npm run cy:run:onboarding --headless --no-sandbox --disable-gpu --disable-dev-shm-usage
npm run cy:run:onboarding

- name: Upload UI tests artifacts
if: ${{ failure() }}
Expand Down
5 changes: 2 additions & 3 deletions ui-tests/cypress.config.sample.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ module.exports = defineConfig({
defaultCommandTimeout: 30000,
viewportWidth: 2000,
viewportHeight: 1100,
numTestsKeptInMemory: 1,
numTestsKeptInMemory: 0,
experimentalMemoryManagement: true,
projectId: "000000",
chromeWebSecurity: false,
Expand All @@ -28,9 +28,8 @@ module.exports = defineConfig({
}
}
});
// before:browser:launch event for custom Chrome options
on("before:browser:launch", (browser, launchOptions) => {
if (["chrome", "edge"].includes(browser.name)) {
if (["chrome", "edge", "electron"].includes(browser.name)) {
if (browser.isHeadless) {
launchOptions.args.push("--no-sandbox");
launchOptions.args.push("--disable-gl-drawing-for-tests");
Expand Down
133 changes: 52 additions & 81 deletions ui-tests/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 5 additions & 3 deletions ui-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"author": "Countly, Inc.",
"scripts": {
"cy:open": "cypress open",
"cy:run:dashboard": "CYPRESS_NO_COMMAND_LOG=1 cypress run --record --key 00000000-0000-0000-0000-000000000000 --spec **/dashboard/**/*.cy.js --browser chrome",
"cy:run:onboarding": "CYPRESS_NO_COMMAND_LOG=1 cypress run --record --key 00000000-0000-0000-0000-000000000000 --spec **/onboarding/**/*.cy.js --browser chrome",
"cy:run:dashboard": "CYPRESS_NO_COMMAND_LOG=1 cypress run --record --key 00000000-0000-0000-0000-000000000000 --spec **/dashboard/**/*.cy.js --headless --no-runner-ui --browser electron",
"cy:run:onboarding": "CYPRESS_NO_COMMAND_LOG=1 cypress run --record --key 00000000-0000-0000-0000-000000000000 --spec **/onboarding/**/*.cy.js --headless --no-runner-ui --browser electron",
"cy:run:login": "cypress run --spec **/login.cy.js --browser chrome",
"cy:run:userActivity": "cypress run --spec **/analytics/loyalty/userActivity.cy.js --browser chrome"
},
Expand All @@ -15,8 +15,10 @@
"@faker-js/faker": "^8.2.0",
"base-64": "^1.0.0",
"chai": "^5.1.1",
"cypress": "^13.15.0",
"cypress-file-upload": "^5.0.8",
"moment": "^2.29.4"
},
"devDependencies": {
"cypress": "^13.15.2"
}
}
Loading