selenium-webdriver 3.4.0 → 3.5.0

package/lib/test/data/key_logger.html

@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+    <title>Testing Key Events</title>
+    <script type="text/javascript">
+        function appendMessage(message) {
+            document.getElementById('resultParagraph').innerHTML += message + " ";
+        }
+    </script>
+</head>
+<body>
+<div id="resultContainer" height="30">&nbsp;
+  <div id="result" style="width:300;height:60">
+    <p id="resultParagraph">&nbsp;</p>
+  </div>
+</div>
+                                                                                         
+<div>
+  <form action="resultPage.html" id="on-form">
+    <input id="theworks"
+           onfocus="appendMessage('focus')"
+           onkeydown="appendMessage('keydown')"
+           onkeypress="appendMessage('keypress')"
+           onkeyup="appendMessage('keyup')"
+           onblur="appendMessage('blur')"
+           onchange="appendMessage('change')"
+           />
+  </form>
+</div>
+</body>
+</html>
+
+

package/lib/test/data/single_text_input.html

@@ -0,0 +1,12 @@
+<html>
+<head>
+    <title>BasicKeyboardInterfaceTest</title>
+</head>
+<body>
+<form action="#">
+    <input type="text" id="textInput" />
+</form>
+</body>
+</html>
+
+

package/lib/test/index.js

@@ -31,9 +31,6 @@ var build = require('./build'),
     fileserver = require('./fileserver');
 
 
-const LEGACY_FIREFOX = 'legacy-' + webdriver.Browser.FIREFOX;
-
-
 /**
  * Browsers with native support.
  * @type {!Array.<webdriver.Browser>}
@@ -42,7 +39,6 @@ var NATIVE_BROWSERS = [
   webdriver.Browser.CHROME,
   webdriver.Browser.EDGE,
   webdriver.Browser.FIREFOX,
-  LEGACY_FIREFOX,
   webdriver.Browser.IE,
   webdriver.Browser.OPERA,
   webdriver.Browser.PHANTOM_JS,
@@ -54,7 +50,6 @@ var noBuild = /^1|true$/i.test(process.env['SELENIUM_NO_BUILD']);
 var serverJar = process.env['SELENIUM_SERVER_JAR'];
 var remoteUrl = process.env['SELENIUM_REMOTE_URL'];
 var useLoopback = process.env['SELENIUM_USE_LOOP_BACK'] == '1';
-var noMarionette = /^0|false$/i.test(process.env['SELENIUM_GECKODRIVER']);
 var startServer = !!serverJar && !remoteUrl;
 var nativeRun = !serverJar && !remoteUrl;
 
@@ -76,9 +71,6 @@ var browsersToTest = (function() {
     if (parts[0] === 'edge') {
       parts[0] = webdriver.Browser.EDGE;
     }
-    if (noMarionette && parts[0] === webdriver.Browser.FIREFOX) {
-      parts[0] = LEGACY_FIREFOX;
-    }
     return parts.join(':');
   });
 
@@ -88,10 +80,6 @@ var browsersToTest = (function() {
       parts[0] = webdriver.Browser.IE;
     }
 
-    if (parts[0] === LEGACY_FIREFOX) {
-      return;
-    }
-
     if (NATIVE_BROWSERS.indexOf(parts[0]) == -1 && !permitRemoteBrowsers) {
       throw Error('Browser ' + parts[0] + ' requires a WebDriver server and ' +
           'neither the SELENIUM_REMOTE_URL nor the SELENIUM_SERVER_JAR ' +
@@ -157,10 +145,6 @@ function TestEnvironment(browserName, server) {
     return server || remoteUrl;
   };
 
-  this.isMarionette = function() {
-    return !noMarionette;
-  };
-
   this.browsers = function(var_args) {
     var browsersToIgnore = Array.prototype.slice.apply(arguments, [0]);
     return browsers(browserName, browsersToIgnore);
@@ -171,15 +155,7 @@ function TestEnvironment(browserName, server) {
     var realBuild = builder.build;
 
     builder.build = function() {
-      var parts = browserName.split(/:/, 3);
-
-      if (parts[0] === LEGACY_FIREFOX) {
-        var options = builder.getFirefoxOptions() || new firefox.Options();
-        options.useGeckoDriver(false);
-        builder.setFirefoxOptions(options);
-
-        parts[0] = webdriver.Browser.FIREFOX;
-      }
+      let parts = browserName.split(/:/, 3);
 
       builder.forBrowser(parts[0], parts[1], parts[2]);
       if (server) {
@@ -244,15 +220,6 @@ function suite(fn, opt_options) {
     browsers.forEach(function(browser) {
       describe('[' + browser + ']', function() {
 
-        if (isDevMode && nativeRun) {
-          if (browser === LEGACY_FIREFOX) {
-            before(function() {
-              return build.of('//javascript/firefox-driver:webdriver')
-                  .onlyOnce().go();
-            });
-          }
-        }
-
         var serverToUse = null;
 
         if (!!serverJar && !remoteUrl) {

package/lib/webdriver.js

@@ -750,20 +750,12 @@ class WebDriver {
    *     commands should execute under, including the initial session creation.
    *     Defaults to the {@link promise.controlFlow() currently active}
    *     control flow.
-   * @param {(function(new: WebDriver,
-   *                   !IThenable<!Session>,
-   *                   !command.Executor,
-   *                   promise.ControlFlow=))=} opt_ctor
-   *    A reference to the constructor of the specific type of WebDriver client
-   *    to instantiate. Will create a vanilla {@linkplain WebDriver} instance
-   *    if a constructor is not provided.
    * @param {(function(this: void): ?)=} opt_onQuit A callback to invoke when
    *    the newly created session is terminated. This should be used to clean
    *    up any resources associated with the session.
    * @return {!WebDriver} The driver for the newly created session.
    */
