diff --git a/.env b/.env
index 38fd950b0d8..da48755037b 100644
--- a/.env
+++ b/.env
@@ -8,3 +8,5 @@ REACT_PUBLIC_URL=https://care.coronasafe.in
# Dev envs
ESLINT_NO_DEV_ERRORS=true
+
+CARE_CDN_URL="https://egov-s3-facility-10bedicu.s3.amazonaws.com https://egov-s3-patient-data-10bedicu.s3.amazonaws.com http://localhost:4566"
diff --git a/.github/workflows/cypress.yaml b/.github/workflows/cypress.yaml
index 001ceda68dc..6ae632de848 100644
--- a/.github/workflows/cypress.yaml
+++ b/.github/workflows/cypress.yaml
@@ -32,18 +32,7 @@ jobs:
run: |
cd care
make docker_config_file=docker-compose.pre-built.yaml up
- while docker compose exec celery-beat bash -c "python manage.py showmigrations 2>/dev/null | cat | grep -q '\[ \]'"; do
- >&2 echo "Migrations are not yet applied - sleeping"
- sleep 10
- done
- echo "Migrations are applied"
- cd ..
-
- - name: Load dummy data into care backend 📂
- run: |
- cd care
- docker compose exec backend bash -c "python manage.py load_dummy_data"
- docker restart care-backend-1
+ make docker_config_file=docker-compose.pre-built.yaml load-dummy-data
cd ..
- name: Wait for care to be up â™»
diff --git a/cypress/e2e/facility_spec/locations.cy.ts b/cypress/e2e/facility_spec/locations.cy.ts
index 62905b87744..97727e05ca0 100644
--- a/cypress/e2e/facility_spec/locations.cy.ts
+++ b/cypress/e2e/facility_spec/locations.cy.ts
@@ -23,6 +23,7 @@ describe("Location Management Section", () => {
"Please select a bed type",
];
const locationName = "Test-location";
+ const locationNameTwo = "Test-location-2";
const locationDescription = "Test Description";
const locationType = "WARD";
const locationMiddleware = "dev_middleware.coronasafe.live";
@@ -110,14 +111,14 @@ describe("Location Management Section", () => {
assetPage.clickassetupdatebutton();
userCreationPage.verifyErrorMessages(EXPECTED_LOCATION_ERROR_MESSAGES);
// create a new location
- facilityPage.fillFacilityName(locationName);
+ facilityPage.fillFacilityName(locationNameTwo);
facilityLocation.fillDescription(locationDescription);
facilityLocation.selectLocationType(locationType);
facilityLocation.fillMiddlewareAddress(locationMiddleware);
assetPage.clickassetupdatebutton();
facilityLocation.clickNotification();
// verify the reflection
- facilityLocation.verifyLocationName(locationName);
+ facilityLocation.verifyLocationName(locationNameTwo);
facilityLocation.verifyLocationType(locationType);
facilityLocation.verifyLocationDescription(locationDescription);
facilityLocation.verifyLocationMiddleware(locationMiddleware);
diff --git a/cypress/pageobject/Asset/AssetFilters.ts b/cypress/pageobject/Asset/AssetFilters.ts
index 9a8d9781786..5ded59f4f63 100644
--- a/cypress/pageobject/Asset/AssetFilters.ts
+++ b/cypress/pageobject/Asset/AssetFilters.ts
@@ -56,9 +56,7 @@ export class AssetFilters {
});
}
clickadvancefilter() {
- cy.intercept("GET", "**/api/v1/getallfacilities/**").as("advancefilter");
cy.get("#advanced-filter").click();
- cy.wait("@advancefilter").its("response.statusCode").should("eq", 200);
}
clickslideoverbackbutton() {
cy.get("#close-slide-over").click();
diff --git a/cypress/support/commands.ts b/cypress/support/commands.ts
index 0c491814102..0314f65feee 100644
--- a/cypress/support/commands.ts
+++ b/cypress/support/commands.ts
@@ -69,10 +69,8 @@ Cypress.Commands.add("loginByApi", (username, password) => {
Cypress.Commands.add(
"awaitUrl",
(url: string, disableLoginVerification = false) => {
- cy.intercept(/fontawesome/).as("fontawesome");
cy.intercept(/currentuser/).as("currentuser");
cy.visit(url);
- cy.wait("@fontawesome");
disableLoginVerification
? cy.wait("@currentuser")
: cy.wait("@currentuser").its("response.statusCode").should("eq", 200);
diff --git a/index.html b/index.html
index 83c80ef3214..e366febadbb 100644
--- a/index.html
+++ b/index.html
@@ -24,18 +24,12 @@
-
-
-
-
-