From 67e721f0dbd95b39e1f6526fc4158b339761f729 Mon Sep 17 00:00:00 2001 From: Joan Date: Wed, 12 Dec 2018 15:18:21 +0100 Subject: [PATCH 1/5] test jenkins --- client/core/src/components/textarea/textarea.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/core/src/components/textarea/textarea.html b/client/core/src/components/textarea/textarea.html index 9bd419e55..6efe39f7a 100644 --- a/client/core/src/components/textarea/textarea.html +++ b/client/core/src/components/textarea/textarea.html @@ -6,4 +6,4 @@ ng-model="$ctrl.model"> - \ No newline at end of file + From d72ba1ce8f9d0a5d57932971921d7bda73850270 Mon Sep 17 00:00:00 2001 From: Joan Date: Thu, 13 Dec 2018 09:16:07 +0100 Subject: [PATCH 2/5] hook testing --- services/db/install/boot.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/db/install/boot.sh b/services/db/install/boot.sh index e63215174..46f323d6d 100644 --- a/services/db/install/boot.sh +++ b/services/db/install/boot.sh @@ -29,4 +29,4 @@ else cp -R /var/lib/mysql /data echo "[INFO] -> Dumped database" -fi \ No newline at end of file +fi From 3e67240858832f8d1b3e467d205d9f9ceef15e00 Mon Sep 17 00:00:00 2001 From: Joan Date: Thu, 13 Dec 2018 09:19:25 +0100 Subject: [PATCH 3/5] hook test --- services/db/install/boot.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/db/install/boot.sh b/services/db/install/boot.sh index 46f323d6d..e63215174 100644 --- a/services/db/install/boot.sh +++ b/services/db/install/boot.sh @@ -29,4 +29,4 @@ else cp -R /var/lib/mysql /data echo "[INFO] -> Dumped database" -fi +fi \ No newline at end of file From dc43a8bced07964ea8b4eb4b6612422b0f90e8e5 Mon Sep 17 00:00:00 2001 From: Carlos Jimenez <=> Date: Thu, 13 Dec 2018 11:35:13 +0100 Subject: [PATCH 4/5] corrected small typos --- e2e/paths/item-module/06_create_item_botanical.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e2e/paths/item-module/06_create_item_botanical.spec.js b/e2e/paths/item-module/06_create_item_botanical.spec.js index 5ba0eb653..c3790d287 100644 --- a/e2e/paths/item-module/06_create_item_botanical.spec.js +++ b/e2e/paths/item-module/06_create_item_botanical.spec.js @@ -11,7 +11,7 @@ describe('Item Create botanical path', () => { .accessToSection('item.card.botanical'); }); - it(`should create a new botanical for the item with id Mjolnir`, async () => { + it(`should create a new botanical for the item Mjolnir`, async () => { const result = await nightmare .type(selectors.itemBotanical.botanicalInput, 'Cicuta maculata') .waitToClick(selectors.itemBotanical.genusSelect) From 19b533aff0c40744ea1cbb3d5db9ee24b2e65bca Mon Sep 17 00:00:00 2001 From: Carlos Jimenez <=> Date: Thu, 13 Dec 2018 12:01:33 +0100 Subject: [PATCH 5/5] added wait to avoid extensions to break test run --- e2e/paths/item-module/02_edit_item_basic_data.spec.js | 1 + e2e/paths/item-module/06_create_item_botanical.spec.js | 1 + 2 files changed, 2 insertions(+) diff --git a/e2e/paths/item-module/02_edit_item_basic_data.spec.js b/e2e/paths/item-module/02_edit_item_basic_data.spec.js index ca108ac40..3cd383115 100644 --- a/e2e/paths/item-module/02_edit_item_basic_data.spec.js +++ b/e2e/paths/item-module/02_edit_item_basic_data.spec.js @@ -13,6 +13,7 @@ describe('Item Edit basic data path', () => { it(`should edit the item basic data`, async () => { const result = await nightmare + .wait(selectors.itemBasicData.nameInput) .clearInput(selectors.itemBasicData.nameInput) .type(selectors.itemBasicData.nameInput, 'Rose of Purity') .waitToClick(selectors.itemBasicData.typeSelect) diff --git a/e2e/paths/item-module/06_create_item_botanical.spec.js b/e2e/paths/item-module/06_create_item_botanical.spec.js index c3790d287..d52c877d4 100644 --- a/e2e/paths/item-module/06_create_item_botanical.spec.js +++ b/e2e/paths/item-module/06_create_item_botanical.spec.js @@ -13,6 +13,7 @@ describe('Item Create botanical path', () => { it(`should create a new botanical for the item Mjolnir`, async () => { const result = await nightmare + .wait(selectors.itemBotanical.botanicalInput) .type(selectors.itemBotanical.botanicalInput, 'Cicuta maculata') .waitToClick(selectors.itemBotanical.genusSelect) .waitToClick(selectors.itemBotanical.genusSelectOptionOne)