-  static createSession(
-        executor, capabilities, opt_flow, opt_ctor, opt_onQuit) {
+  static createSession(executor, capabilities, opt_flow, opt_onQuit) {
     let flow = opt_flow || promise.controlFlow();
     let cmd = new command.Command(command.Name.NEW_SESSION);
 
@@ -782,8 +774,7 @@ class WebDriver {
         return Promise.resolve(opt_onQuit.call(void 0)).then(_ => {throw err;});
       });
     }
-    const ctor = opt_ctor || WebDriver;
-    return new ctor(session, executor, flow, opt_onQuit);
+    return new this(session, executor, flow, opt_onQuit);
   }
 
   /** @override */
@@ -2186,7 +2177,7 @@ class WebElement {
     if (!this.driver_.fileDetector_) {
       return this.schedule_(
           new command.Command(command.Name.SEND_KEYS_TO_ELEMENT).
-              setParameter('text', keys).
+              setParameter('text', keys.then(keys => keys.join(''))).
               setParameter('value', keys),
           'WebElement.sendKeys()');
     }

package/opera.js

@@ -383,7 +383,7 @@ class Driver extends webdriver.WebDriver {
     }
 
     return /** @type {!Driver} */(
-        webdriver.WebDriver.createSession(executor, caps, opt_flow, this));
+        super.createSession(executor, caps, opt_flow));
   }
 
   /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "selenium-webdriver",
-  "version": "3.4.0",
+  "version": "3.5.0",
   "description": "The official WebDriver JavaScript bindings from the Selenium project",
   "license": "Apache-2.0",
   "keywords": [
@@ -23,7 +23,7 @@
     "node": ">= 6.9.0"
   },
   "dependencies": {
-    "adm-zip": "^0.4.7",
+    "jszip": "^3.1.3",
     "rimraf": "^2.5.4",
     "tmp": "0.0.30",
     "xml2js": "^0.4.17"

package/phantomjs.js

@@ -217,8 +217,8 @@ class Driver extends webdriver.WebDriver {
     });
 
     var executor = createExecutor(service.start());
