1 files changed, 26 insertions, 14 deletions
diff --git a/node_modules/selenium-webdriver/test/firefox/firefox_test.js b/node_modules/selenium-webdriver/test/firefox/firefox_test.js
index 485964f91..dbf9910fa 100644
--- a/node_modules/selenium-webdriver/test/firefox/firefox_test.js
+++ b/node_modules/selenium-webdriver/test/firefox/firefox_test.js
@@ -26,6 +26,8 @@ var firefox = require('../../firefox'),
     Context = require('../../firefox').Context,
     error = require('../..').error;
 
+var {consume} = require('../../lib/promise');
+
 
 var JETPACK_EXTENSION = path.join(__dirname,
     '../../lib/test/data/firefox/jetpack-sample.xpi');
@@ -53,9 +55,7 @@ test.suite(function(env) {
        * skipped if dev cannot be found on the current system.
        */
       function runWithFirefoxDev(options, testFn) {
-        let binary = new firefox.Binary();
-        binary.useDevEdition();
-        return binary.locate().then(exe => {
+        return firefox.Channel.AURORA.locate().then(exe => {
           options.setBinary(exe);
           driver = env.builder()
               .setFirefoxOptions(options)
@@ -67,21 +67,33 @@ test.suite(function(env) {
         });
       }
 
-      test.it('can start Firefox with custom preferences', function*() {
-        var profile = new firefox.Profile();
-        profile.setPreference('general.useragent.override', 'foo;bar');
+      describe('can start Firefox with custom preferences', function() {
+        function runTest(opt_dir) {
+          return consume(function*() {
+            let profile = new firefox.Profile(opt_dir);
+            profile.setPreference('general.useragent.override', 'foo;bar');
+
+            let options = new firefox.Options().setProfile(profile);
+
+            driver = env.builder().
+                setFirefoxOptions(options).
+                build();
 
-        var options = new firefox.Options().setProfile(profile);
+            yield driver.get('data:text/html,<html><div>content</div></html>');
 
-        driver = env.builder().
-            setFirefoxOptions(options).
-            build();
+            var userAgent = yield driver.executeScript(
+                'return window.navigator.userAgent');
+            assert(userAgent).equalTo('foo;bar');
+          });
+        }
 
-        yield driver.get('data:text/html,<html><div>content</div></html>');
+        test.it('profile created from scratch', function() {
+          return runTest();
+        });
 
-        var userAgent = yield driver.executeScript(
-            'return window.navigator.userAgent');
-        assert(userAgent).equalTo('foo;bar');
+        test.it('profile created from template', function() {
+          return io.tmpDir().then(runTest);
+        });
       });
 
       test.it('can start Firefox with a jetpack extension', function() {