Merge pull request #289 from mucsi96/development

Release 8.2.2

Author: Igor Muchychka

lib/cucumber-api.js

@@ -7,7 +7,6 @@ const Cucumber = {
   Cli: require('cucumber/lib/cli').default,
   TestCaseRunner: require('cucumber/lib/runtime/test_case_runner').default,
   UserCodeRunner: require('cucumber/lib/user_code_runner').default,
-  Attachment: require('cucumber/lib/runtime/attachment_manager/attachment').default,
   statuses: require('cucumber/lib/status').default
 }
 

lib/index.js

@@ -15,22 +15,30 @@ module.exports = function (providedOptions) {
   runner.run(options)
 }
 
-function getClientResolver (pages) {
+function getPageProxy (subPages) {
+  return new Proxy(() => getClientProxy(subPages), {
+    get: (target, pageName) => getPageProxy(subPages.concat([pageName]))
+  })
+}
+
+function getClientProxy (subPages) {
   return new Proxy({}, {
     get: (target, name) => {
       if (name !== 'page') {
-        return pages.reduce((api, pageName) => {
-          return api.page[pageName]()
-        }, runner.nightwatchApi.getClientApi())[name]
-      }
+        const api = runner.nightwatchApi.getClientApi()
 
-      return new Proxy({}, {
-        get: (target, pageName) => {
-          return getClientResolver.bind(null, pages.concat([pageName]))
+        if (!subPages.length) {
+          return api[name]
         }
-      })
+
+        return subPages.reduce((api, pageName) => {
+          return api[pageName]
+        }, api.page)()[name]
+      }
+
+      return getPageProxy([])
     }
   })
 }
 
-module.exports.client = getClientResolver([])
+module.exports.client = getClientProxy([])