Skip to content

Commit

Permalink
completed all tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@timrobinson33
timrobinson33 committed Apr 10, 2021
1 parent e64e8f9 commit 7cac7f5
Show file tree
Hide file tree
Showing 2 changed files with 143 additions and 23 deletions.
68 changes: 50 additions & 18 deletions src/App.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,19 +132,19 @@ function Results({ drugIdx, strengthIdx, prescribedDose, numStatDoses, statDoseS
const wasteMl = numVials * drugStrength.volume - totalDoseMl
return (
<div className="box">
<label>Results:</label>
<p>
<span>Total dose ({units}): {prescribedDose} + ({numStatDoses} x {statDoseStrength}) = {totalDose}{units}</span>
</p>
<p>
<span>Total dose (ml): {totalDose} {divide} {drugStrength.amount} x {drugStrength.volume} = {formatNumber(totalDoseMl)}ml</span>
</p>
<p>
<span>Number of vials: {numVials}</span>
</p>
<p>
<span>Waste: {formatNumber(waste)}{units} (= {formatNumber(wasteMl)}ml)</span>
</p>
<label>Results:</label>
<p>
<span>Total dose ({units}): {prescribedDose} + ({numStatDoses} x {statDoseStrength}) = {totalDose}{units}</span>
</p>
<p>
<span>Total dose (ml): {totalDose} {divide} {drugStrength.amount} x {drugStrength.volume} = {formatNumber(totalDoseMl)}ml</span>
</p>
<p>
<span>Number of vials: {numVials}</span>
</p>
<p>
<span>Waste: {formatNumber(waste)}{units} (= {formatNumber(wasteMl)}ml)</span>
</p>
</div>
)
}
Expand Down Expand Up @@ -201,22 +201,54 @@ function MainView() {
{!!strengthIdx && <>
<div>
<label htmlFor="prescribed-dose">Prescribed dose:</label>
<input id="prescribed-dose" type="number" disabled={showResults} min={0} value={prescribedDoseStr} onChange={e => setPrescribedDoseStr(e.target.value)} />
<input
id="prescribed-dose"
type="number"
disabled={showResults}
min={0}
value={prescribedDoseStr}
onChange={event => {
if (event.target.validity.valid) {
setPrescribedDoseStr(event.target.value)
}
}}
/>
<span> {units}</span>
</div>
<div>
<label htmlFor="num-stat-doses">+ Stat/PRN doses:</label>
<select id="num-stat-doses" value={numStatDoses} disabled={showResults} onChange={e => selectNumStatDoses(parseInt(e.target.value))}>
<select
id="num-stat-doses"
value={numStatDoses}
disabled={showResults}
onChange={e => selectNumStatDoses(parseInt(e.target.value))}>
{_.range(7).map(x => <option key={x} value={x}>{x}</option>)}
</select>
<span> x </span>
<input type="number" data-testid="stat-dose-strength" min={0} disabled={showResults || (!numStatDoses)} value={statDoseStrengthStr} onChange={e => setStatDoseStrengthStr(e.target.value)} />
<input
type="number"
data-testid="stat-dose-strength"
min={0}
disabled={showResults || (!numStatDoses)}
value={statDoseStrengthStr}
onChange={event => {
if (event.target.validity.valid) {
setStatDoseStrengthStr(event.target.value)
}
}}
/>
<span> {units}</span>
</div>
{showResults &&
<Results drugIdx={drugIdx} strengthIdx={strengthIdx} prescribedDose={prescribedDose} numStatDoses={numStatDoses} statDoseStrength={statDoseStrength} />}
<Results
drugIdx={drugIdx}
strengthIdx={strengthIdx}
prescribedDose={prescribedDose}
numStatDoses={numStatDoses}
statDoseStrength={statDoseStrength}
/>}
<button type="button" onClick={() => { selectDrug(0) }}>Reset</button>
{showCalc &&
{showCalc &&
<button type="button" onClick={() => { setShowResults(true) }}>Calculate</button>
}
</>}
Expand Down
98 changes: 93 additions & 5 deletions src/App.test.js
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { render, screen } from '@testing-library/react'
import { render, screen, fireEvent } from '@testing-library/react'
import userEvent from '@testing-library/user-event'
import App from './App'

Expand All @@ -14,15 +14,20 @@ const _calculate = () => screen.queryByText("Calculate")
const _statDoseStrength = () => screen.queryByTestId("stat-dose-strength")
const _results = () => screen.queryByText("Results:")

// userEvent.type is difficult to use with number fields, so we use this instead
export function fireChangeEvent(field, value) {
fireEvent.change(field, { target: { value } });
}

// used to set up most tests
function fillInEverything() {
render(<App />)
userEvent.click(_ok())
userEvent.selectOptions(_drug(), _diamorphine())
userEvent.selectOptions(_strength(), _15mg_2ml())
userEvent.type(_prescribedDose(), "25")
fireChangeEvent(_prescribedDose(), "25")
userEvent.selectOptions(_statDoses(), "3")
userEvent.type(_statDoseStrength(), "5")
fireChangeEvent(_statDoseStrength(), "5")
}

test('happy path', () => {
Expand Down Expand Up @@ -61,11 +66,11 @@ test('happy path', () => {

// enter a dose
expect(_calculate()).toBeFalsy()
userEvent.type(_prescribedDose(), "25")
fireChangeEvent(_prescribedDose(), "25")
expect(_calculate()).toBeTruthy()
userEvent.selectOptions(_statDoses(), "3")
expect(_calculate()).toBeFalsy()
userEvent.type(_statDoseStrength(), "5")
fireChangeEvent(_statDoseStrength(), "5")
expect(_calculate()).toBeTruthy()
expect(_reset()).toBeTruthy()

Expand All @@ -77,6 +82,8 @@ test('happy path', () => {
screen.getByText("Total dose (ml): 40 ÷ 15 x 2 = 5.33ml")
screen.getByText("Number of vials: 3")
screen.getByText("Waste: 5mg (= 0.67ml)")
expect(screen.queryAllByText(/mg/)).toHaveLength(12)
expect(screen.queryAllByText(/mcg/)).toHaveLength(0)
expect(_reset()).toBeTruthy()

// click reset
Expand Down Expand Up @@ -151,6 +158,16 @@ test('select different strength -> doses reset to blank', () => {
expect(_results()).toBeFalsy()
})

test('prescribed dose invalid values', () => {
fillInEverything()
fireChangeEvent(_prescribedDose(), "999")
expect(_prescribedDose()).toHaveValue(999)
fireChangeEvent(_prescribedDose(), "-7")
expect(_prescribedDose()).toHaveValue(999)
fireChangeEvent(_prescribedDose(), "abc")
expect(_prescribedDose()).toHaveValue(null)
})

test('Set stat prn to zero -> clears stat dose', () => {
fillInEverything()
userEvent.selectOptions(_statDoses(), "0")
Expand All @@ -163,3 +180,74 @@ test('Set stat prn to zero -> clears stat dose', () => {
expect(_statDoseStrength()).toHaveValue(null)
})

test('stat dose strength invalid values', () => {
fillInEverything()
fireChangeEvent(_statDoseStrength(), "999")
expect(_statDoseStrength()).toHaveValue(999)
fireChangeEvent(_statDoseStrength(), "-7")
expect(_statDoseStrength()).toHaveValue(999)
fireChangeEvent(_statDoseStrength(), "abc")
expect(_statDoseStrength()).toHaveValue(null)
})

test('0 treated the same as blank in prescribed dose', () => {
fillInEverything()
userEvent.selectOptions(_statDoses(), "0")
expect(_calculate()).toBeTruthy()
fireChangeEvent(_prescribedDose(), "0")
expect(_calculate()).toBeFalsy()
})

test('0 treated the same as blank in stat dose strength', () => {
fillInEverything()
fireChangeEvent(_prescribedDose(), "0")
expect(_calculate()).toBeTruthy()
fireChangeEvent(_statDoseStrength(), "0")
expect(_calculate()).toBeFalsy()
})

test('calculation with no stat dose', () => {
fillInEverything()
fireChangeEvent(_statDoses(), "0")
userEvent.click(_calculate())
screen.getByText("Total dose (mg): 25 + (0 x 0) = 25mg")
screen.getByText("Total dose (ml): 25 ÷ 15 x 2 = 3.33ml")
screen.getByText("Number of vials: 2")
screen.getByText("Waste: 5mg (= 0.67ml)")
})

test('calculation with no prescribed dose', () => {
fillInEverything()
fireChangeEvent(_prescribedDose(), "")
userEvent.click(_calculate())
screen.getByText("Total dose (mg): 0 + (3 x 5) = 15mg")
screen.getByText("Total dose (ml): 15 ÷ 15 x 2 = 2ml")
screen.getByText("Number of vials: 1")
screen.getByText("Waste: 0mg (= 0ml)")
})

test('micrograms', () => {
const windowAlertMock = jest.spyOn(window, "alert")
windowAlertMock.mockImplementation(() => { })
fillInEverything()
expect(windowAlertMock).not.toHaveBeenCalled()

// as soon as you select fentanyl, the alert is shown
userEvent.selectOptions(_drug(), screen.getByText("Fentanyl"))
expect(windowAlertMock).toHaveBeenCalledWith(expect.stringContaining("is measured in micrograms"))

// fill in the fields and calculate
userEvent.selectOptions(_strength(), screen.getByText("100mcg/2ml"))
fireChangeEvent(_prescribedDose(), "25")
userEvent.selectOptions(_statDoses(), "3")
fireChangeEvent(_statDoseStrength(), "5")
userEvent.click(_calculate())

// everything is shown in mcg
screen.getByText("Total dose (mcg): 25 + (3 x 5) = 40mcg")
screen.getByText("Total dose (ml): 40 ÷ 100 x 2 = 0.8ml")
screen.getByText("Number of vials: 1")
screen.getByText("Waste: 60mcg (= 1.2ml)")
expect(screen.queryAllByText(/mcg/)).toHaveLength(7)
expect(screen.queryAllByText(/mg/)).toHaveLength(0)
})

0 comments on commit 7cac7f5

Please sign in to comment.