Merge pull request #1039 from necyberteam/md-1934

Md 1934

blt/md/md-1934

@@ -0,0 +1 @@
+amp_cyberinfrastructure_org

composer.json

@@ -202,7 +202,8 @@
       "drupal/core-project-message": true,
       "oomphinc/composer-installers-extender": true,
       "acquia/blt": true,
-      "phpstan/extension-installer": true
+      "phpstan/extension-installer": true,
+      "php-http/discovery": true
     }
   },
   "extra": {

tests/cypress/cypress/e2e/accessmatch/match-services/match-plus-engagement-form.cy.js

@@ -29,24 +29,26 @@ describe("Authenticated user tests the MATCH+ Engagement Form", () => {
     cy.visit("/node/add/match_engagement?type=plus");
 
     //Title Field
-    cy.get("#edit-title-0-value").type("http://example-0.com");
+    cy.get("#edit-title-0-value").type("Title of a Test Engagement");
 
     //Institution Field
     cy.get("#edit-field-institution-0-value").type("Example University");
 
-    //Description field does not actually type anything in (Below two lines are for the description field)
-    // cy.get("p").type("Testing");
-    // cy.get(".ck-editor__main > .ck").type("Testing");
+    //Description field
+    cy.get('.field--name-body .ck-content').then(el => {
+      const editor = el[0].ckeditorInstance
+      editor.setData('Typing some stuff')
+    })
 
-    //Trouble with selecting tags setcion
-    //cy.get("#edit-field-tags-wrapper").click();
-    //cy.get("Login").click();
-    //cy.get("#edit-title-0-value").type("http://example-0.com");
+    // Tags field
+    cy.get('.tags summary').click()
+    // tid 733 is the tag "access-account"
+    cy.get('.tags-select[data-tid=733]').click()
 
     //Preffered Semester Field
     cy.get('[name="field_preferred_semester"]').select("Summer");
 
-    //Save As Field
-    cy.get('[name="moderation_state[0][state]"]').select("Submitted");
+    // Send for Review
+    cy.get('#edit-submit').click();
   });
 });

tests/cypress/cypress/e2e/accessmatch/match-services/match-premier-engagement-form.cy.js

@@ -14,24 +14,26 @@ describe("Authenticated user tests the MATCH Premier Engagement Form", () => {
     cy.visit("/node/add/match_engagement?type=premier");
 
     //Title Field
-    cy.get("#edit-title-0-value").type("http://example-0.com");
+    cy.get("#edit-title-0-value").type("Title for a Test Premier Engagement");
 
     //Institution Field
     cy.get("#edit-field-institution-0-value").type("Example University");
 
-    //Description field does not actually type anything in (Below two lines are for the description field)
-    // cy.get("p").type("Testing");
-    // cy.get(".ck-editor__main > .ck").type("Testing");
+    //Description field
+    cy.get('.field--name-body .ck-content').then(el => {
+      const editor = el[0].ckeditorInstance
+      editor.setData('Typing some stuff')
+    })
 
-    //Trouble with selecting tags setcion
-    //cy.get("#edit-field-tags-wrapper").click();
-    //cy.get("Login").click();
-    //cy.get("#edit-title-0-value").type("http://example-0.com");
+    // Tags field
+    cy.get('.tags summary').click()
+    // tid 733 is the tag "access-account"
+    cy.get('.tags-select[data-tid=733]').click()
 
     //Preffered Semester Field
     cy.get('[name="field_preferred_semester"]').select("Summer");
 
-    //Save As Field
-    cy.get('[name="moderation_state[0][state]"]').select("Submitted");
+    // Send for Review
+    cy.get('#edit-submit').click();
   });
 });

tests/cypress/cypress/e2e/accessmatch/tags/tag-individual-engagements.cy.js

@@ -55,17 +55,17 @@ describe("Verify a tag's page list of engagements", () => {
       cy.get(".tags").click();
       // select community-outreach tag
       cy.get(".tags-select").contains("community-outreach").click();
+      // Send for Review
       cy.get('#edit-moderation-state-0-state').select('Submitted');
       cy.get('#edit-submit').click();
-      cy.contains('Thank you for submitting your project.');
+      cy.contains('Thank you for sending your project for review.');
 
       // update to received
       cy.get('.tabs')
         .contains('Edit')
         .click();
       cy.get('#edit-moderation-state-0-state').select('Received');
       cy.get('#edit-submit').click();
-      cy.contains('has been updated.');
 
       // update to In Review
       cy.get('.tabs')

web/sites/default/config/default/core.entity_form_display.node.match_engagement.default.yml

@@ -92,6 +92,13 @@ third_party_settings:
         open: false
         description: ''
         required_fields: true
+        element: div
+        show_label: false
+        label_element: h3
+        label_element_classes: ''
+        attributes: ''
+        effect: none
+        speed: fast
     group_milestone_2:
       children:
         - field_milestone_description_2
@@ -246,11 +253,12 @@ third_party_settings:
       region: content
       parent_name: ''
       weight: 19
-      format_type: fieldset
+      format_type: details
       format_settings:
         classes: ''
         show_empty_fields: false
         id: milestones_fieldset
+        open: true
         description: ''
         required_fields: false
     group_first_milestone_fs:
@@ -262,12 +270,13 @@ third_party_settings:
       region: content
       parent_name: group_milestones_set
       weight: 41
-      format_type: fieldset
+      format_type: details
       format_settings:
         classes: ''
         show_empty_fields: false
         id: milestone1_fieldset
-        description: 'Please enter as many as five milestones for this engagement.  Only the first milestone is required.'
+        open: true
+        description: "<p>Please enter as many as five milestones for this engagement.  Only the first milestone is required.</p>\r\n\r\n<p>Example of a first milestone (see more example milestones in the <a href=\"/match/overview\">MATCH FAQ</a>):</p>\r\n\r\n<ul>\r\n<li>Ramp Up</li>\r\n<li>Discuss meeting schedules (weekly, monthly, etc.)</li>\r\n<li>Tutorials (Intro to GPU computing)</li>\r\n<li>Jetstream accounts setup, access/navigation</li>\r\n<li>Test run ice sheet flow simulations on GPUs, view results</li>\r\n</ul>"
         required_fields: true
 id: node.match_engagement.default
 targetEntityType: node

web/sites/default/config/default/node.type.match_engagement.yml

@@ -13,5 +13,5 @@ type: match_engagement
 description: ''
 help: ''
 new_revision: true
-preview_mode: 1
+preview_mode: 0
 display_submitted: false