fix(restart): typescript fix for browser.restart (#3658)

closes #3648

Author: cnishina

lib/runner.ts

@@ -258,7 +258,13 @@ export class Runner extends EventEmitter {
       // calls here are not guaranteed to complete before the tests resume.
       this.driverprovider_.quitDriver(browser_.driver);
       // Copy mock modules, but do not navigate to previous URL.
-      browser_ = browser_.forkNewDriverInstance(false, true);
+      let forkBrowser = browser_.forkNewDriverInstance(false, true);
+
+      // Replace the items in browser_ but do not create a new object
+      // since this will break typescript imports
+      for (let item in forkBrowser) {
+        browser_[item] = forkBrowser[item];
+      }
       this.setupGlobals_(browser_);
     };
 

spec/install/.gitignore

@@ -1,5 +1,7 @@
 node_modules
 typings
 conf.js
+browserts_spec.js
+typescript_conf.js
 typescript_spec.js
-npm-debug.log
+npm-debug.log

spec/install/browserjs_spec.js

@@ -0,0 +1,30 @@
+describe('browser', () => {
+  let session1;
+  let session2;
+
+  afterEach(() => {
+    browser.restart();
+  });
+
+  it('should load a browser session', (done) => {
+    browser.get('http://angularjs.org');
+    browser.getSession().then(session => {
+      session1 = session.getId();
+      expect(session1).not.toBeUndefined();
+    }).catch(err => {
+      done.fail('session should be defined');
+    });
+    done();
+  });
+  it('should have a new browser session', (done) => {
+    browser.get('http://angularjs.org');
+    browser.getSession().then(session => {
+      session2 = session.getId();
+      expect(session2).not.toBeUndefined();
+      expect(session1).not.toEqual(session2);
+    }).catch(err => {
+      done.fail('session should be defined');
+    });
+    done();
+  });
+});

spec/install/browserts_spec.ts

@@ -0,0 +1,33 @@
+import {browser} from 'protractor';
+import {WebDriver} from 'selenium-webdriver';
+
+describe('browser', () => {
+  let session1: string;
+  let session2: string;
+
+  afterEach(() => {
+    browser.restart();
+  });
+  
+  it('should load a browser session', (done) => {
+    browser.get('http://angularjs.org');
+    browser.getSession().then(session => {
+      session1 = session.getId();
+      expect(session1).not.toBeUndefined();
+    }).catch(err => {
+      done.fail('session should be defined');
+    });
+    done();
+  });
+  it('should have a new browser session', (done) => {
+    browser.get('http://angularjs.org');
+    browser.getSession().then(session => {
+      session2 = session.getId();
+      expect(session2).not.toBeUndefined();
+      expect(session1).not.toEqual(session2);
+    }).catch(err => {
+      done.fail('session should be defined');
+    });
+    done();
+  });
+});

spec/install/conf.ts

@@ -1,7 +1,13 @@
 import {Config} from 'protractor';
 
+var env = require('../environment');
+
 export let config: Config = {
-  mockSelenium: true,
-  specs: ['*_spec.js'],
+  seleniumAddress: env.seleniumAddress,
+  capabilities: env.capabilities,
+  specs: [
+    'browserts_spec.js',
+    'browserjs_spec.js'
+  ],
   framework: 'jasmine'
 }

spec/install/test.js

@@ -36,10 +36,10 @@ function tsc() {
   }
 }
 
-function test() {
+function test(file) {
   var options = {cwd: __dirname};
   var output = TestUtils.runCommand('node',
-      ['node_modules/protractor/bin/protractor','conf.js'],
+      ['node_modules/protractor/bin/protractor',file],
       options);
   if (output && output[1]) {
     console.log(output[1].toString());
@@ -60,4 +60,5 @@ function test() {
 
 install();
 tsc();
-test();
+test('conf.js');
+test('typescript_conf.js');

spec/install/typescript_conf.ts

@@ -0,0 +1,7 @@
+import {Config} from 'protractor';
+
+export let config: Config = {
+  mockSelenium: true,
+  specs: ['typescript_spec.js'],
+  framework: 'jasmine'
+}