MDL-70153 qtype_essay: Whitespace/behat fixes

diff --git a/question/type/essay/renderer.php b/question/type/essay/renderer.php
index da13035..2587049 100644 (file)
--- a/question/type/essay/renderer.php
+++ b/question/type/essay/renderer.php
@@ -123,7 +123,11 @@ class qtype_essay_renderer extends qtype_renderer {
 
         $fm = new form_filemanager($pickeroptions);
         $fm->options->maxbytes = get_user_max_upload_file_size(
-                $this->page->context, $CFG->maxbytes, $COURSE->maxbytes, $qa->get_question()->maxbytes);
+            $this->page->context,
+            $CFG->maxbytes,
+            $COURSE->maxbytes,
+            $qa->get_question()->maxbytes
+        );
         $filesrenderer = $this->page->get_renderer('core', 'files');
 
         $text = '';

diff --git a/question/type/essay/tests/behat/max_file_size.feature b/question/type/essay/tests/behat/max_file_size.feature
index 0ac3052..6f2f75b 100644 (file)
--- a/question/type/essay/tests/behat/max_file_size.feature
+++ b/question/type/essay/tests/behat/max_file_size.feature
@@ -20,7 +20,7 @@ I need to choose the appropriate maxbytes for attachments
       | questioncategory | qtype | name          | template         | attachments | maxbytes |
       | Test questions   | essay | essay-1-512KB | editor           | 1           | 524288   |
       | Test questions   | essay | essay-1-max   | editor           | 1           | 0        |
-    Given I log in as "teacher1"
+    And I log in as "teacher1"
     And I am on "Course 1" course homepage
     And I navigate to "Question bank" in current page administration
 
@@ -28,7 +28,7 @@ I need to choose the appropriate maxbytes for attachments
   Scenario: Preview an Essay question and see the allowed maximum file sizes and number of attachments.
     When I choose "Preview" action for "essay-1-512KB" in the question bank
     And I switch to "questionpreview" window
-    And I should see "Please write a story about a frog."
+    Then I should see "Please write a story about a frog."
     And I should see "Maximum file size: 512KB, maximum number of files: 1"
     And I switch to the main window
 
@@ -36,6 +36,6 @@ I need to choose the appropriate maxbytes for attachments
   Scenario: Preview an Essay question with Course upload limit and see the allowed maximum file size.
     When I choose "Preview" action for "essay-1-max" in the question bank
     And I switch to "questionpreview" window
-    And I should see "Please write a story about a frog."
+    Then I should see "Please write a story about a frog."
     And I should see "Maximum file size: 1MB, maximum number of files: 1"
     And I switch to the main window