-    return /** @type {!Driver} */(webdriver.WebDriver.createSession(
-        executor, caps, opt_flow, this, () => service.kill()));
+    return /** @type {!Driver} */(super.createSession(
+        executor, caps, opt_flow, () => service.kill()));
   }
 
   /**

package/remote/index.js

@@ -17,7 +17,6 @@
 
 'use strict';
 
-const AdmZip = require('adm-zip');
 const fs = require('fs');
 const path = require('path');
 const url = require('url');
@@ -26,6 +25,7 @@ const util = require('util');
 const httpUtil = require('../http/util');
 const io = require('../io');
 const exec = require('../io/exec');
+const {Zip} = require('../io/zip');
 const cmd = require('../lib/command');
 const input = require('../lib/input');
 const promise = require('../lib/promise');
@@ -575,15 +575,16 @@ class FileDetector extends input.FileDetector {
         return file;  // Not a valid file, return original input.
       }
 
-      var zip = new AdmZip();
-      zip.addLocalFile(file);
-      // Stored compression, see https://en.wikipedia.org/wiki/Zip_(file_format)
-      zip.getEntries()[0].header.method = 0;
-
-      var command = new cmd.Command(cmd.Name.UPLOAD_FILE)
-          .setParameter('file', zip.toBuffer().toString('base64'));
-      return driver.schedule(command,
-          'remote.FileDetector.handleFile(' + file + ')');
+      let zip = new Zip;
+      return zip.addFile(file)
+          .then(() => zip.toBuffer())
+          .then(buf => buf.toString('base64'))
+          .then(encodedZip => {
+            let command = new cmd.Command(cmd.Name.UPLOAD_FILE)
+                .setParameter('file', encodedZip);
+            return driver.schedule(command,
+                'remote.FileDetector.handleFile(' + file + ')');
+          });
     }, function(err) {
       if (err.code === 'ENOENT') {
         return file;  // Not a file; return original input.

package/safari.js

@@ -250,8 +250,8 @@ class Driver extends webdriver.WebDriver {
     let executor = new http.Executor(
         service.start().then(url => new http.HttpClient(url)));
 
-    return /** @type {!Driver} */(webdriver.WebDriver.createSession(
-        executor, caps, opt_flow, this, () => service.kill()));
+    return /** @type {!Driver} */(super.createSession(
+        executor, caps, opt_flow, () => service.kill()));
   }
 }
 

package/test/firefox/extension_test.js

@@ -17,24 +17,27 @@
 
 'use strict';
 
-var AdmZip = require('adm-zip'),
-    assert = require('assert'),
+var assert = require('assert'),
     crypto = require('crypto'),
     fs = require('fs'),
     path = require('path');
 
 var extension = require('../../firefox/extension'),
     io = require('../../io'),
+    zip = require('../../io/zip'),
     it = require('../../testing').it;
 
 
 var JETPACK_EXTENSION = path.join(__dirname,
     '../../lib/test/data/firefox/jetpack-sample.xpi');
 var NORMAL_EXTENSION = path.join(__dirname,
-    '../../lib/test/data/firefox/sample.xpi');
+  '../../lib/test/data/firefox/sample.xpi');
+var WEBEXTENSION_EXTENSION = path.join(__dirname,
+  '../../lib/test/data/firefox/webextension.xpi');
 
 var JETPACK_EXTENSION_ID = 'jid1-EaXX7k0wwiZR7w@jetpack';
 var NORMAL_EXTENSION_ID = 'sample@seleniumhq.org';
+var WEBEXTENSION_EXTENSION_ID = 'webextensions-selenium-example@example.com';
 
 
 describe('extension', function() {
@@ -75,22 +78,43 @@ describe('extension', function() {
     });
   });
 
+  it('can install a webextension xpi file', function() {
+    return io.tmpDir().then(function(dir) {
+      return extension.install(WEBEXTENSION_EXTENSION, dir).then(function(id) {
+        assert.equal(WEBEXTENSION_EXTENSION_ID, id);
+        var file = path.join(dir, id + '.xpi');
+        assert.ok(fs.existsSync(file), 'no such file: ' + file);
+        assert.ok(!fs.statSync(file).isDirectory());
+
+        var copiedSha1 = crypto.createHash('sha1')
+          .update(fs.readFileSync(file))
+          .digest('hex');
+
+        var goldenSha1 = crypto.createHash('sha1')
+          .update(fs.readFileSync(WEBEXTENSION_EXTENSION))
+          .digest('hex');
+
+        assert.equal(copiedSha1, goldenSha1);
+      });
+    });
+  });
+
   it('can install an extension from a directory', function() {
     return io.tmpDir().then(function(srcDir) {
-      var buf = fs.readFileSync(NORMAL_EXTENSION);
-      new AdmZip(buf).extractAllTo(srcDir, true);
-      return io.tmpDir().then(function(dstDir) {
-        return extension.install(srcDir, dstDir).then(function(id) {
-          assert.equal(NORMAL_EXTENSION_ID, id);
-
-          var dir = path.join(dstDir, NORMAL_EXTENSION_ID);
-
-          assert.ok(fs.existsSync(path.join(dir, 'chrome.manifest')));
-          assert.ok(fs.existsSync(path.join(dir, 'content/overlay.xul')));
-          assert.ok(fs.existsSync(path.join(dir, 'content/overlay.js')));
-          assert.ok(fs.existsSync(path.join(dir, 'install.rdf')));
-        });
-      });
+      return zip.unzip(NORMAL_EXTENSION, srcDir)
+          .then(() => io.tmpDir())
+          .then(dstDir => {
+            return extension.install(srcDir, dstDir).then(function(id) {
+              assert.equal(NORMAL_EXTENSION_ID, id);
+
+              var dir = path.join(dstDir, NORMAL_EXTENSION_ID);
+
+              assert.ok(fs.existsSync(path.join(dir, 'chrome.manifest')));
+              assert.ok(fs.existsSync(path.join(dir, 'content/overlay.xul')));
+              assert.ok(fs.existsSync(path.join(dir, 'content/overlay.js')));
+              assert.ok(fs.existsSync(path.join(dir, 'install.rdf')));
+            });
+          });
     });
   });
 });

