Merge branch 'MDL-40992' of git://github.com/timhunt/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 1 Apr 2015 00:00:43 +0000 (08:00 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 1 Apr 2015 00:00:43 +0000 (08:00 +0800)
1  2 
mod/quiz/styles.css
question/behaviour/informationitem/tests/behaviourtype_test.php

diff --combined mod/quiz/styles.css
      text-align: right;
  }
  
+ .path-mod-quiz .mod_quiz-redo_question_button {
+     margin: 0;
+ }
+ .path-mod-quiz input[type="submit"].mod_quiz-redo_question_button {
+     padding: 2px 0.8em;
+     font-size: 1em;
+ }
  #page-mod-quiz-attempt .mod_quiz-blocked_question_warning .que .formulation,
  #page-mod-quiz-review .mod_quiz-blocked_question_warning .que .formulation {
      background: #eee;
@@@ -803,15 -811,6 +811,15 @@@ table.quizreviewsummary td.cell 
  #categoryquestions th.creatorname .sorters {
      font-weight: normal;
      font-size: 0.8em;
 +}
 +#categoryquestions td.modifiername,
 +#categoryquestions td.creatorname {
 +    line-height: 1em;
 +}
 +#categoryquestions td.modifiername span.date,
 +#categoryquestions td.creatorname span.date {
 +    font-weight: normal;
 +    font-size: 0.8em;
  }
  table#categoryquestions {
      width: 100%;
@@@ -37,7 -37,7 +37,7 @@@ require_once(dirname(__FILE__) . '/../.
   * @copyright  2015 The Open University
   * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
   */
 -class qbehaviour_informationitem_type_test extends basic_testcase {
 +class qbehaviour_informationitem_type_testcase extends basic_testcase {
  
      /** @var qbehaviour_informationitem_type */
      protected $behaviourtype;
                  $this->behaviourtype->get_unused_display_options());
      }
  
+     public function test_can_questions_finish_during_the_attempt() {
+         $this->assertFalse($this->behaviourtype->can_questions_finish_during_the_attempt());
+     }
      public function test_adjust_random_guess_score() {
          $this->assertEquals(0, $this->behaviourtype->adjust_random_guess_score(0));
          $this->assertEquals(1, $this->behaviourtype->adjust_random_guess_score(1));