server: fixes cypress-io#1093, ensure github login works (cypress-io#1094)

brian-mann · web-flow · commit 88c367ff1314 · 2017-12-19T12:54:35.000-05:00
* server: fixes cypress-io#1093, ensure github login works - add more comprehensive tests around windows and events - test that github callbacks work as expected * server: fixes failing tests * server: fixes failing tests, more resets
diff --git a/packages/server/lib/gui/events.coffee b/packages/server/lib/gui/events.coffee
@@ -112,7 +112,7 @@ handleEvent = (options, bus, event, id, type, arg) ->
       .catch(sendErr)
 
     when "window:open"
-      Windows.open(arg)
+      Windows.open(options.projectPath, arg)
       .then(send)
       .catch(sendErr)
 
diff --git a/packages/server/test/unit/gui/events_spec.coffee b/packages/server/test/unit/gui/events_spec.coffee
@@ -165,15 +165,26 @@ describe "lib/gui/events", ->
 
   context "window", ->
     describe "window:open", ->
-      it "calls Windows#open with args and resolves with return of Windows.open", ->
-        @sandbox.stub(Windows, "open").withArgs({foo: "bar"}).resolves({bar: "baz"})
+      beforeEach ->
+        @options.projectPath = "/path/to/my/project"
 
-        @handleEvent("window:open", {foo: "bar"}).then (assert) =>
-          assert.sendCalledWith({bar: "baz"})
+        @win = @sandbox.stub({
+          on: ->
+          once: ->
+          loadURL: ->
+          webContents: {}
+        })
+
+        @sandbox.stub(Windows, "create").withArgs(@options.projectPath).returns(@win)
+
+      it "calls Windows#open with args and resolves with return of Windows.open", ->
+        @handleEvent("window:open", {type: "INDEX"})
+        .then (assert) =>
+          assert.sendCalledWith(@win)
 
       it "catches errors", ->
         err = new Error("foo")
-        @sandbox.stub(Windows, "open").withArgs({foo: "bar"}).rejects(err)
+        @sandbox.stub(Windows, "open").withArgs(@options.projectPath, {foo: "bar"}).rejects(err)
 
         @handleEvent("window:open", {foo: "bar"}).then (assert) =>
           assert.sendErrCalledWith(err)
diff --git a/packages/server/test/unit/gui/windows_spec.coffee b/packages/server/test/unit/gui/windows_spec.coffee
@@ -1,15 +1,22 @@
 require("../../spec_helper")
 
 _             = require("lodash")
+path          = require("path")
 Promise       = require("bluebird")
 EE            = require("events").EventEmitter
 BrowserWindow = require("electron").BrowserWindow
+cyDesktop     = require("@packages/desktop-gui")
+user          = require("#{root}../lib/user")
 Windows       = require("#{root}../lib/gui/windows")
 savedState    = require("#{root}../lib/saved_state")
 
 describe "lib/gui/windows", ->
   beforeEach ->
+    Windows.reset()
+
     @win = new EE()
+    @win.loadURL = @sandbox.stub()
+    @win.destroy = @sandbox.stub()
     @win.getSize = @sandbox.stub().returns([1, 2])
     @win.getPosition = @sandbox.stub().returns([3, 4])
     @win.webContents = new EE()
@@ -18,6 +25,9 @@ describe "lib/gui/windows", ->
 
     @sandbox.stub(Windows, "_newBrowserWindow").returns(@win)
 
+  afterEach ->
+    Windows.reset()
+
   context ".getBrowserAutomation", ->
     beforeEach ->
       @sandbox.stub(Windows, "automation")
@@ -37,6 +47,66 @@ describe "lib/gui/windows", ->
       BrowserWindow.fromWebContents.withArgs("foo").returns("bar")
       expect(Windows.getByWebContents("foo")).to.eq("bar")
 
+  context ".open", ->
+    beforeEach ->
+      @sandbox.stub(Windows, "create").returns(@win)
+
+    it "sets default options", ->
+      options = {
+        type: "INDEX"
+      }
+
+      Windows.open("/path/to/project", options)
+      .then (win) ->
+        expect(options).to.deep.eq({
+          height: 500
+          width: 600
+          type: "INDEX"
+          show: true
+          url: cyDesktop.getPathToIndex()
+          webPreferences: {
+            preload: path.resolve("lib", "ipc", "ipc.js")
+          }
+        })
+
+        expect(win.loadURL).to.be.calledWith(cyDesktop.getPathToIndex())
+
+    it "resolves with code on GITHUB_LOGIN for will-navigate", ->
+      options = {
+        type: "GITHUB_LOGIN"
+      }
+
+      url = "https://github.com/login"
+      url2 = "https://github.com?code=code123"
+
+      @sandbox.stub(user, "getLoginUrl").resolves(url)
+
+      @sandbox.stub(@win.webContents, "on").withArgs("will-navigate").yieldsAsync({}, url2)
+
+      Windows.open("/path/to/project", options)
+      .then (code) =>
+        expect(code).to.eq("code123")
+        expect(options.type).eq("GITHUB_LOGIN")
+        expect(@win.loadURL).to.be.calledWith(url)
+
+    it "resolves with code on GITHUB_LOGIN for did-get-redirect-request", ->
+      options = {
+        type: "GITHUB_LOGIN"
+      }
+
+      url = "https://github.com/login"
+      url2 = "https://github.com?code=code123"
+
+      @sandbox.stub(user, "getLoginUrl").resolves(url)
+
+      @sandbox.stub(@win.webContents, "on").withArgs("did-get-redirect-request").yieldsAsync({}, "foo", url2)
+
+      Windows.open("/path/to/project", options)
+      .then (code) =>
+        expect(code).to.eq("code123")
+        expect(options.type).eq("GITHUB_LOGIN")
+        expect(@win.loadURL).to.be.calledWith(url)
+
   context ".create", ->
     it "opens dev tools if saved state is open", ->
       Windows.create("/foo/", {devTools: true})
