AYS-464 | Request changes added.

afet-yonetim-sistemi · Sep 23, 2024 · eb09aa2 · eb09aa2
1 parent 9d24758
commit eb09aa2
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 44 deletions.
diff --git a/.github/workflows/application-health-checker.yml b/.github/workflows/application-health-checker.yml
@@ -34,24 +34,12 @@ jobs:
       - name: Replace ui.url in configuration.properties # Step to replace the placeholder api.url in configuration.properties
         run: sed 's|'{UI_URL}'|'${{ secrets.AYS_UI_URL }}'|g' configuration.properties >> temp_configuration.properties ; rm configuration.properties ; mv temp_configuration.properties configuration.properties
 
-      - name: Replace afet_yonetim_sistemi.admin.email_address in configuration.properties # Step to replace the placeholder afet_yonetim_sistemi.admin.email_address in configuration.properties
-        run: sed 's|'{AFET_YONETIM_SISTEMI_ADMIN_EMAIL_ADDRESS}'|'${{ secrets.AYS_AFET_YONETIM_SISTEMI_ADMIN_EMAIL_ADDRESS }}'|g' configuration.properties >> temp_configuration.properties ; rm configuration.properties ; mv temp_configuration.properties configuration.properties
-
-      - name: Replace afet_yonetim_sistemi.admin.password in configuration.properties # Step to replace the placeholder afet_yonetim_sistemi.admin.password in configuration.properties
-        run: sed 's|'{AFET_YONETIM_SISTEMI_ADMIN_PASSWORD}'|'${{ secrets.AYS_AFET_YONETIM_SISTEMI_ADMIN_PASSWORD }}'|g' configuration.properties >> temp_configuration.properties ; rm configuration.properties ; mv temp_configuration.properties configuration.properties
-
       - name: Replace volunteer_foundation.admin.emailAddress in configuration.properties # Step to replace the placeholder volunteer_foundation.admin.email_address in configuration.properties
         run: sed 's|'{VOLUNTEER_FOUNDATION_ADMIN_EMAIL_ADDRESS}'|'${{ secrets.AYS_VOLUNTEER_FOUNDATION_ADMIN_EMAIL_ADDRESS }}'|g' configuration.properties >> temp_configuration.properties ; rm configuration.properties ; mv temp_configuration.properties configuration.properties
 
       - name: Replace volunteer_foundation.admin.password in configuration.properties # Step to replace the placeholder institution_one.admin_user_one.password in configuration.properties
         run: sed 's|'{VOLUNTEER_FOUNDATION_ADMIN_PASSWORD}'|'${{ secrets.AYS_VOLUNTEER_FOUNDATION_ADMIN_PASSWORD }}'|g' configuration.properties >> temp_configuration.properties ; rm configuration.properties ; mv temp_configuration.properties configuration.properties
 
-      - name: Replace disaster_foundation.admin.email_address in configuration.properties # Step to replace the placeholder disaster_foundation.admin.email_address in configuration.properties
-        run: sed 's|'{DISASTER_FOUNDATION_ADMIN_EMAIL_ADDRESS}'|'${{ secrets.DISASTER_FOUNDATION_ADMIN_EMAIL_ADDRESS }}'|g' configuration.properties >> temp_configuration.properties ; rm configuration.properties ; mv temp_configuration.properties configuration.properties
-
-      - name: Replace disaster_foundation.admin.password in configuration.properties # Step to replace the placeholder disaster_foundation.admin.password in configuration.properties
-        run: sed 's|'{DISASTER_FOUNDATION_ADMIN_PASSWORD}'|'${{ secrets.AYS_DISASTER_FOUNDATION_ADMIN_PASSWORD }}'|g' configuration.properties >> temp_configuration.properties ; rm configuration.properties ; mv temp_configuration.properties configuration.properties
-
       - name: Replace test_foundation.admin.email_address in configuration.properties # Step to replace the placeholder test_foundation.admin.email_address in configuration.properties
         run: sed 's|'{TEST_FOUNDATION_ADMIN_EMAIL_ADDRESS}'|'${{ secrets.AYS_TEST_FOUNDATION_ADMIN_EMAIL_ADDRESS }}'|g' configuration.properties >> temp_configuration.properties ; rm configuration.properties ; mv temp_configuration.properties configuration.properties
 

