merging

Author: StephWood

src/client/controllers/graphQLController.js

@@ -29,8 +29,8 @@ const graphQLController = {
   // handles graphQL queries and mutations
   sendGqlToMain(args) {
     return new Promise((resolve) => {
-      ipcRenderer.send("open-gql", args);
-      ipcRenderer.on("reply-gql", (event, result) => {
+      api.send("open-gql", args);
+      api.receive("reply-gql", (result) => {
         // needs formatting because component reads them in a particular order
         result.reqResObj.response.cookies = this.cookieFormatter(
           result.reqResObj.response.cookies

test/electronTests.js

@@ -13,9 +13,11 @@ const app = new Application({
   // Your electron path can be any binary
   // i.e for OSX an example path could be '/Applications/MyApp.app/Contents/MacOS/MyApp'
   // But for the sake of the example we fetch it from our node_modules.
+  // path: path.join(__dirname, "../main.js"),
   path: electronPath,
   // The following line tells spectron to look and use the main.js file
   // and the package.json located 1 level above along with an arg, 'TEST_MODE'
+  // args: [TEST_MODE],
   args: [path.join(__dirname, ".."), TEST_MODE],
 });