Resolve merge conflicts (#2878)

Co-authored-by: Nar -- <28705606+finnar-bin@users.noreply.github.com>
Co-authored-by: Stuart Runyan <shrunyan@gmail.com>

Author: 3 people

cypress/e2e/content/content.spec.js

@@ -184,7 +184,7 @@ describe("Content Specs", () => {
     });
 
     it("Currency Field", () => {
-      cy.get("#12-b35c68-jd1s8s input[type=number]")
+      cy.get("#12-b35c68-jd1s8s input")
         .focus()
         .clear()
         .type("100.00")

cypress/e2e/schema/field.spec.js

@@ -17,12 +17,14 @@ const SELECTORS = {
   FIELD_SELECT_MEDIA: "FieldItem_images",
   FIELD_SELECT_BOOLEAN: "FieldItem_yes_no",
   FIELD_SELECT_ONE_TO_ONE: "FieldItem_one_to_one",
+  FIELD_SELECT_CURRENCY: "FieldItem_currency",
   MEDIA_CHECKBOX_LIMIT: "MediaCheckbox_limit",
   MEDIA_CHECKBOX_LOCK: "MediaCheckbox_group_id",
   DROPDOWN_ADD_OPTION: "DropdownAddOption",
   DROPDOWN_DELETE_OPTION: "DeleteOption",
   AUTOCOMPLETE_MODEL_ZUID: "Autocomplete_relatedModelZUID",
   AUTOCOMPLETE_FIELED_ZUID: "Autocomplete_relatedFieldZUID",
+  AUTOCOMPLETE_FIELD_CURRENCY: "Autocomplete_currency",
   INPUT_LABEL: "FieldFormInput_label",
   INPUT_NAME: "FieldFormInput_name",
   INPUT_OPTION_LABEL: "OptionLabel",
@@ -357,6 +359,44 @@ describe("Schema: Fields", () => {
     cy.getBySelector(`Field_${fieldName}`).should("exist");
   });
 
+  it("Creates a currency field", () => {
+    cy.intercept("**/fields?showDeleted=true").as("getFields");
+
+    const fieldLabel = `Currency ${timestamp}`;
+    const fieldName = `currency_${timestamp}`;
+
+    // Open the add field modal
+    cy.getBySelector(SELECTORS.ADD_FIELD_BTN).should("exist").click();
+    cy.getBySelector(SELECTORS.ADD_FIELD_MODAL).should("exist");
+
+    // Select one-to-one relationship field
+    cy.getBySelector(SELECTORS.FIELD_SELECT_CURRENCY).should("exist").click();
+
+    // Select default currency
+    cy.getBySelector(SELECTORS.AUTOCOMPLETE_FIELD_CURRENCY).type("phil");
+    cy.get("[role=listbox] [role=option]").first().click();
+
+    // Fill up fields
+    cy.getBySelector(SELECTORS.INPUT_LABEL).should("exist").type(fieldLabel);
+
+    // Navigate to rules tab and add default value
+    cy.getBySelector(SELECTORS.RULES_TAB_BTN).click();
+    // click on the default value checkbox
+    cy.getBySelector(SELECTORS.DEFAULT_VALUE_CHECKBOX).click();
+    // enter a default value
+    cy.getBySelector(SELECTORS.DEFAULT_VALUE_INPUT).type("1000.50");
+    // Verify default currency
+    cy.getBySelector(SELECTORS.DEFAULT_VALUE_INPUT).contains("PHP");
+    // Click done
+    cy.getBySelector(SELECTORS.SAVE_FIELD_BUTTON).should("exist").click();
+    cy.getBySelector(SELECTORS.ADD_FIELD_MODAL).should("not.exist");
+
+    cy.wait("@getFields");
+
+    // Check if field exists
+    cy.getBySelector(`Field_${fieldName}`).should("exist");
+  });
+
   it("Creates a field via add another field button", () => {
     cy.intercept("**/fields?showDeleted=true").as("getFields");