#3004

- added email to admin user - added functional tests data - updated functional test
AtlasOfLivingAustralia · Nov 15, 2023 · a6efb51 · a6efb51
1 parent 42fbe01
commit a6efb51
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 11 deletions.
diff --git a/src/integration-test/groovy/au/org/ala/fieldcapture/AdminSpec.groovy b/src/integration-test/groovy/au/org/ala/fieldcapture/AdminSpec.groovy
@@ -72,7 +72,7 @@ class AdminSpec extends StubbedCasSpec {
     def "Admin Reports"() {
         setup:
         login([userId:'1', role:"ROLE_ADMIN", email:'[email protected]', firstName: "ALA", lastName:'Admin'], browser)
-        String fromDate = "10/10/2020"
+        String fromDate = "10/01/2020"
         String toDate = "10/10/2021"
 
         when:
@@ -106,7 +106,7 @@ class AdminSpec extends StubbedCasSpec {
         waitFor 20, {
             MimeMessage[] messages = greenMail.getReceivedMessages()
             messages?.length == 2
-            messages[0].getSubject() == "Your download is ready"
+            messages[1].getSubject() == "Your download is ready"
         }
 
         when:"I clicked the Organisation Activities Report button"
@@ -116,8 +116,8 @@ class AdminSpec extends StubbedCasSpec {
         then:
         waitFor 20, {
             MimeMessage[] messages = greenMail.getReceivedMessages()
-            messages?.length == 1
-            messages[0].getSubject() == "Your download is ready"
+            messages?.length == 3
+            messages[2].getSubject() == "Your download is ready"
         }
 
         when:"I clicked the Organisation Report Status button"
@@ -127,8 +127,8 @@ class AdminSpec extends StubbedCasSpec {
         then:
         waitFor 20, {
             MimeMessage[] messages = greenMail.getReceivedMessages()
-            messages?.length == 2
-            messages[0].getSubject() == "Your download is ready"
+            messages?.length == 4
+            messages[3].getSubject() == "Your download is ready"
         }
 
     }

diff --git a/src/integration-test/groovy/au/org/ala/fieldcapture/StubbedCasSpec.groovy b/src/integration-test/groovy/au/org/ala/fieldcapture/StubbedCasSpec.groovy
@@ -176,7 +176,7 @@ class StubbedCasSpec extends FieldcaptureFunctionalTest {
     }
     /** Convenience method to stub the login of a user with the CAS ROLE_ALA_ADMIN role */
     def loginAsAlaAdmin(Browser browser) {
-        login([userId:ALA_ADMIN_USER_ID, role:"ROLE_ADMIN", email: '[email protected]', firstName:"ALA", lastName:"Administrator"], browser)
+        login([userId:ALA_ADMIN_USER_ID, role:"ROLE_ADMIN", userName: '[email protected]', email: '[email protected]', firstName:"ALA", lastName:"Administrator"], browser)
     }
     /** Convenience method to stub the login of a user no special roles */
     def loginAsUser(String userId, Browser browser) {

diff --git a/src/integration-test/groovy/pages/AdminReportsPage.groovy b/src/integration-test/groovy/pages/AdminReportsPage.groovy
@@ -12,8 +12,8 @@ class AdminReportsPage extends Page {
         period {$('select#reportPeriodOfManagementUnit',0)}
         downloadReportBtn(required:false) {$('a#muReportDownload')}
         downloadReportSummaryBtn(required:false) {$('a#muReportDownloadSummary')}
-        orgDownloadReportBtn(required:false) {$('a#muReportDownload')}
-        orgDownloadReportSummaryBtn(required:false) {$('a#muReportDownloadSummary')}
+        orgDownloadReportBtn(required:false) {$('a#orgReportDownload')}
+        orgDownloadReportSummaryBtn(required:false) {$('a#orgReportDownloadSummary')}
         showDownloadDetailsIcon(required:false) { $('i.showDownloadDetailsIcon')}
         muReportDownloadLink(required:false) {$('a#entityReportDownloadLink')}
         startDate{$("#muFromDate")}

diff --git a/src/integration-test/resources/dataset3/loadDataSet.js b/src/integration-test/resources/dataset3/loadDataSet.js
@@ -1514,4 +1514,24 @@ db.userPermission.insert({
     entityId: "monitorProject",
     userId: '1',
     accessLevel: 'admin'
-});
+});
+
+createOrganisation({
+    name:'THE TRUSTEE FOR PSS FUND Test',
+    organisationId:'test_organisation',
+    status:'active', abn:'',
+    url:'http://www.ala.org.au',
+    acronym:'TSTORG', description:'THE TRUSTEE FOR PSS FUND Test'
+});
+delete report1.projectId
+var activityId = "activity2"
+report1.organisationId = 'test_organisation';
+report1.activityId = activityId;
+activity.activityId = activityId;
+output.activityId = activityId;
+outputSwan.activityId = activityId;
+
+db.report.insert(report1)
+db.activity.insert(activity1)
+db.output.insert(output);
+db.output.insert(outputSwan)
diff --git a/src/main/scripts/runFunctionalTests.sh b/src/main/scripts/runFunctionalTests.sh
@@ -9,7 +9,7 @@ fi
 
 BRANCH=$3
 if [ -z $BRANCH ]; then
-    BRANCH=feature/paratoo
+    BRANCH=feature/issue3004
 fi
 
 ECODATA_LOCAL_DIR=$2