From 5b179d1dafb5f2b380036a09586598b7f79f4b39 Mon Sep 17 00:00:00 2001
From: Andrey Lushnikov <lushnikov@chromium.org>
Date: Mon, 27 Jan 2020 17:18:47 -0800
Subject: [PATCH] fix: properly expose top-level devices

---
 index.js              | 2 +-
 test/launcher.spec.js | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/index.js b/index.js
index 4d745cee49..feee61d4da 100644
--- a/index.js
+++ b/index.js
@@ -17,7 +17,7 @@
 const { helper } = require('./lib/helper');
 const api = require('./lib/api');
 const packageJson = require('./package.json');
-const DeviceDescriptors = require('./lib/deviceDescriptors');
+const { DeviceDescriptors } = require('./lib/deviceDescriptors');
 const { TimeoutError } = require('./lib/errors');
 const { Chromium } = require('./lib/server/chromium');
 const { Firefox } = require('./lib/server/firefox');
diff --git a/test/launcher.spec.js b/test/launcher.spec.js
index f0fe24fa46..ac56a330b3 100644
--- a/test/launcher.spec.js
+++ b/test/launcher.spec.js
@@ -138,7 +138,9 @@ module.exports.describe = function({testRunner, expect, defaultBrowserOptions, p
     });
     it('should require top-level DeviceDescriptors', async() => {
       const Devices = require(path.join(utils.projectRoot(), '/lib/deviceDescriptors.js')).DeviceDescriptors;
+      expect(Devices['iPhone 6']).toBeTruthy();
       expect(Devices['iPhone 6']).toBe(playwright.devices['iPhone 6']);
+      expect(Devices['iPhone 6']).toBe(require(playwrightPath).devices['iPhone 6']);
     });
   });