moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 00:46:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-44534 also fix the mod_quiz behat tests.

Browse source 
They had duplicated code. I refactored.
This commit is contained in:
Tim Hunt 2014-03-12 16:42:01 +00:00 • committed by Eloy Lafuente (stronk7)
parent ced0f98322
commit 2f83d71ccc
3 changed files with 77 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

18
mod/quiz/tests/behat/behat_mod_quiz.php
View file

@ -26,6 +26,7 @@
// NOTE: no MOODLE_INTERNAL test here, this file may be required by behat before including /config.php.
require_once(__DIR__ . '/../../../../lib/behat/behat_base.php');
require_once(__DIR__ . '/../../../../question/tests/behat/behat_question_base.php');
use Behat\Behat\Context\Step\Given as Given,
Behat\Gherkin\Node\TableNode as TableNode;
@ -38,7 +39,7 @@ use Behat\Behat\Context\Step\Given as Given,
* @copyright 2014 Marina Glancy
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class behat_mod_quiz extends behat_base {
class behat_mod_quiz extends behat_question_base {
/**
* Adds a question to the existing quiz with filling the form.
*
@ -47,23 +48,16 @@ class behat_mod_quiz extends behat_base {
* @When /^I add a "(?P<question_type_string>(?:[^"]|\\")*)" question to the "(?P<quiz_name_string>(?:[^"]|\\")*)" quiz with:$/
* @param string $questiontype
* @param string $quizname
* @param TableNode $table with data for filling the add question form
* @param TableNode $questiondata with data for filling the add question form
*/
public function i_add_question_to_the_quiz_with($questiontype, $quizname, TableNode $table) {
$questiontype = $this->escape($questiontype);
public function i_add_question_to_the_quiz_with($questiontype, $quizname, TableNode $questiondata) {
$quizname = $this->escape($quizname);
$editquiz = $this->escape(get_string('editquiz', 'quiz'));
$addaquestion = $this->escape(get_string('addaquestion', 'quiz'));
$next = $this->escape(get_string('next'));
$savechanges = $this->escape(get_string('savechanges'));
return array(
return array_merge(array(
new Given("I follow \"$quizname\""),
new Given("I follow \"$editquiz\""),
new Given("I press \"$addaquestion\""),
new Given("I set the field \"$questiontype\" to \"1\""),
new Given("I press \"$next\""),
new Given("I set the following fields to these values:", $table),
new Given("I press \"$savechanges\"")
);
), $this->finish_adding_question($questiontype, $questiondata));
}
}

21
question/tests/behat/behat_question.php
View file

@ -25,7 +25,7 @@
// NOTE: no MOODLE_INTERNAL test here, this file may be required by behat before including /config.php.
require_once(__DIR__ . '/../../../lib/behat/behat_base.php');
require_once(__DIR__ . '/behat_question_base.php');
use Behat\Behat\Context\Step\Given as Given,
Behat\Gherkin\Node\TableNode as TableNode,
@ -40,30 +40,22 @@ use Behat\Behat\Context\Step\Given as Given,
* @copyright 2013 David Monllaó
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class behat_question extends behat_base {
class behat_question extends behat_question_base {
/**
* Creates a question in the current course questions bank with the provided data. This step can only be used when creating question types composed by a single form.
*
* @Given /^I add a "(?P<question_type_name_string>(?:[^"]|\\")*)" question filling the form with:$/
* @param string $questiontypename The question type name
* @param TableNode $questiondata The data to fill the question type form
* @param TableNode $questiondata The data to fill the question type form.
* @return Given[] the steps.
*/
public function i_add_a_question_filling_the_form_with($questiontypename, TableNode $questiondata) {
// Using xpath literal to avoid quotes problems.
$questiontypename = $this->getSession()->getSelectorsHandler()->xpathLiteral($questiontypename);
$questiontypexpath = "//span[@class='qtypename'][normalize-space(.)=$questiontypename]" .
"/ancestor::div[@class='qtypeoption']/descendant::input";
return array(
return array_merge(array(
new Given('I follow "' . get_string('questionbank', 'question') . '"'),
new Given('I press "' . get_string('createnewquestion', 'question') . '"'),
new Given('I click on "' . $this->escape($questiontypexpath) . '" "xpath_element"'),
new Given('I click on "#chooseqtype_submit" "css_element"'),
new Given('I set the following fields to these values:', $questiondata),
new Given('I press "id_submitbutton"')
);
), $this->finish_adding_question($questiontypename, $questiondata));
}
/**
@ -91,5 +83,4 @@ class behat_question extends behat_base {
"/descendant::div[@class='state'][contains(., $stateliteral)]";
$this->find('xpath', $xpath, $exception);
}
}

65
question/tests/behat/behat_question_base.php Normal file
View file

@ -0,0 +1,65 @@
<?php
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* Behat question-related helper code.
*
* @package core_question
* @category test
* @copyright 2013 David Monllaó
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
// NOTE: no MOODLE_INTERNAL test here, this file may be required by behat before including /config.php.
require_once(__DIR__ . '/../../../lib/behat/behat_base.php');
use Behat\Behat\Context\Step\Given as Given,
Behat\Gherkin\Node\TableNode as TableNode,
Behat\Mink\Exception\ExpectationException as ExpectationException,
Behat\Mink\Exception\ElementNotFoundException as ElementNotFoundException;
/**
* Steps definitions related with the question bank management.
*
* @package core_question
* @category test
* @copyright 2013 David Monllaó
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class behat_question_base extends behat_base {
/**
* Helper used by {@link i_add_a_question_filling_the_form_with()} and
* {@link behat_mod_quiz::i_add_question_to_the_quiz_with to finish creating()}.
*
* @param string $questiontypename The question type name
* @param TableNode $questiondata The data to fill the question type form
* @return Given[] the steps.
*/
protected function finish_adding_question($questiontypename, TableNode $questiondata) {
$questiontypename = $this->getSession()->getSelectorsHandler()->xpathLiteral($questiontypename);
$questiontypexpath = "//span[@class='qtypename'][normalize-space(.)=$questiontypename]" .
"/ancestor::div[@class='qtypeoption']/descendant::input";
return array(
new Given('I click on "' . $this->escape($questiontypexpath) . '" "xpath_element"'),
new Given('I click on "#chooseqtype_submit" "css_element"'),
new Given('I set the following fields to these values:', $questiondata),
new Given('I press "id_submitbutton"')
);
}
}