Skip to content

fix tissues to start at atmosphere partials instead of 0 #377

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

Open
dylan-smith wants to merge 4 commits into
base: master
Choose a base branch
from
Open

fix tissues to start at atmosphere partials instead of 0 #377

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
4cdbaf6
fix tissues to start at atmosphere partials instead of 0
dylan-smith Nov 13, 2024
8849ea4
update tests
dylan-smith Nov 13, 2024
5e8dae0
fixing playwright tests
dylan-smith Nov 13, 2024
6e182cb
Merge branch 'master' into fix-tissue-start-loading
dylan-smith May 21, 2025
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
85 changes: 44 additions & 41 deletions src/e2e/NDL-dive-to-25m-for-50-mins-on-nitrox-32.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,60 +7,63 @@ test('NDL dive to 25m for 50 mins on nitrox 32', async ({ page }) => {
const newDivePage = await homePage.planADive();

await newDivePage.selectStandardGas('Nitrox 32');
expect(await newDivePage.getMaxDepthPO2()).toBe('33m (40m deco)');
expect(await newDivePage.getMaxDepthEND()).toBe('30m');
expect(await newDivePage.getMinDepthHypoxia()).toBe('0m');
expect.soft(await newDivePage.getMaxDepthPO2()).toBe('33m (40m deco)');
expect.soft(await newDivePage.getMaxDepthEND()).toBe('30m');
expect.soft(await newDivePage.getMinDepthHypoxia()).toBe('0m');

let diveOverviewPage = await newDivePage.Save();
const changeDepthPage = await diveOverviewPage.addChangeDepthSegment();
expect(await changeDepthPage.currentStats.getCurrentDepth()).toBe('0m');
expect(await changeDepthPage.currentStats.getNoDecoLimit()).toBe('> 5 hours');
expect(await changeDepthPage.currentStats.getCurrentCeiling()).toBe('0m');
expect(await changeDepthPage.currentStats.getCurrentGas()).toBe('Nitrox 32 (O2: 32%, He: 0%, N2: 68%)');
expect(await changeDepthPage.currentStats.getCurrentMaxDepthPO2()).toBe('33m (40m deco)');
expect(await changeDepthPage.currentStats.getCurrentMaxDepthEND()).toBe('30m');
expect(await changeDepthPage.currentStats.getCurrentMinDepthHypoxia()).toBe('0m');
expect(await changeDepthPage.currentStats.getCurrentPO2()).toBe('0.32');
expect(await changeDepthPage.currentStats.getCurrentEND()).toBe('0m');
expect.soft(await changeDepthPage.currentStats.getCurrentDepth()).toBe('0m');
expect.soft(await changeDepthPage.currentStats.getNoDecoLimit()).toBe('> 5 hours');
expect.soft(await changeDepthPage.currentStats.getCurrentCeiling()).toBe('0m');
expect.soft(await changeDepthPage.currentStats.getCurrentGas()).toBe('Nitrox 32 (O2: 32%, He: 0%, N2: 68%)');
expect.soft(await changeDepthPage.currentStats.getCurrentMaxDepthPO2()).toBe('33m (40m deco)');
expect.soft(await changeDepthPage.currentStats.getCurrentMaxDepthEND()).toBe('30m');
expect.soft(await changeDepthPage.currentStats.getCurrentMinDepthHypoxia()).toBe('0m');
expect.soft(await changeDepthPage.currentStats.getCurrentPO2()).toBe('0.32');
expect.soft(await changeDepthPage.currentStats.getCurrentEND()).toBe('0m');

await changeDepthPage.setNewDepth(25);
expect(await changeDepthPage.getDescentTime()).toBe('1 min 15 sec @ 20m/min');
expect(await changeDepthPage.getNewDepthPO2()).toBe('1.12');
expect(await changeDepthPage.getNewDepthEND()).toBe('25m');
expect(await changeDepthPage.getNewDepthNDL()).toBe('57 min 4 sec');
expect(await changeDepthPage.getNewDepthCeiling()).toBe('0m');
expect.soft(await changeDepthPage.getDescentTime()).toBe('1 min 15 sec @ 20m/min');
expect.soft(await changeDepthPage.getNewDepthPO2()).toBe('1.12');
expect.soft(await changeDepthPage.getNewDepthEND()).toBe('25m');
expect.soft(await changeDepthPage.getNewDepthNDL()).toBe('45 min 35 sec');
expect.soft(await changeDepthPage.getNewDepthCeiling()).toBe('0m');

diveOverviewPage = await changeDepthPage.Save();

const maintainDepthPage = await diveOverviewPage.addMaintainDepthSegment();
expect(await maintainDepthPage.currentStats.getCurrentDepth()).toBe('25m');
expect(await maintainDepthPage.currentStats.getNoDecoLimit()).toBe('57 min 4 sec');
expect(await maintainDepthPage.currentStats.getCurrentCeiling()).toBe('0m');
expect(await maintainDepthPage.currentStats.getCurrentGas()).toBe('Nitrox 32 (O2: 32%, He: 0%, N2: 68%)');
expect(await maintainDepthPage.currentStats.getCurrentMaxDepthPO2()).toBe('33m (40m deco)');
expect(await maintainDepthPage.currentStats.getCurrentMaxDepthEND()).toBe('30m');
expect(await maintainDepthPage.currentStats.getCurrentMinDepthHypoxia()).toBe('0m');
expect(await maintainDepthPage.currentStats.getCurrentPO2()).toBe('1.12');
expect(await maintainDepthPage.currentStats.getCurrentEND()).toBe('25m');
expect.soft(await maintainDepthPage.currentStats.getCurrentDepth()).toBe('25m');
expect.soft(await maintainDepthPage.currentStats.getNoDecoLimit()).toBe('45 min 35 sec');
expect.soft(await maintainDepthPage.currentStats.getCurrentCeiling()).toBe('0m');
expect.soft(await maintainDepthPage.currentStats.getCurrentGas()).toBe('Nitrox 32 (O2: 32%, He: 0%, N2: 68%)');
expect.soft(await maintainDepthPage.currentStats.getCurrentMaxDepthPO2()).toBe('33m (40m deco)');
expect.soft(await maintainDepthPage.currentStats.getCurrentMaxDepthEND()).toBe('30m');
expect.soft(await maintainDepthPage.currentStats.getCurrentMinDepthHypoxia()).toBe('0m');
expect.soft(await maintainDepthPage.currentStats.getCurrentPO2()).toBe('1.12');
expect.soft(await maintainDepthPage.currentStats.getCurrentEND()).toBe('25m');

await maintainDepthPage.setTimeAtDepth(50);
expect(await maintainDepthPage.getTotalDiveDuration()).toBe('51 min 15 sec');
expect(await maintainDepthPage.getNewNDL()).toBe('7 min 4 sec');
expect(await maintainDepthPage.getNewCeiling()).toBe('0m');
await maintainDepthPage.setTimeAtDepth(45);
expect.soft(await maintainDepthPage.getTotalDiveDuration()).toBe('46 min 15 sec');
expect.soft(await maintainDepthPage.getNewNDL()).toBe('35 sec');
expect.soft(await maintainDepthPage.getNewCeiling()).toBe('1m');

diveOverviewPage = await maintainDepthPage.Save();

const diveSegments = await diveOverviewPage.getDiveSegments();
expect(diveSegments[0].heading).toBe('scuba_diving 0:00 Start Dive');
expect(diveSegments[0].details).toBe('Nitrox 32 (O2: 32%, He: 0%, N2: 68%)');
expect(diveSegments[1].heading).toBe('arrow_downward 0:00 Descend to 25m');
expect(diveSegments[1].details).toBe('Descent time: 1 min 15 sec @ 20m/min');
expect(diveSegments[2].heading).toBe('arrow_forward 1:15 Maintain Depth at 25m');
expect(diveSegments[2].details).toBe('Time: 50 min');
expect(diveSegments[3].heading).toBe('done 51:15 Surface');
expect(diveSegments[3].details).toBe('Ascent time: 2 min 30 sec @ 10m/min');
expect.soft(diveSegments[0].heading).toBe('scuba_diving 0:00 Start Dive');
expect.soft(diveSegments[0].details).toBe('Nitrox 32 (O2: 32%, He: 0%, N2: 68%)');
expect.soft(diveSegments[1].heading).toBe('arrow_downward 0:00 Descend to 25m');
expect.soft(diveSegments[1].details).toBe('Descent time: 1 min 15 sec @ 20m/min');
expect.soft(diveSegments[2].heading).toBe('arrow_forward 1:15 Maintain Depth at 25m');
expect.soft(diveSegments[2].details).toBe('Time: 45 min');
expect.soft(diveSegments[3].heading).toBe('done 46:15 Surface');
expect.soft(diveSegments[3].details).toBe('Ascent time: 2 min 30 sec @ 10m/min');

expect(await diveOverviewPage.getDiveDuration()).toBe('53 min 45 sec');
expect(await diveOverviewPage.getMaxDepth()).toBe('25m');
expect(await diveOverviewPage.getAverageDepth()).toBe('24m');
expect.soft(await diveOverviewPage.getDiveDuration()).toBe('48 min 45 sec');
expect.soft(await diveOverviewPage.getMaxDepth()).toBe('25m');
expect.soft(await diveOverviewPage.getAverageDepth()).toBe('24m');

const diveErrors = await diveOverviewPage.getDiveErrors();
expect.soft(diveErrors).toHaveLength(0);
});
Loading