docs: change examples in docs to use for..of and async/await (#15196)

electron · Oct 16, 2018 · de1d24b · de1d24b
1 parent 0252d76
commit de1d24b
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 37 deletions.
diff --git a/docs/api/desktop-capturer.md b/docs/api/desktop-capturer.md
@@ -12,24 +12,28 @@ title is `Electron`:
 // In the renderer process.
 const { desktopCapturer } = require('electron')
 
-desktopCapturer.getSources({ types: ['window', 'screen'] }, (error, sources) => {
+desktopCapturer.getSources({ types: ['window', 'screen'] }, async (error, sources) => {
   if (error) throw error
-  for (let i = 0; i < sources.length; ++i) {
-    if (sources[i].name === 'Electron') {
-      navigator.mediaDevices.getUserMedia({
-        audio: false,
-        video: {
-          mandatory: {
-            chromeMediaSource: 'desktop',
-            chromeMediaSourceId: sources[i].id,
-            minWidth: 1280,
-            maxWidth: 1280,
-            minHeight: 720,
-            maxHeight: 720
+  for (const source of sources) {
+    if (source.name === 'Electron') {
+      try {
+        const stream = await navigator.mediaDevices.getUserMedia({
+          audio: false,
+          video: {
+            mandatory: {
+              chromeMediaSource: 'desktop',
+              chromeMediaSourceId: source.id,
+              minWidth: 1280,
+              maxWidth: 1280,
+              minHeight: 720,
+              maxHeight: 720
+            }
           }
-        }
-      }).then((stream) => handleStream(stream))
-        .catch((e) => handleError(e))
+        })
+        handleStream(stream)
+      } catch (e) {
+        handleError(e)
+      }
       return
     }
   }

diff --git a/docs/tutorial/using-selenium-and-webdriver.md b/docs/tutorial/using-selenium-and-webdriver.md
@@ -20,32 +20,33 @@ $ npm install --save-dev spectron
 
 ```javascript
 // A simple test to verify a visible window is opened with a title
-var Application = require('spectron').Application
-var assert = require('assert')
+const Application = require('spectron').Application
+const assert = require('assert')
 
-var app = new Application({
+const myApp = new Application({
   path: '/Applications/MyApp.app/Contents/MacOS/MyApp'
 })
 
-app.start().then(function () {
-  // Check if the window is visible
-  return app.browserWindow.isVisible()
-}).then(function (isVisible) {
-  // Verify the window is visible
-  assert.strictEqual(isVisible, true)
-}).then(function () {
-  // Get the window's title
-  return app.client.getTitle()
-}).then(function (title) {
-  // Verify the window's title
-  assert.strictEqual(title, 'My App')
-}).catch(function (error) {
-  // Log any failures
-  console.error('Test failed', error.message)
-}).then(function () {
+const verifyWindowIsVisibleWithTitle = async (app) => {
+  await app.start()
+  try {
+    // Check if the window is visible
+    const isVisible = await app.browserWindow.isVisible()
+    // Verify the window is visible
+    assert.strictEqual(isVisible, true)
+    // Get the window's title
+    const title = await app.client.getTitle()
+    // Verify the window's title
+    assert.strictEqual(title, 'My App')
+  } catch (error) {
+    // Log any failures
+    console.error('Test failed', error.message)
+  }
   // Stop the application
-  return app.stop()
-})
+  await app.stop()
+}
+
+verifyWindowIsVisibleWithTitle(myApp)
 ```
 
 ## Setting up with WebDriverJs