Merge branch '3.x' into glob-backward-compitibilty

Author: kobenguyent

lib/container.js

@@ -162,18 +162,18 @@ class Container {
    * @param {Object<string, *>} newSupport
    * @param {Object<string, *>} newPlugins
    */
-  static clear(newHelpers, newSupport, newPlugins) {
-    container.helpers = newHelpers || {}
+  static clear(newHelpers = {}, newSupport = {}, newPlugins = {}) {
+    container.helpers = newHelpers
     container.translation = loadTranslation()
-    container.proxySupport = createSupportObjects(newSupport || {})
-    container.plugins = newPlugins || {}
+    container.proxySupport = createSupportObjects(newSupport)
+    container.plugins = newPlugins
     asyncHelperPromise = Promise.resolve()
     store.actor = null
     debug('container cleared')
   }
 
   /**
-   * @param {Function} fn
+   * @param {Function|null} fn
    * @returns {Promise<void>}
    */
   static async started(fn = null) {

lib/mocha/gherkin.js

@@ -107,7 +107,7 @@ module.exports = (text, file) => {
       )
       continue
     }
-    if (child.scenario && (currentLanguage ? child.scenario.keyword === currentLanguage.contexts.ScenarioOutline : child.scenario.keyword === 'Scenario Outline')) {
+    if (child.scenario && (currentLanguage ? currentLanguage.contexts.ScenarioOutline.includes(child.scenario.keyword) : child.scenario.keyword === 'Scenario Outline')) {
       for (const examples of child.scenario.examples) {
         const fields = examples.tableHeader.cells.map(c => c.value)
         for (const example of examples.tableBody) {