diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 324cebc5f..4d2059bea 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -39,4 +39,10 @@ jobs:
- name: Run HTML5 Validator
run: html5validator --root _site/
+
+ - name: Serve with jekyll
+ run: bundle exec jekyll serve
+
+ - name: Cypress
+ run: npm run cypress
\ No newline at end of file
diff --git a/_includes/form/presets/selectDesign.html b/_includes/form/presets/selectDesign.html
index e413b8592..14a6ef9c2 100644
--- a/_includes/form/presets/selectDesign.html
+++ b/_includes/form/presets/selectDesign.html
@@ -2,7 +2,7 @@
{%- 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 -%}
@@ -10,7 +10,7 @@
{%- for design in design_arr -%}
- {{ design }}
+ {{ design.name[page.lang] }}
{%- endfor -%}
diff --git a/_pages/en/open-design.html b/_pages/en/open-design.html
index ad86f05e6..52b18dc4f 100644
--- a/_pages/en/open-design.html
+++ b/_pages/en/open-design.html
@@ -5,7 +5,7 @@
permalink: /en/open-design.html
---
-Open Design Resources
+Open Designs
Open design refers to a design for a physical or software product released under a license granting anyone permission to use, modify or redistribute it.
Search the catalog for open design resource by different levels of Canadian public .
You may also add a resource or update its data using using the Open Design Resource Form .
diff --git a/_pages/fr/design-libre.html b/_pages/fr/design-libre.html
index 87f199d8b..bc02ecfb7 100644
--- a/_pages/fr/design-libre.html
+++ b/_pages/fr/design-libre.html
@@ -5,7 +5,7 @@
permalink: /fr/design-libre.html
---
-Design libres
+Designs Libres
Un design libre est un design, que ce soit pour un produit physique ou un logiciel, dont le développement suit un processus semblable au code et logiciel libre. La licence du design permet d’y accéder librement, de créer des travaux dérivés, de modifier le design et de le redistribuer.
Consultez la liste des designs libres utilisés par les administrations publiques canadiennes.
Vous pouvez ajouter un design ou modifier ses informations en utilisant le Formulaire de Design Libre .
diff --git a/assets/js/src/designForm.js b/assets/js/src/designForm.js
index 1f1f7cf35..55badce8d 100644
--- a/assets/js/src/designForm.js
+++ b/assets/js/src/designForm.js
@@ -11,6 +11,8 @@
const designSelect = $('.page-designForm #nameselect');
const adminSelect = $('.page-designForm #adminCode');
+const URL = document.defaultView.location.origin +
+(document.defaultView.location.protocol == "http:" ? "/ore-ero" : "");
$(document).ready(function () {
$('#prbotSubmitdesignForm').click(function () {
@@ -408,7 +410,7 @@ function getConfigNew(designObject, file, ProjectName) {
function selectDesign() {
let value = designSelect.val();
- $.getJSON('../design.json', function (result) {
+ $.getJSON(URL + '/design.json', function (result) {
if (result[value]) {
addValueToFieldsDesign(result[value]);
$('#adminCode').focus();
@@ -458,7 +460,7 @@ function resetFieldsDesign() {
function selectAdmin() {
let design = designSelect.val();
let administration = adminSelect.val();
- $.getJSON('../design.json', function (result) {
+ $.getJSON(URL + '/design.json', function (result) {
if (result[design]) {
for (let i = 0; i < result[design].administrations.length; i++) {
if (result[design].administrations[i].adminCode == administration) {
diff --git a/assets/js/src/designType.js b/assets/js/src/designType.js
index e8c958d75..8f1dacede 100644
--- a/assets/js/src/designType.js
+++ b/assets/js/src/designType.js
@@ -93,6 +93,7 @@ function fillTypeFields(designTypes) {
}
$('#designType' + id).val(designType.type.en);
});
+
}
function addType(index) {
diff --git a/assets/js/src/validation.js b/assets/js/src/validation.js
index 16f2f6ec3..92c516df3 100644
--- a/assets/js/src/validation.js
+++ b/assets/js/src/validation.js
@@ -74,3 +74,7 @@ function submitInit() {
}
return valid;
}
+//Allows use of the function for testing so there isn't any real submission happening
+window.submit_init = {
+ submitInit,
+};
\ No newline at end of file
diff --git a/cypress/integration/unit-tests/licences.spec.js b/cypress/integration/unit-tests/licences.spec.js
new file mode 100644
index 000000000..ecf88b116
--- /dev/null
+++ b/cypress/integration/unit-tests/licences.spec.js
@@ -0,0 +1,18 @@
+context('Licences', () => {
+ it ('addMorelicences button should add an element to the list and show the removeMorelicences button', () => {
+ cy.visit('http://localhost:4000/ore-ero/en/open-design-form.html');
+ cy.get('#addMorelicences').find('.btn-tabs-more').click();
+ cy.get('#addMorelicences').find('ul > li').should('have.length', 2);
+ cy.get('#addMorelicences').find('.btn-tabs-more-remove').should('be.visible');
+ });
+ it ('removeMorelicences button should remove an item from the list and disappear', () => {
+ cy.get('#addMorelicences').find('.btn-tabs-more-remove').click();
+ cy.get('#addMorelicences').find('ul > li').should('have.length', 1);
+ cy.get('#addMorelicences').find('.btn-tabs-more-remove').should('be.hidden');
+ });
+
+ it ('There should be available licence options', () => {
+ cy.visit('http://localhost:4000/ore-ero/en/open-design-form.html');
+ cy.get('#licencesspdxID').children().should('have.length.greaterThan', 1);
+ });
+});
\ No newline at end of file
diff --git a/cypress/integration/unit-tests/open-design/design-form.spec.js b/cypress/integration/unit-tests/open-design/design-form.spec.js
new file mode 100644
index 000000000..c31b51687
--- /dev/null
+++ b/cypress/integration/unit-tests/open-design/design-form.spec.js
@@ -0,0 +1,315 @@
+///