From 2c376776351b850c1323c7c740c1cd00961f6dd2 Mon Sep 17 00:00:00 2001 From: Andrew Nicols Date: Mon, 29 Jun 2020 14:16:23 +0800 Subject: [PATCH 1/2] MDL-69160 behat: Add form field setter step --- lib/tests/behat/behat_forms.php | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/lib/tests/behat/behat_forms.php b/lib/tests/behat/behat_forms.php index d81686e081b..2532f943175 100644 --- a/lib/tests/behat/behat_forms.php +++ b/lib/tests/behat/behat_forms.php @@ -28,10 +28,9 @@ require_once(__DIR__ . '/../../../lib/behat/behat_base.php'); require_once(__DIR__ . '/../../../lib/behat/behat_field_manager.php'); -use Behat\Gherkin\Node\TableNode as TableNode, - Behat\Gherkin\Node\PyStringNode as PyStringNode, - Behat\Mink\Exception\ExpectationException as ExpectationException, - Behat\Mink\Exception\ElementNotFoundException as ElementNotFoundException; +use Behat\Gherkin\Node\{TableNode, PyStringNode}; +use Behat\Mink\Element\NodeElement; +use Behat\Mink\Exception\{ElementNotFoundException, ExpectationException}; /** * Forms-related steps definitions. @@ -286,10 +285,7 @@ class behat_forms extends behat_base { * @return void */ public function i_set_the_field_with_xpath_to($fieldxpath, $value) { - $fieldnode = $this->find('xpath', $fieldxpath); - $this->ensure_node_is_visible($fieldnode); - $field = behat_field_manager::get_form_field($fieldnode, $this->getSession()); - $field->set_value($value); + $this->set_field_node_value($this->find('xpath', $fieldxpath), $value); } /** @@ -627,13 +623,24 @@ class behat_forms extends behat_base { * @return void */ protected function set_field_value($fieldlocator, $value) { - // We delegate to behat_form_field class, it will // guess the type properly as it is a select tag. $field = behat_field_manager::get_form_field_from_label($fieldlocator, $this); $field->set_value($value); } + /** + * Generic field setter to be used by chainable steps. + * + * @param NodeElement $fieldnode + * @param string $value + */ + public function set_field_node_value(NodeElement $fieldnode, string $value): void { + $this->ensure_node_is_visible($fieldnode); + $field = behat_field_manager::get_form_field($fieldnode, $this->getSession()); + $field->set_value($value); + } + /** * Generic field setter. * @@ -646,12 +653,8 @@ class behat_forms extends behat_base { * @param string $containerelement Element we look in */ protected function set_field_value_in_container($fieldlocator, $value, $containerselectortype, $containerelement) { - $node = $this->get_node_in_container('field', $fieldlocator, $containerselectortype, $containerelement); - // We delegate to behat_form_field class, it will - // guess the type properly as it is a select tag. - $field = behat_field_manager::get_form_field($node, $this->getSession()); - $field->set_value($value); + $this->set_field_node_value($node, $value); } /** From b0627a1a114d58f54690a4e11ab177d02a8e2b71 Mon Sep 17 00:00:00 2001 From: Andrew Nicols Date: Mon, 29 Jun 2020 11:23:34 +0800 Subject: [PATCH 2/2] MDL-69160 workshop: Ensure steps are chained --- .../behat/behat_workshopallocation_manual.php | 25 +++++++++++-------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/mod/workshop/allocation/manual/tests/behat/behat_workshopallocation_manual.php b/mod/workshop/allocation/manual/tests/behat/behat_workshopallocation_manual.php index b69913b580f..668d27fc48b 100644 --- a/mod/workshop/allocation/manual/tests/behat/behat_workshopallocation_manual.php +++ b/mod/workshop/allocation/manual/tests/behat/behat_workshopallocation_manual.php @@ -63,20 +63,19 @@ class behat_workshopallocation_manual extends behat_base { $selectnode = $this->find('xpath', $xpathselect); } - $selectformfield = behat_field_manager::get_form_field($selectnode, $this->getSession()); - $selectformfield->set_value($reviewername); + $this->execute('behat_forms::set_field_node_value', [ + $selectnode, + $reviewername, + ]); if (!$this->running_javascript()) { // Without Javascript we need to press the "Go" button. $go = behat_context_helper::escape(get_string('go')); $this->find('xpath', $xpathtd."/descendant::input[@value=$go]")->click(); - } else { - // With Javascript we just wait for the page to reload. - $this->getSession()->wait(behat_base::get_extended_timeout(), self::PAGE_READY_JS); } + // Check the success string to appear. - $allocatedtext = behat_context_helper::escape( - get_string('allocationadded', 'workshopallocation_manual')); + $allocatedtext = behat_context_helper::escape(get_string('allocationadded', 'workshopallocation_manual')); $this->find('xpath', "//*[contains(.,$allocatedtext)]"); } @@ -88,8 +87,7 @@ class behat_workshopallocation_manual extends behat_base { * @param TableNode $table should have one column with title 'Reviewer' and another with title 'Participant' (or 'Reviewee') */ public function i_allocate_submissions_in_workshop_as($workshopname, TableNode $table) { - - $this->find_link($workshopname)->click(); + $this->execute('behat_general::i_click_on', [$workshopname, 'link']); $this->execute('behat_navigation::i_navigate_to_in_current_page_administration', get_string('allocate', 'workshop')); $rows = $table->getRows(); $reviewer = $participant = null; @@ -108,8 +106,15 @@ class behat_workshopallocation_manual extends behat_base { if ($participant === null) { throw new ElementTextException('Neither "Participant" nor "Reviewee" column could be located', $this->getSession()); } + for ($i = 1; $i < count($rows); $i++) { - $this->i_add_a_reviewer_for_workshop_participant($rows[$i][$reviewer], $rows[$i][$participant]); + $this->execute( + 'behat_workshopallocation_manual::i_add_a_reviewer_for_workshop_participant', + [ + $rows[$i][$reviewer], + $rows[$i][$participant], + ] + ); } } }