Merge branch '2.0.0-release' of github.com:openkfw/TruBudget into 2.0…

….0-release
openkfw · Apr 6, 2022 · ec9b825 · ec9b825
2 parents d79866f + 6e9ddaf
commit ec9b825
Show file tree

Hide file tree

Showing 121 changed files with 5,747 additions and 5,112 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,7 +15,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 <!-- ### Removed -->
 
-<!-- ### Fixed -->
+### Fixed
+
+- Fixed date picker for setting dates in another timezone [#1082](https://github.com/openkfw/TruBudget/issues/1082)
+- Fixed date picker to type a date with keyboard [#1081](https://github.com/openkfw/TruBudget/issues/1081)
 
 ## [1.29.1] - 2022-03-02
 

diff --git a/e2e-test/cypress/integration/change_user_password_spec.js b/e2e-test/cypress/integration/change_user_password_spec.js
@@ -1,7 +1,7 @@
-const testUserName = "passwordChangeUser";
-const testUserNamePassword = "test1234";
-
 describe("Users/Groups Dashboard", function() {
+  // Generate random IDs since every ID can only exists once in the multichain
+  const testUserName = `passwordChangeUser_${Math.floor(Math.random() * 1000000)}`;
+  const testUserNamePassword = "test1234";
   before(() => {
     cy.login("root", Cypress.env("ROOT_SECRET"));
     cy.getUserList().then(userList => {
@@ -96,7 +96,7 @@ describe("Users/Groups Dashboard", function() {
     cy.get("[data-test=password-change-submit]").click();
 
     // A success snackbar is displayed
-    cy.get("#client-snackbar")
+    cy.get("[data-test=client-snackbar]")
       .should("be.visible")
       .contains("Password successfully changed");
 
@@ -123,7 +123,7 @@ describe("Users/Groups Dashboard", function() {
     cy.get("[data-test=password-change-submit]").click();
 
     // A success snackbar is displayed
-    cy.get("#client-snackbar")
+    cy.get("[data-test=client-snackbar]")
       .should("be.visible")
       .contains("Password successfully changed");
   });

diff --git a/e2e-test/cypress/integration/documents_spec.js b/e2e-test/cypress/integration/documents_spec.js
@@ -35,7 +35,7 @@ describe("Attaching a document to a workflowitem.", function() {
 
   const uploadDocument = fileName => {
     // open edit dialog:
-    cy.get("div[title=Edit] > button")
+    cy.get("[data-test=edit-workflowitem]")
       .should("be.visible")
       .click();
 
@@ -87,7 +87,7 @@ describe("Attaching a document to a workflowitem.", function() {
 
     // make sure the validation was successful:
     cy.wait("@validate")
-      .get(`button[label="Validated!"] > span`)
+      .get(`[data-test=validation-button]`)
       .should("contain", "Identical");
   });
 
@@ -125,7 +125,7 @@ describe("Attaching a document to a workflowitem.", function() {
 
     // make sure the validation was not successful:
     cy.wait("@validate")
-      .get(`button[label="Changed!"] > span`)
+      .get(`[data-test=validation-button]`)
       .should("contain", "Different");
   });
 

diff --git a/e2e-test/cypress/integration/project_assignee_spec.js b/e2e-test/cypress/integration/project_assignee_spec.js
@@ -59,21 +59,21 @@ describe("Project Assignee", function() {
   // Setup assigneeId
   function setupConfirmationDialog() {
     cy.get("[data-test=single-select]").click();
+    cy.get("[data-test=single-select-list]")
+      .should("exist")
+      .find("[data-test=not-selected-item]")
+      .first()
+      .invoke("attr", "value")
+      .as("assigneeId");
+
     cy.get("[data-test=single-select-list]")
       .should("exist")
       .then($list => {
-        const firstUncheckedRadioButton = $list.find("input:not(:checked)").first();
         cy.wrap($list.find("input:not(:checked)").first()).as("firstUncheckedRadioButton");
-        cy.wrap(
-          firstUncheckedRadioButton
-            .parent()
-            .parent()
-            .parent()
-        )
-          .invoke("attr", "value")
-          .as("assigneeId");
       });
+
     cy.get("@assigneeId").then(assigneeId => {
+      cy.log(assigneeId);
       revokeViewPermissions(permissionsBeforeTesting, projectId, assigneeId);
     });
   }

diff --git a/e2e-test/cypress/integration/subproject_assignee_spec.js b/e2e-test/cypress/integration/subproject_assignee_spec.js
@@ -84,21 +84,21 @@ describe("Subproject Assignee", function() {
   // Setup assigneeId
   function setupConfirmationDialog() {
     cy.get("[data-test=single-select]").click();
+    cy.get("[data-test=single-select-list]")
+      .should("exist")
+      .find("[data-test=not-selected-item]")
+      .first()
+      .invoke("attr", "value")
+      .as("assigneeId");
+
     cy.get("[data-test=single-select-list]")
       .should("exist")
       .then($list => {
-        const firstUncheckedRadioButton = $list.find("input:not(:checked)").first();
         cy.wrap($list.find("input:not(:checked)").first()).as("firstUncheckedRadioButton");
-        cy.wrap(
-          firstUncheckedRadioButton
-            .parent()
-            .parent()
-            .parent()
-        )
-          .invoke("attr", "value")
-          .as("assigneeId");
       });
+
     cy.get("@assigneeId").then(assigneeId => {
+      cy.log(assigneeId);
       revokeViewPermissions(permissionsBeforeTesting, projectId, subprojectId, assigneeId);
     });
   }

diff --git a/e2e-test/cypress/integration/workflowitem_assignee_spec.js b/e2e-test/cypress/integration/workflowitem_assignee_spec.js
@@ -111,21 +111,21 @@ describe("Workflowitem Assignee", function() {
   // Setup assigneeId
   function setupConfirmationDialog() {
     cy.get(`[data-test=workflowitem-assignee-${workflowitemId}]`).click();
+    cy.get("[data-test=single-select-list]")
+      .should("exist")
+      .find("[data-test=not-selected-item]")
+      .first()
+      .invoke("attr", "value")
+      .as("assigneeId");
+
     cy.get("[data-test=single-select-list]")
       .should("exist")
       .then($list => {
-        const firstUncheckedRadioButton = $list.find("input:not(:checked)").first();
         cy.wrap($list.find("input:not(:checked)").first()).as("firstUncheckedRadioButton");
-        cy.wrap(
-          firstUncheckedRadioButton
-            .parent()
-            .parent()
-            .parent()
-        )
-          .invoke("attr", "value")
-          .as("assigneeId");
       });
+
     cy.get("@assigneeId").then(assigneeId => {
+      cy.log(assigneeId);
       revokeViewPermissions(permissionsBeforeTesting, projectId, subprojectId, workflowitemId, assigneeId);
     });
   }

diff --git a/e2e-test/cypress/integration/workflowitem_create_spec.js b/e2e-test/cypress/integration/workflowitem_create_spec.js
@@ -61,10 +61,7 @@ describe("Workflowitem create", function() {
         .should("contain", "€");
       // The information on the workflow item amount
       // and exchange rate is displayed in a tooltip
-      cy.get("[data-test=amount-explanation]")
-        .first()
-        .should("have.attr", "title")
-        .should("contain", "$");
+      cy.get("[data-test=amount-explanation-USD]").should("be.visible");
     });
   });
 

diff --git a/e2e-test/cypress/integration/workflowitem_edit_spec.js b/e2e-test/cypress/integration/workflowitem_edit_spec.js
@@ -50,10 +50,9 @@ describe("Workflowitem edit", function() {
         .get("[data-test=workflowitem-amount]")
         .last()
         .should("contain", "€");
-      cy.get("[data-test=amount-explanation]")
-        .last()
-        .should("have.attr", "title")
-        .should("contain", "$");
+
+      cy.get("[data-test=amount-explanation-USD]").should("be.visible");
+
       // Open edit workflow item dialog
       cy.get("[data-test=edit-workflowitem]")
         .last()