From 2c92866969f32f3f5003167b8e5c34d2b1040fd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Grand?= <francois.grand@inrae.fr>
Date: Tue, 23 May 2023 13:59:14 +0200
Subject: [PATCH] fix(e2e): merge conflicts/failing tests

refs #620
---
 e2e/macrorugo-remous.e2e-spec.ts          | 2 +-
 e2e/pab-cloisons-empty-fields.e2e-spec.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/e2e/macrorugo-remous.e2e-spec.ts b/e2e/macrorugo-remous.e2e-spec.ts
index 9eedf697..14815aa4 100644
--- a/e2e/macrorugo-remous.e2e-spec.ts
+++ b/e2e/macrorugo-remous.e2e-spec.ts
@@ -5,7 +5,7 @@ import { browser, $, $$, expect } from '@wdio/globals'
 import { isElementDisplayed, openCalculator } from "./util.po";
 import { CalculatorPage } from "./calculator.po";
 
-//TODO à réactiver après fusion de #618 dans devel
+//TODO à réactiver après fusion de nghyd#609 jalhyd#325 dans devel
 xdescribe("MacroRugoRemous - ", () => {
     let prefPage: PreferencesPage;
     let listPage: ListPage;
diff --git a/e2e/pab-cloisons-empty-fields.e2e-spec.ts b/e2e/pab-cloisons-empty-fields.e2e-spec.ts
index afe34020..d1443fb7 100644
--- a/e2e/pab-cloisons-empty-fields.e2e-spec.ts
+++ b/e2e/pab-cloisons-empty-fields.e2e-spec.ts
@@ -65,7 +65,7 @@ describe("ngHyd - check the cross walls calculator has empty fields - ", () => {
         // click "generate PAB" button
         const genButton = await calcPage.getGeneratePabButton();
         await genButton.click();
-        await browser.pause(1000);
+        await browser.pause(2000);
 
         await calcPage.checkEmptyOrFilledFields(["generatePabNbBassins"], [true]);
     });
-- 
GitLab