Merge ecf3267 into 14becea

lib/controllers.js

@@ -309,17 +309,11 @@ controllers.url = function * () {
  * @returns {Promise.<string>}
  */
 controllers.get = function * (url, options) {
-  const that = this;
-  return new Promise((resolve, reject) => {
-    co(function * () {
-      that.frame = null;
-      yield sendCommand.call(that, 'get', {
-        url,
-        args: that.args,
-        preserveCookies: options ? options.preserveCookies : null
-      });
-      resolve();
-    }).catch(reject);
+  this.frame = null;
+  return yield sendCommand.call(this, 'get', {
+    url,
+    args: this.args,
+    preserveCookies: options ? options.preserveCookies : null
   });
 };
 

lib/macaca-electron.js

@@ -1,6 +1,5 @@
 'use strict';
 
-const co = require('co');
 const path = require('path');
 const DriverBase = require('driver-base');
 
@@ -20,31 +19,19 @@ class Electron extends DriverBase {
   }
 
   * startDevice(caps) {
-    const that = this;
-    return new Promise((resolve, reject) => {
-      co(function * () {
-        that.args = _.clone(caps || {});
-        that.ipc = that.ipc || new IPC(that.args);
-        yield that.ipc.initElectron();
-        yield _.sleep(3 * 1000);
-        resolve();
-      }).catch(reject);
-    });
+    this.args = _.clone(caps || {});
+    this.ipc = this.ipc || new IPC(this.args);
+    yield this.ipc.initElectron();
+    yield _.sleep(3 * 1000);
   }
 
   get runnerProcess() {
     return this.ipc && this.ipc.proc;
   }
 
-  stopDevice() {
-    const that = this;
-    return new Promise((resolve, reject) => {
-      co(function * () {
-        yield that.ipc.stopElectron();
-        that.ipc = null;
-        resolve();
-      }).catch(reject);
-    });
+  * stopDevice() {
+    yield this.ipc.stopElectron();
+    this.ipc = null;
   }
 
   isProxy() {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "macaca-electron",
-  "version": "2.2.3",
+  "version": "2.2.4",
   "description": "macaca electron driver",
   "keywords": [
     "electron",