Skip to content

Commit

Permalink
Merge branch 'MDL-38804_master' of git://github.com/dmonllao/moodle
Browse files Browse the repository at this point in the history
  • Loading branch information
stronk7 committed Apr 1, 2013
2 parents 0f8fd3a + e7a0600 commit cd4c7e9
Show file tree
Hide file tree
Showing 2 changed files with 150 additions and 0 deletions.
97 changes: 97 additions & 0 deletions admin/tests/behat/behat_admin.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
<?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/>.

/**
* Steps definitions related with administration.
*
* @package core
* @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');
require_once(__DIR__ . '/../../../lib/behat/behat_field_manager.php');

use Behat\Gherkin\Node\TableNode as TableNode,
Behat\Mink\Exception\ElementNotFoundException as ElementNotFoundException;

/**
* Site administration level steps definitions.
*
* @package core
* @category test
* @copyright 2013 David Monllaó
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class behat_admin extends behat_base {

/**
* Sets the specified site settings. A table with | Setting label | value | is expected.
*
* @Given /^I set the following administration settings values:$/
* @param TableNode $table
*/
public function i_set_the_following_administration_settings_values(TableNode $table) {

if (!$data = $table->getRowsHash()) {
return;
}

foreach ($data as $label => $value) {

// We expect admin block to be visible, otherwise go to homepage.
if (!$this->getSession()->getPage()->find('css', '.block_settings')) {
$this->getSession()->visit($this->locate_path('/'));
$this->getSession()->wait(self::TIMEOUT, '(document.readyState === "complete")');
}

// Search by label.
$searchbox = $this->find_field('Search in settings');
$searchbox->setValue($label);
$submitsearch = $this->find('css', 'form.adminsearchform input[type=submit]');
$submitsearch->press();

$this->getSession()->wait(self::TIMEOUT, '(document.readyState === "complete")');

// Admin settings does not use the same DOM structure than other moodle forms
// but we also need to use lib/behat/form_field/* to deal with the different moodle form elements.
$exception = new ElementNotFoundException($this->getSession(), '"' . $label . '" administration setting ');
$fieldxpath = "//*[self::input | self::textarea | self::select][not(./@type = 'submit' or ./@type = 'image' or ./@type = 'hidden')]
[@id=//label[contains(normalize-space(string(.)), '" . $label . "')]/@for]";
$fieldnode = $this->find('xpath', $fieldxpath, $exception);
$formfieldtypenode = $this->find('xpath', $fieldxpath . "/ancestor::div[@class='form-setting']
/child::div[contains(concat(' ', @class, ' '), ' form-')]/child::*/parent::div");

// Getting the class which contains the field type.
$classes = explode(' ', $formfieldtypenode->getAttribute('class'));
foreach ($classes as $class) {
if (substr($class, 0, 5) == 'form-') {
$type = substr($class, 5);
}
}

// Instantiating the appropiate field type.
$field = behat_field_manager::get_field_instance($type, $fieldnode, $this->getSession());
$field->set_value($value);

$this->find_button('Save changes')->press();
}
}

}
53 changes: 53 additions & 0 deletions completion/tests/behat/restrict_section_availability.feature
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
@core_completion
Feature: Restrict sections availability through completion conditions
In order to control section's contents access through activities completion
As a moodle teacher
I need to restrict sections availability using different conditions

@javascript
Scenario: Show section greyed-out to students when completion conditions are not satisfied
Given the following "courses" exists:
| fullname | shortname | category |
| Course 1 | C1 | 0 |
And the following "users" exists:
| username | firstname | lastname | email |
| teacher1 | Teacher | Frist | teacher1@asd.com |
| student1 | Student | First | student1@asd.com |
And the following "course enrolments" exists:
| user | course | role |
| teacher1 | C1 | editingteacher |
| student1 | C1 | student |
And I log in as "admin"
And I set the following administration settings values:
| Enable completion tracking | 1 |
| Enable conditional access | 1 |
And I log out
And I log in as "teacher1"
And I follow "Course 1"
And I turn editing mode on
And I follow "Edit settings"
And I fill the moodle form with:
| Completion tracking | Enabled, control via completion and activity settings |
| Completion tracking begins on enrolment | 1 |
And I press "Save changes"
And I add a "Label" to section "1" and I fill the form with:
| Label text | Test label |
| Completion tracking | Students can manually mark the activity as completed |
And I add a "Page" to section "2" and I fill the form with:
| Name | Test page name |
| Description | Test page description |
| Page content | Test page contents |
When I click on "Edit summary" "link" in the "#section-2" "css_element"
And I fill the moodle form with:
| id_conditioncompletiongroup_0_conditionsourcecmid | Test label |
| id_conditioncompletiongroup_0_conditionrequiredcompletion | must be marked complete |
| Before section can be accessed | Show section greyed-out, with restriction information |
And I press "Save changes"
And I log out
And I log in as "student1"
And I follow "Course 1"
Then I should see "Not available until the activity Test label is marked complete."
And I should not see "Test page name"
And I press "Not completed: Test label. Select to mark as complete."
And I should see "Test page name"
And I should not see "Not available until the activity Test label is marked complete."

0 comments on commit cd4c7e9

Please sign in to comment.