forked from ohcnetwork/care_fe
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into Fix-ohcnetwork#7708
- Loading branch information
Showing
28 changed files
with
378 additions
and
109 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| name: Auto Add Needs Testing Label | ||
|
|
||
| on: | ||
| pull_request: | ||
| types: [opened, reopened, edited] | ||
| issue_comment: | ||
| types: [created] | ||
| pull_request_review: | ||
| types: [submitted] | ||
|
|
||
| jobs: | ||
| auto_label: | ||
| runs-on: ubuntu-latest | ||
|
|
||
| steps: | ||
| - name: Check PR Conditions and Add Label | ||
| id: check_conditions | ||
| uses: actions/github-script@v5 | ||
| with: | ||
| github-token: ${{ secrets.GITHUB_TOKEN }} | ||
| script: | | ||
| const pr = context.payload.pull_request; | ||
| const isDraft = pr.draft; | ||
| const isReadyForTestingComment = context.payload.comment?.body.includes('ready for testing'); | ||
| const isChangesRequired = context.payload.review?.state === 'changes_requested'; | ||
| if ((isReadyForTestingComment && !isDraft) || (!isDraft && pr.draft_changed)) { | ||
| await github.issues.addLabels({ | ||
| owner: context.repo.owner, | ||
| repo: context.repo.repo, | ||
| issue_number: pr.number, | ||
| labels: ['needs testing'] | ||
| }); | ||
| } | ||
| if (isChangesRequired) { | ||
| await github.issues.createComment({ | ||
| owner: context.repo.owner, | ||
| repo: context.repo.repo, | ||
| issue_number: pr.number, | ||
| body: 'Reminder: To add the "needs testing" label, comment "ready for testing" on this PR.' | ||
| }); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| import PatientPrescription from "../../pageobject/Patient/PatientPrescription"; | ||
| import LoginPage from "../../pageobject/Login/LoginPage"; | ||
| import { PatientPage } from "../../pageobject/Patient/PatientCreation"; | ||
|
|
||
| const patientPrescription = new PatientPrescription(); | ||
| const loginPage = new LoginPage(); | ||
| const patientPage = new PatientPage(); | ||
|
|
||
| describe("Patient Medicine Administration", () => { | ||
| before(() => { | ||
| loginPage.loginAsDisctrictAdmin(); | ||
| cy.saveLocalStorage(); | ||
| }); | ||
|
|
||
| beforeEach(() => { | ||
| cy.restoreLocalStorage(); | ||
| cy.clearLocalStorage(/filters--.+/); | ||
| cy.awaitUrl("/patients"); | ||
| }); | ||
|
|
||
| it("Add a new medicine for a patient and verify the duplicate medicine validation", () => { | ||
| patientPage.visitPatient("Dummy Patient 4"); | ||
| patientPrescription.visitMedicineTab(); | ||
| patientPrescription.clickAddPrescription(); | ||
| patientPrescription.interceptMedibase(); | ||
| patientPrescription.selectMedicinebox(); | ||
| patientPrescription.selectMedicine("DOLO"); | ||
| patientPrescription.enterDosage("4"); | ||
| patientPrescription.selectDosageFrequency("Twice daily"); | ||
| cy.submitButton("Submit"); | ||
| cy.verifyNotification("Medicine prescribed"); | ||
| cy.closeNotification(); | ||
| // verify the duplicate medicine error message | ||
| patientPrescription.clickAddPrescription(); | ||
| patientPrescription.interceptMedibase(); | ||
| patientPrescription.selectMedicinebox(); | ||
| patientPrescription.selectMedicine("DOLO"); | ||
| patientPrescription.enterDosage("4"); | ||
| patientPrescription.selectDosageFrequency("Twice daily"); | ||
| cy.submitButton("Submit"); | ||
| cy.verifyNotification( | ||
| "Medicine - This medicine is already prescribed to this patient. Please discontinue the existing prescription to prescribe again.", | ||
| ); | ||
| }); | ||
|
|
||
| afterEach(() => { | ||
| cy.saveLocalStorage(); | ||
| }); | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.