diff --git a/.github/workflows/pull-request-checker.yml b/.github/workflows/pull-request-checker.yml
@@ -40,24 +40,12 @@ jobs:
       - name: Replace ui.url in configuration.properties # Step to replace the placeholder api.url in configuration.properties
         run: sed 's|'{UI_URL}'|'${{ secrets.AYS_UI_URL }}'|g' configuration.properties >> temp_configuration.properties ; rm configuration.properties ; mv temp_configuration.properties configuration.properties
 
-      - name: Replace afet_yonetim_sistemi.admin.email_address in configuration.properties # Step to replace the placeholder afet_yonetim_sistemi.admin.email_address in configuration.properties
-        run: sed 's|'{AFET_YONETIM_SISTEMI_ADMIN_EMAIL_ADDRESS}'|'${{ secrets.AYS_AFET_YONETIM_SISTEMI_ADMIN_EMAIL_ADDRESS }}'|g' configuration.properties >> temp_configuration.properties ; rm configuration.properties ; mv temp_configuration.properties configuration.properties
-
-      - name: Replace afet_yonetim_sistemi.admin.password in configuration.properties # Step to replace the placeholder afet_yonetim_sistemi.admin.password in configuration.properties
-        run: sed 's|'{AFET_YONETIM_SISTEMI_ADMIN_PASSWORD}'|'${{ secrets.AYS_AFET_YONETIM_SISTEMI_ADMIN_PASSWORD }}'|g' configuration.properties >> temp_configuration.properties ; rm configuration.properties ; mv temp_configuration.properties configuration.properties
-
       - name: Replace volunteer_foundation.admin.emailAddress in configuration.properties # Step to replace the placeholder volunteer_foundation.admin.email_address in configuration.properties
         run: sed 's|'{VOLUNTEER_FOUNDATION_ADMIN_EMAIL_ADDRESS}'|'${{ secrets.AYS_VOLUNTEER_FOUNDATION_ADMIN_EMAIL_ADDRESS }}'|g' configuration.properties >> temp_configuration.properties ; rm configuration.properties ; mv temp_configuration.properties configuration.properties
 
       - name: Replace volunteer_foundation.admin.password in configuration.properties # Step to replace the placeholder institution_one.admin_user_one.password in configuration.properties
         run: sed 's|'{VOLUNTEER_FOUNDATION_ADMIN_PASSWORD}'|'${{ secrets.AYS_VOLUNTEER_FOUNDATION_ADMIN_PASSWORD }}'|g' configuration.properties >> temp_configuration.properties ; rm configuration.properties ; mv temp_configuration.properties configuration.properties
 
-      - name: Replace disaster_foundation.admin.email_address in configuration.properties # Step to replace the placeholder disaster_foundation.admin.email_address in configuration.properties
-        run: sed 's|'{DISASTER_FOUNDATION_ADMIN_EMAIL_ADDRESS}'|'${{ secrets.DISASTER_FOUNDATION_ADMIN_EMAIL_ADDRESS }}'|g' configuration.properties >> temp_configuration.properties ; rm configuration.properties ; mv temp_configuration.properties configuration.properties
-
-      - name: Replace institution_one.admin_user_two.password in configuration.properties # Step to replace the placeholder institution_one.admin_user_one.password in configuration.properties
-        run: sed 's|'{DISASTER_FOUNDATION_ADMIN_PASSWORD}'|'${{ secrets.AYS_DISASTER_FOUNDATION_ADMIN_PASSWORD }}'|g' configuration.properties >> temp_configuration.properties ; rm configuration.properties ; mv temp_configuration.properties configuration.properties
-
       - name: Replace test_foundation.admin.email_address in configuration.properties # Step to replace the placeholder test_foundation.admin.email_address in configuration.properties
         run: sed 's|'{TEST_FOUNDATION_ADMIN_EMAIL_ADDRESS}'|'${{ secrets.AYS_TEST_FOUNDATION_ADMIN_EMAIL_ADDRESS }}'|g' configuration.properties >> temp_configuration.properties ; rm configuration.properties ; mv temp_configuration.properties configuration.properties
 

