Merge branch 'MDL-38172_27' of git://github.com/jmvedrine/moodle into MOODLE_27_STABLE

This commit is contained in:
Dan Poltawski
2014-10-20 18:28:48 +01:00
2 changed files with 62 additions and 0 deletions
+1
View File
@@ -580,6 +580,7 @@ class mod_lesson_renderer extends plugin_renderer_base {
$attributes['class'] = $class;
}
$output = html_writer::tag('p', $contents, $attributes);
return $output;
}
/**
* Returns HTML to display add_highscores_form
@@ -0,0 +1,61 @@
@mod @mod_lesson
Feature: In a lesson activity, if custom scoring is not enabled, student should see
some informations at the end of lesson: questions answered, correct answers, grade, score
@javascript
Scenario: Informations at end of lesson if custom scoring not enabled
Given the following "users" exist:
| username | firstname | lastname | email |
| teacher1 | Teacher | 1 | teacher1@asd.com |
| student1 | Student | 1 | student1@asd.com |
And the following "courses" exist:
| fullname | shortname | category |
| Course 1 | C1 | 0 |
And the following "course enrolments" exist:
| user | course | role |
| teacher1 | C1 | editingteacher |
| student1 | C1 | student |
And I log in as "teacher1"
And I follow "Course 1"
And I turn editing mode on
And I add a "Lesson" to section "1" and I fill the form with:
| Name | Test lesson name |
| Custom scoring | No |
And I follow "Test lesson name"
And I follow "Add a content page"
And I set the following fields to these values:
| Page title | First page name |
| Page contents | First page contents |
| id_answer_editor_0 | Next page |
| id_jumpto_0 | Next page |
And I press "Save page"
And I set the field "qtype" to "Question"
And I set the field "Select a question type" to "Numerical"
And I press "Add a question page"
And I set the following fields to these values:
| Page title | Hardest question ever |
| Page contents | 1 + 1? |
| id_answer_editor_0 | 2 |
| id_response_editor_0 | Correct answer |
| id_jumpto_0 | Next page |
| id_answer_editor_1 | 1 |
| id_response_editor_1 | Incorrect answer |
| id_jumpto_1 | This page |
And I press "Save page"
And I log out
And I log in as "student1"
And I follow "Course 1"
When I follow "Test lesson name"
Then I should see "First page contents"
And I press "Next page"
And I should see "1 + 1?"
And I set the following fields to these values:
| Your answer | 1 |
And I press "Submit"
And I should see "Incorrect answer"
And I press "Continue"
And I should see "Congratulations - end of lesson reached"
And I should see "Number of questions answered: 1"
And I should see "Number of correct answers: 0"
And I should see "Your score is 0 (out of 1)."
And I should see "Your current grade is 0.0 out of 100"