package/test/firefox/firefox_test.js

@@ -33,18 +33,20 @@ var JETPACK_EXTENSION = path.join(__dirname,
     '../../lib/test/data/firefox/jetpack-sample.xpi');
 var NORMAL_EXTENSION = path.join(__dirname,
     '../../lib/test/data/firefox/sample.xpi');
+var WEBEXTENSION_EXTENSION = path.join(__dirname,
+  '../../lib/test/data/firefox/webextension.xpi');
 
 
 test.suite(function(env) {
   describe('firefox', function() {
     describe('Options', function() {
-      var driver;
+      let driver;
 
-      test.beforeEach(function() {
+      beforeEach(function() {
         driver = null;
       });
 
-      test.afterEach(function() {
+      afterEach(function() {
         if (driver) {
           return driver.quit();
         }
@@ -128,6 +130,22 @@ test.suite(function(env) {
         });
       });
 
+      test.it('can start Firefox with a webextension extension', function() {
+        let profile = new firefox.Profile();
+        profile.addExtension(WEBEXTENSION_EXTENSION);
+
+        let options = new firefox.Options().setProfile(profile);
+
+        return runWithFirefoxDev(options, function*() {
+          yield driver.get(test.Pages.echoPage);
+
+          let footer =
+            yield driver.findElement({id: 'webextensions-selenium-example'});
+          let text = yield footer.getText();
+          assert(text).equalTo('Content injected by webextensions-selenium-example');
+        });
+      });
+
       test.it('can start Firefox with multiple extensions', function() {
         let profile = new firefox.Profile();
         profile.addExtension(JETPACK_EXTENSION);
@@ -150,6 +168,26 @@ test.suite(function(env) {
         });
       });
 
+      test.it('can be used alongside preset capabilities', function*() {
+        let binary = yield firefox.Channel.AURORA.locate();
+
+        let profile = new firefox.Profile();
+        profile.addExtension(JETPACK_EXTENSION);
+        profile.setPreference('general.useragent.override', 'foo;bar');
+
+        driver = yield env.builder()
+            .withCapabilities({'moz:firefoxOptions': {binary}})
+            .setFirefoxOptions(new firefox.Options().setProfile(profile))
+            .build();
+
+        yield loadJetpackPage(driver,
+            'data:text/html;charset=UTF-8,<html><div>content</div></html>');
+
+        let text =
+            yield driver.findElement({id: 'jetpack-sample-banner'}).getText();
+        assert(text).equalTo('Hello, world!');
+      });
+
       function loadJetpackPage(driver, url) {
         // On linux the jetpack extension does not always run the first time
         // we load a page. If this happens, just reload the page (a simple
@@ -198,13 +236,11 @@ test.suite(function(env) {
         }
       });
 
-      test.ignore(() => !env.isMarionette).
-      it('can get context', function() {
+      test.it('can get context', function() {
         return assert(driver.getContext()).equalTo(Context.CONTENT);
       });
 
-      test.ignore(() => !env.isMarionette).
-      it('can set context', function*() {
+      test.it('can set context', function*() {
         yield driver.setContext(Context.CHROME);
         let ctxt = yield driver.getContext();
         assert(ctxt).equalTo(Context.CHROME);
@@ -214,8 +250,7 @@ test.suite(function(env) {
         assert(ctxt).equalTo(Context.CONTENT);
       });
 
-      test.ignore(() => !env.isMarionette).
-      it('throws on unknown context', function() {
+      test.it('throws on unknown context', function() {
         return driver.setContext("foo").then(assert.fail, function(e) {
           assert(e).instanceOf(error.InvalidArgumentError);
         });

package/test/firefox/profile_test.js

@@ -17,8 +17,7 @@
 
 'use strict';
 
-var AdmZip = require('adm-zip'),
-    assert = require('assert'),
+var assert = require('assert'),
     fs = require('fs'),
     path = require('path');
 
@@ -33,10 +32,12 @@ var JETPACK_EXTENSION = path.join(__dirname,
     '../../lib/test/data/firefox/jetpack-sample.xpi');
 var NORMAL_EXTENSION = path.join(__dirname,
     '../../lib/test/data/firefox/sample.xpi');
+var WEBEXTENSION_EXTENSION = path.join(__dirname,
+  '../../lib/test/data/firefox/webextension.xpi');
 
 var JETPACK_EXTENSION_ID = 'jid1-EaXX7k0wwiZR7w@jetpack.xpi';
 var NORMAL_EXTENSION_ID = 'sample@seleniumhq.org';
-var WEBDRIVER_EXTENSION_ID = 'fxdriver@googlecode.com';
+var WEBEXTENSION_EXTENSION_ID = 'webextensions-selenium-example@example.com';
 
 
 
@@ -57,13 +58,6 @@ describe('Profile', function() {
       assert.equal('http://www.example.com',
           profile.getPreference('browser.newtab.url'));
     });
-
-    it('throws if setting a frozen preference', function() {
-      var profile = new Profile();
-      assert.throws(function() {
-        profile.setPreference('app.update.auto', true);
-      });
-    });
   });
 
   describe('writeToDisk', function() {
@@ -104,20 +98,6 @@ describe('Profile', function() {
     });
 
     describe('user.js', function() {
-
-      it('writes defaults', function() {
-        return new Profile().writeToDisk().then(function(dir) {
-          return loadUserPrefs(path.join(dir, 'user.js'));
-        }).then(function(prefs) {
-          // Just check a few.
-          assert.equal(false, prefs['app.update.auto']);
-          assert.equal(true, prefs['browser.EULA.override']);
-          assert.equal(false, prefs['extensions.update.enabled']);
-          assert.equal('about:blank', prefs['browser.newtab.url']);
-          assert.equal(30, prefs['dom.max_script_run_time']);
-        });
-      });
-
       it('merges template user.js into preferences', function() {
         return io.tmpDir().then(function(dir) {
           fs.writeFileSync(path.join(dir, 'user.js'), [
@@ -133,19 +113,6 @@ describe('Profile', function() {
           assert.equal(1234, prefs['dom.max_script_run_time']);
         });
       });
-
-      it('ignores frozen preferences when merging template user.js',
-        function() {
-          return io.tmpDir().then(function(dir) {
-            fs.writeFileSync(path.join(dir, 'user.js'),
-                'user_pref("app.update.auto", true)');
-            return new Profile(dir).writeToDisk();
-          }).then(function(profile) {
-            return loadUserPrefs(path.join(profile, 'user.js'));
-          }).then(function(prefs) {
-            assert.equal(false, prefs['app.update.auto']);
-          });
-        });
     });
 
     describe('extensions', function() {
@@ -153,33 +120,21 @@ describe('Profile', function() {
         var profile = new Profile();
         profile.addExtension(JETPACK_EXTENSION);
         profile.addExtension(NORMAL_EXTENSION);
+        profile.addExtension(WEBEXTENSION_EXTENSION);
 
         return profile.writeToDisk().then(function(dir) {
           dir = path.join(dir, 'extensions');
-          assert.ok(fs.existsSync(path.join(dir, JETPACK_EXTENSION_ID)));
-          assert.ok(fs.existsSync(path.join(dir, NORMAL_EXTENSION_ID)));
-          assert.ok(fs.existsSync(path.join(dir, WEBDRIVER_EXTENSION_ID)));
+          assertExists(JETPACK_EXTENSION_ID);
+          assertExists(NORMAL_EXTENSION_ID);
+          assertExists(WEBEXTENSION_EXTENSION_ID + '.xpi');
+
+          function assertExists(file) {
+            assert.ok(
+                fs.existsSync(path.join(dir, file)),
+                `expected ${file} to exist`);
+          }
         });
       });
     });
   });
-
-  describe('encode', function() {
-    it('excludes the bundled WebDriver extension', function() {
-      return new Profile().encode().then(function(data) {
-        return decode(data);
-      }).then(function(dir) {
-        assert.ok(fs.existsSync(path.join(dir, 'user.js')));
-        assert.ok(fs.existsSync(path.join(dir, 'extensions')));
-        return loadUserPrefs(path.join(dir, 'user.js'));
-      }).then(function(prefs) {
-        // Just check a few.
-        assert.equal(false, prefs['app.update.auto']);
-        assert.equal(true, prefs['browser.EULA.override']);
-        assert.equal(false, prefs['extensions.update.enabled']);
-        assert.equal('about:blank', prefs['browser.newtab.url']);
-        assert.equal(30, prefs['dom.max_script_run_time']);
-      });
-    });
-  });
 });

package/test/http/http_test.js

@@ -44,6 +44,14 @@ describe('HttpClient', function() {
       res.writeHead(200, {'content-type': 'text/plain'});
       res.end('hello, world!');
 
+    } else if (req.method == 'GET' && req.url == '/chunked') {
+      res.writeHead(200, {
+        'content-type': 'text/html; charset=utf-8',
+        'transfer-encoding': 'chunked'
+      });
+      res.write('<!DOCTYPE html>');
+      setTimeout(() => res.end('<h1>Hello, world!</h1>'), 20);
+
     } else if (req.method == 'GET' && req.url == '/badredirect') {
       res.writeHead(303, {});
       res.end();
@@ -121,6 +129,16 @@ describe('HttpClient', function() {
     });
   });
 
+  it('handles chunked responses', function() {
+    let request = new HttpRequest('GET', '/chunked');
+
+    let client = new HttpClient(server.url());
+    return client.send(request).then(response => {
+      assert.equal(200, response.status);
+      assert.equal(response.body, '<!DOCTYPE html><h1>Hello, world!</h1>');
+    });
+  });
+
   it('can use basic auth', function() {
     var parsed = url.parse(server.url());
     parsed.auth = 'genie:bottle';

package/test/{io_test.js → io/io_test.js}

@@ -22,7 +22,7 @@ var assert = require('assert'),
     path = require('path'),
     tmp = require('tmp');
 
-var io = require('../io');
+var io = require('../../io');
 
 
 describe('io', function() {
@@ -318,4 +318,43 @@ describe('io', function() {
                 (e) => assert.equal('ENOENT', e.code));
     });
   });
+
+  describe('mkdirp', function() {
+    it('recursively creates entire directory path', function() {
+      return io.tmpDir().then(root => {
+        let dst = path.join(root, 'foo/bar/baz');
+        return io.mkdirp(dst).then(d => {
+          assert.strictEqual(d, dst);
+          return io.stat(d).then(stats => {
+            assert.ok(stats.isDirectory());
+          });
+        });
+      });
+    });
+
+    it('does nothing if the directory already exists', function() {
+      return io.tmpDir()
+          .then(dir => io.mkdirp(dir).then(d => assert.strictEqual(d, dir)));
+    });
+  });
+
+  describe('walkDir', function() {
+    it('walk directory', function() {
+      return io.tmpDir().then(dir => {
+        fs.writeFileSync(path.join(dir, 'file1'), 'hello');
+        fs.mkdirSync(path.join(dir, 'sub'));
+        fs.mkdirSync(path.join(dir, 'sub/folder'));
+        fs.writeFileSync(path.join(dir, 'sub/folder/file2'), 'goodbye');
+
+        return io.walkDir(dir).then(seen => {
+          assert.deepStrictEqual(
+              seen,
+              [{path: 'file1', dir: false},
+               {path: 'sub', dir: true},
+               {path: 'sub/folder', dir: true},
+               {path: 'sub/folder/file2', dir: false}]);
+        });
+      });
+    });
+  })
 });