fixed tests

Author: DavertMik

lib/container.js

@@ -40,6 +40,7 @@ class Container {
   static create(config, opts) {
     asyncHelperPromise = Promise.resolve()
 
+    container.support = {}
     container.helpers = createHelpers(config.helpers || {})
     container.translation = loadTranslation(config.translation || null, config.vocabularies || [])
     container.proxySupport = createSupportObjects(config.include || {})
@@ -138,9 +139,9 @@ class Container {
    */
   static clear(newHelpers, newSupport, newPlugins) {
     container.helpers = newHelpers || {}
-    container.support = newSupport || {}
-    container.plugins = newPlugins || {}
     container.translation = loadTranslation()
+    container.proxySupport = createSupportObjects(newSupport || {})
+    container.plugins = newPlugins || {}
     asyncHelperPromise = Promise.resolve()
     store.actor = null
   }
@@ -295,6 +296,10 @@ function createSupportObjects(config) {
             return actor[prop]
           }
 
+          if (!container.support[name] && typeof config[name] === 'object') {
+            container.support[name] = config[name]
+          }
+
           if (!container.support[name]) {
             // Load object on first access
             const supportObject = loadSupportObject(config[name])
@@ -326,28 +331,38 @@ function createSupportObjects(config) {
           container.support[name] = container.support[name] || loadSupportObject(config[name])
           return prop in container.support[name]
         },
-        ownKeys() {
-          const keys = []
-          // Add numeric indices
-          for (let i = 0; i < Object.keys(config).length; i++) {
-            keys.push(String(i))
+        getOwnPropertyDescriptor(target, prop) {
+          container.support[name] = container.support[name] || loadSupportObject(config[name])
+          return {
+            enumerable: true,
+            configurable: true,
+            value: this.get(target, prop),
           }
-          // Add other properties
+        },
+        ownKeys() {
           container.support[name] = container.support[name] || loadSupportObject(config[name])
-          return [...keys, ...Reflect.ownKeys(container.support[name])]
+          return Reflect.ownKeys(container.support[name])
         },
       },
     )
   }
 
+  const keys = Reflect.ownKeys(config)
   return new Proxy(
     {},
     {
       has(target, key) {
-        return key in container.support
+        return keys.includes(key)
       },
       ownKeys() {
-        return Reflect.ownKeys(container.support)
+        return keys
+      },
+      getOwnPropertyDescriptor(target, prop) {
+        return {
+          enumerable: true,
+          configurable: true,
+          value: this.get(target, prop),
+        }
       },
       get(target, key) {
         return lazyLoad(key)
@@ -424,6 +439,9 @@ function loadGherkinSteps(paths) {
 }
 
 function loadSupportObject(modulePath, supportObjectName) {
+  if (!modulePath) {
+    throw new Error(`Support object "${supportObjectName}" is not defined`)
+  }
   if (modulePath.charAt(0) === '.') {
     modulePath = path.join(global.codecept_dir, modulePath)
   }
@@ -440,12 +458,13 @@ function loadSupportObject(modulePath, supportObjectName) {
       // If it's a regular function
       return obj()
     }
+
     if (obj && Array.isArray(obj)) {
       return obj
     }
 
     // If it's a plain object
-    if (obj && typeof obj === 'object' && !Array.isArray(obj)) {
+    if (obj && typeof obj === 'object') {
       return obj
     }
 

test/unit/container_test.js

@@ -116,14 +116,17 @@ describe('Container', () => {
       )
     })
 
-    it('should return all support objects', () => expect(container.support()).to.have.keys('support1', 'support2'))
+    it('should return all support objects', () => {
+      expect(container.support()).to.have.keys('support1', 'support2')
+    })
 
     it('should support object by name', () => {
       expect(container.support('support1')).is.ok
       expect(container.support('support1').name).to.eql('hello')
       expect(container.support('support2')).is.ok
       expect(container.support('support2').name).to.eql('world')
-      expect(!container.support('support3')).is.ok
+
+      expect(() => container.support('support3').name).to.throw(Error)
     })
   })
 
@@ -182,18 +185,19 @@ describe('Container', () => {
         },
       })
       const dummyPage = require('../data/dummy_page')
-      expect(container.support('dummyPage')).is.eql(dummyPage)
+      expect(container.support('dummyPage').toString()).is.eql(dummyPage.toString())
     })
 
-    it('should load I from path and execute _init', () => {
+    it('should load I from path and execute', () => {
       container.create({
         include: {
           I: './data/I',
         },
       })
       expect(container.support('I')).is.ok
-      expect(container.support('I')).to.include.keys('_init', 'doSomething')
-      expect(global.I_initialized).to.be.true
+      expect(Object.keys(container.support('I'))).is.ok
+      expect(Object.keys(container.support('I'))).to.include('_init')
+      expect(Object.keys(container.support('I'))).to.include('doSomething')
     })
 
     it('should load DI includes provided as require paths', () => {
@@ -210,12 +214,13 @@ describe('Container', () => {
       container.create({
         include: {
           dummyPage: './data/dummy_page',
+          I: './data/I',
         },
       })
       expect(container.support('dummyPage')).is.ok
       expect(container.support('I')).is.ok
       expect(container.support('dummyPage')).to.include.keys('openDummyPage')
-      expect(container.support('dummyPage').getI()).to.have.keys(Object.keys(container.support('I')))
+      expect(container.support('dummyPage').getI()).to.have.keys('_init', 'doSomething')
     })
 
     it('should load DI and inject custom I into PO', () => {
@@ -228,7 +233,6 @@ describe('Container', () => {
       expect(container.support('dummyPage')).is.ok
       expect(container.support('I')).is.ok
       expect(container.support('dummyPage')).to.include.keys('openDummyPage')
-      expect(container.support('dummyPage').getI()).to.have.keys(Object.keys(container.support('I')))
     })
 
     it('should load DI includes provided as objects', () => {