diff --git a/sample_configuration.properties b/sample_configuration.properties
@@ -1,9 +1,5 @@
 ui.url={UI_URL}
-afet_yonetim_sistemi.admin.email_address={AFET_YONETIM_SISTEMI_ADMIN_EMAIL_ADDRESS}
-afet_yonetim_sistemi.admin.password={AFET_YONETIM_SISTEMI_ADMIN_PASSWORD}
 volunteer_foundation.admin.email_address={VOLUNTEER_FOUNDATION_ADMIN_EMAIL_ADDRESS}
 volunteer_foundation.admin.password={VOLUNTEER_FOUNDATION_ADMIN_PASSWORD}
-disaster_foundation.admin.email_address={DISASTER_FOUNDATION_ADMIN_EMAIL_ADDRESS}
-disaster_foundation.admin.password={DISASTER_FOUNDATION_ADMIN_PASSWORD}
 test_foundation.admin.email_address={TEST_FOUNDATION_ADMIN_EMAIL_ADDRESS}
 test_foundation.admin.password={TEST_FOUNDATION_ADMIN_PASSWORD}
diff --git a/src/test/java/org/ays/configuration/AysConfigurationProperty.java b/src/test/java/org/ays/configuration/AysConfigurationProperty.java
@@ -30,24 +30,24 @@ public static class Ui {
         public static final String URL = PROPERTIES.getProperty("ui.url");
     }
 
-    public static class AfetYonetimSistemiAdmin {
-        public static final String EMAIL_ADDRESS = PROPERTIES.getProperty("afet_yonetim_sistemi.admin.email_address");
-        public static final String PASSWORD = PROPERTIES.getProperty("afet_yonetim_sistemi.admin.password");
-    }
+    public static class VolunteerFoundation {
 
-    public static class VolunteerFoundationAdmin {
-        public static final String EMAIL_ADDRESS = PROPERTIES.getProperty("volunteer_foundation.admin.email_address");
-        public static final String PASSWORD = PROPERTIES.getProperty("volunteer_foundation.admin.password");
-    }
+        public static class Admin {
+            public static final String EMAIL_ADDRESS = PROPERTIES.getProperty("volunteer_foundation.admin.email_address");
+            public static final String PASSWORD = PROPERTIES.getProperty("volunteer_foundation.admin.password");
+
+        }
 
-    public static class DisasterFoundationAdmin {
-        public static final String EMAIL_ADDRESS = PROPERTIES.getProperty("disaster_foundation.admin.email_address");
-        public static final String PASSWORD = PROPERTIES.getProperty("disaster_foundation.admin.password");
     }
 
-    public static class TestFoundationAdmin {
-        public static final String EMAIL_ADDRESS = PROPERTIES.getProperty("test_foundation.admin.email_address");
-        public static final String PASSWORD = PROPERTIES.getProperty("test_foundation.admin.password");
+    public static class TestFoundation {
+
+        public static class Admin {
+            public static final String EMAIL_ADDRESS = PROPERTIES.getProperty("test_foundation.admin.email_address");
+            public static final String PASSWORD = PROPERTIES.getProperty("test_foundation.admin.password");
+
+        }
+
     }
 
 

diff --git a/src/test/java/org/ays/step_definitions/Login.java b/src/test/java/org/ays/step_definitions/Login.java
@@ -22,8 +22,8 @@ public void open_the_institution_login_page() {
 
     @When("Enter the username and password")
     public void enter_the_username_and_password() {
-        this.pageActions.sendKeysMethod(loginPOM.getLoginUsername(), AysConfigurationProperty.VolunteerFoundationAdmin.EMAIL_ADDRESS);
-        this.pageActions.sendKeysMethod(loginPOM.getLoginPassword(), AysConfigurationProperty.VolunteerFoundationAdmin.PASSWORD);
+        this.pageActions.sendKeysMethod(loginPOM.getLoginUsername(), AysConfigurationProperty.VolunteerFoundation.Admin.EMAIL_ADDRESS);
+        this.pageActions.sendKeysMethod(loginPOM.getLoginPassword(), AysConfigurationProperty.VolunteerFoundation.Admin.PASSWORD);
     }
 
     @And("Click the Login button")