addresses comments

- globals to use protractor.browser instead of global['protractor']['browser']
- set subfolders as part of a utils object
- clean up tests (mocks and typings clean up)
- fix typo util should be until with a missing until test

Author: cnishina

Diff for: globals.ts

@@ -9,13 +9,13 @@ import {
 } from 'protractor';
 
 export let protractor: Ptor = global['protractor'];
-export let browser: ProtractorBrowser = global['protractor']['browser'];
-export let $: (search: string) => ElementFinder = global['protractor']['$'];
-export let $$: (search: string) => ElementArrayFinder = global['protractor']['$$'];
-export let element: ElementHelper = global['protractor']['element'];
-export let By: ProtractorBy = global['protractor']['By'];
-export let by: ProtractorBy = global['protractor']['by'];
+export let browser: ProtractorBrowser = protractor.browser;
+export let $: (search: string) => ElementFinder = protractor.$;
+export let $$: (search: string) => ElementArrayFinder = protractor.$$;
+export let element: ElementHelper = protractor.element;
+export let By: ProtractorBy = protractor.By;
+export let by: ProtractorBy = protractor.by;
 export let wrapDriver:
     (webdriver: any, baseUrl?: string, rootElement?: string,
-     untrackOutstandingTimeouts?: boolean) => ProtractorBrowser = global['protractor']['wrapDriver'];
-export let ExpectedConditions: ProtractorExpectedConditions = global['protractor']['ExpectedConditions'];
+     untrackOutstandingTimeouts?: boolean) => ProtractorBrowser = protractor.wrapDriver;
+export let ExpectedConditions: ProtractorExpectedConditions = protractor.ExpectedConditions;

Diff for: lib/ptor.ts

@@ -43,12 +43,14 @@ export class Ptor {
   error = webdriver.error;
   logging = webdriver.logging;
   promise = webdriver.promise;
-  util = webdriver.util;
+  until = webdriver.until;
   Command = require('selenium-webdriver/lib/command').Command;
   CommandName = require('selenium-webdriver/lib/command').Name;
-  firefox = require('selenium-webdriver/firefox');
-  http = require('selenium-webdriver/http');
-  remote = require('selenium-webdriver/remote');
+  utils = {
+    firefox: require('selenium-webdriver/firefox'),
+    http: require('selenium-webdriver/http'),
+    remote: require('selenium-webdriver/remote')
+  }
 }
 
 export var Protractor = new Ptor();

Diff for: spec/install/conf.ts

@@ -1,7 +1,7 @@
 import {Config} from 'protractor';
 
 export let config: Config = {
-  seleniumAddress: 'http://127.0.0.1:4444/wd/hub',
+  mockSelenium: true,
   specs: ['*_spec.js'],
   framework: 'jasmine'
 }

Diff for: spec/install/javascript_spec.js

@@ -26,11 +26,12 @@ describe('javascript', function () {
         expect(typeof protractor.error).toEqual('object');
         expect(typeof protractor.logging).toEqual('object');
         expect(typeof protractor.promise).toEqual('object');
+        expect(typeof protractor.until).toEqual('object');
         expect(typeof protractor.Command).toEqual('function');
         expect(typeof protractor.CommandName).toEqual('object');
-        expect(typeof protractor.firefox).toEqual('object');
-        expect(typeof protractor.http).toEqual('object');
-        expect(typeof protractor.remote).toEqual('object');
+        expect(typeof protractor.utils.firefox).toEqual('object');
+        expect(typeof protractor.utils.http).toEqual('object');
+        expect(typeof protractor.utils.remote).toEqual('object');
     });
     it('should have protractor class definitions', function () {
         expect(typeof protractor.ProtractorBrowser).toBe('function');

Diff for: spec/install/typescript_spec.ts

@@ -29,11 +29,12 @@ describe('typescript imports', () => {
     expect(typeof protractor.error).toEqual('object');
     expect(typeof protractor.logging).toEqual('object');
     expect(typeof protractor.promise).toEqual('object');
+    expect(typeof protractor.until).toEqual('object');
     expect(typeof protractor.Command).toEqual('function');
     expect(typeof protractor.CommandName).toEqual('object');
-    expect(typeof protractor.firefox).toEqual('object');
-    expect(typeof protractor.http).toEqual('object');
-    expect(typeof protractor.remote).toEqual('object');
+    expect(typeof protractor.utils.firefox).toEqual('object');
+    expect(typeof protractor.utils.http).toEqual('object');
+    expect(typeof protractor.utils.remote).toEqual('object');
   });
   it('should have protractor class definitions', () => {
     expect(typeof protractor.ProtractorBrowser).toBe('function');

Diff for: spec/install/typings.json

@@ -3,7 +3,6 @@
   "dependencies": {},
   "globalDependencies": {
     "jasmine": "registry:dt/jasmine#2.2.0+20160621224255",
-    "node": "registry:dt/node#6.0.0+20160802155038",
-    "rimraf": "registry:dt/rimraf#0.0.0+20160317120654"
+    "node": "registry:dt/node#6.0.0+20160802155038"
   }
 }