Fix designSelect for french page + more tests

_includes/form/presets/selectDesign.html

@@ -2,15 +2,15 @@
 {%- assign group = "select" -%}
 {%- assign design_arr = "" | split: ',' -%}
 {%- for design in site.data.design -%}
-    {%- assign design_arr = design_arr | push: design[1].name[page.lang] -%}
+    {%- assign design_arr = design_arr | push: design[1] -%}
 {%- endfor %}
 {%- assign design_arr = design_arr | sort_natural -%}
 <div class="form-group">
   {% include form/components/label-group.html id=include.id title=title group=group param=site.data.forms.param.required_false %}
   <select class="form-control" id="{{ title }}{{ group }}" name="{{ title }}{{ group }}">
     <option value="">&nbsp;</option>
     {%- for design in design_arr -%}
-      <option value="{{ design | slugify }}">{{ design }}</option>
+      <option value="{{ design.name.en | slugify }}">{{ design.name[page.lang] }}</option>
     {%- endfor -%}
   </select>
 </div>

assets/js/src/designForm.js

@@ -394,7 +394,7 @@ function addValueToFieldsDesign(obj) {
   $('#enhomepageURL').val(obj.homepageURL.en);
   $('#frhomepageURL').val(obj.homepageURL.fr);
   if (obj.designStatus) {
-    $('#designStatus').val(obj.designStatus);
+    $('#designStatus').val(obj.designStatus.en);
   }
   fillTypeFields(obj.designTypes);
   fillLicenceField(obj.licences);

assets/js/src/designType.js

@@ -95,6 +95,7 @@ function fillTypeFields(designTypes) {
     }
     $('#designType' + id).val(designType.type.en);
   });
+
 }
 
 function addType(index) {

cypress/integration/unit-tests/open-design/designType.spec.js

@@ -3,15 +3,38 @@
 
 context('Open Design Form', () => {
 
-before(() => {
-        cy.visit('http://localhost:4000/ore-ero/en/open-design-form.html');
-});
 
 it('Loads the script', () => {
-    cy.window().should('have.property', 'designType');
+  cy.visit('http://localhost:4000/ore-ero/en/open-design-form.html');
+  cy.window().should('have.property', 'designType');
+  });
+
+// it ('should reset newType input fields when resetType method is called', () => {
+//     cy.visit('http://localhost:4000/ore-ero/en/open-design-form.html');
+//     cy.window().get('#newTypeButton').click();
+//     cy.window().get('#ennewType').type('Test');
+//     cy.window().invoke('resetType', '');
+//     cy.window().get('#ennewType').should('be.equal', ''); 
+//   });
+
+it ('New type button should make new type field appear if hidden and both new type button and remove new type button should hide it if shown', () => {
+  cy.visit('http://localhost:4000/ore-ero/en/open-design-form.html');
+  cy.window().get('#newTypeButton').click();
+  cy.window().get('#newType').should('be.visible');
+  cy.window().get('#newTypeButton').click();
+  cy.window().get('#newType').should('be.hidden');
+  cy.window().get('#newTypeButton').click();
+  cy.window().get('#cancelnewTypeButton').click();
+  cy.window().get('#newType').should('be.hidden');
+  });
+
+it ('newType button and designType select should return the other to default state when clicked/changed', () => {
+  cy.visit('http://localhost:4000/ore-ero/en/open-design-form.html');
+  cy.window().get('#newTypeButton').click();
+  cy.window().get('#designType').select('Application');
+  cy.window().get('#newType').should('be.hidden');  
+  cy.window().get('#newTypeButton').click();
+  cy.window().get('#designType').children().first().should('be.selected');  
   });
 
-it ('should reset newType input fields when resetType method is called', () => {    
-
-});
 });