Revert "Fixed issue #18808: Mandatory soft only works once per survey…

… if over multiple pages/groups (#3119)"

This reverts commit 6439cb1.

application/helpers/SurveyRuntimeHelper.php

@@ -546,6 +546,10 @@ public function run($surveyid, $args)
             if (!empty($_SESSION[$this->LEMsessid]['token']) and $this->aSurveyInfo['anonymized'] != 'Y') {
                 $this->aSurveyInfo['hiddenInputs']     .= \CHtml::hiddenField('token', $_SESSION[$this->LEMsessid]['token'], array('id' => 'token'));
             }
+            /* Set sof man to true if it's already in POST */
+            if (App()->request->getPost('mandSoft')) {
+                $this->aSurveyInfo['hiddenInputs']     .= \CHtml::hiddenField('mandSoft', App()->request->getPost('mandSoft'), array('id' => 'mandSoft'));
+            }
         }
 
         // For "clear all" buttons

tests/LimeSurveyWebDriver.php

@@ -4,7 +4,6 @@
 
 use Facebook\WebDriver\Remote\RemoteWebDriver;
 use Facebook\WebDriver\WebDriverBy;
-use Facebook\WebDriver\WebDriverExpectedCondition;
 use Facebook\WebDriver\Exception\NoSuchElementException;
 
 /**
@@ -86,11 +85,7 @@ public function answerTextQuestion($sgqa, $answer)
      */
     public function next()
     {
-        $nextButton = $this->wait(1)->until(
-            WebDriverExpectedCondition::elementToBeClickable(
-                WebDriverBy::id('ls-button-submit')
-            )
-        );
+        $nextButton = $this->findElement(WebDriverBy::id('ls-button-submit'));
         $nextButton->click();
     }