Merge branch 'MDL-48947_master-dnd-span' of git://github.com/dmonllao/moodle

course/format/topics/format.js

@@ -74,7 +74,8 @@ M.course.format.process_sections = function(Y, sectionlist, response, sectionfro
 
         for (var i = sectionfrom; i <= sectionto; i++) {
             // Update section title.
-            sectionlist.item(i).all('.'+CSS.SECTIONNAME).setContent(response.sectiontitles[i]);
+            var content = Y.Node.create('<span>' + response.sectiontitles[i] + '</span>');
+            sectionlist.item(i).all('.'+CSS.SECTIONNAME).setHTML(content);
             // Update move icon.
             ele = sectionlist.item(i).one(SELECTORS.SECTIONLEFTSIDE);
             str = ele.getAttribute('alt');

course/format/upgrade.txt

@@ -5,6 +5,8 @@ Overview of this plugin type at http://docs.moodle.org/dev/Course_formats
 === 3.0 ===
 * Course formats should now use section_edit_control_items and use the returned array of controls items and their attributes to create a
   renderable menu or array of links.  Plugin calls to section_edit_controls will now include the section edit control in the returned array.
+* The section name is now wrapped in a new span (.sectionname > span), process_sections method in format.js should be updated so .sectionname
+  DOM node's wraps the section title in a span. You can look at how to implement the change in course/format/topics/format.js or MDL-48947.
 
 === 2.9 ===
 * Course formats may support deleting sections, see MDL-10405 for more details.

course/format/weeks/format.js

@@ -74,7 +74,8 @@ M.course.format.process_sections = function(Y, sectionlist, response, sectionfro
 
         for (var i = sectionfrom; i <= sectionto; i++) {
             // Update section title.
-            sectionlist.item(i).all('.'+CSS.SECTIONNAME).setContent(response.sectiontitles[i]);
+            var content = Y.Node.create('<span>' + response.sectiontitles[i] + '</span>');
+            sectionlist.item(i).all('.'+CSS.SECTIONNAME).setHTML(content);
 
             // Update move icon.
             ele = sectionlist.item(i).one(SELECTORS.SECTIONLEFTSIDE);

question/type/ddimageortext/tests/behat/add.feature

@@ -18,7 +18,7 @@ Feature: Test creating a drag and drop onto image question
     And I follow "Course 1"
     And I navigate to "Question bank" node in "Course administration"
 
-  @javascript
+  @javascript @_file_upload
   Scenario: Create a drag and drop onto image question
     When I press "Create a new question ..."
     And I set the field "Drag and drop onto image" to "1"

question/type/ddmarker/tests/behat/add.feature

@@ -18,7 +18,7 @@ Feature: Test creating a drag and drop markers question
     And I follow "Course 1"
     And I navigate to "Question bank" node in "Course administration"
 
-  @javascript
+  @javascript @_file_upload
   Scenario: Create a drag and drop markers question
     When I press "Create a new question ..."
     And I set the field "Drag and drop markers" to "1"

question/type/gapselect/tests/behat/import_test.feature

@@ -17,7 +17,7 @@ Feature: Import and export select missing words questions
     And I log in as "teacher1"
     And I follow "Course 1"
 
-  @javascript
+  @javascript @_file_upload
   Scenario: Import and export select missing words questions
     # Import sample file.
     When I navigate to "Import" node in "Course administration > Question bank"