deps(typescript): use typescript@~2.0.0 (angular#4062)

- move noCF tests to install and fix reference to protractor
- changed element.ts to not use keyof
- remove gulp task tsc:spec

exampleTypescript/package.json

@@ -13,6 +13,9 @@
     "@types/jasmine": "^2.5.38",
     "jasmine": "^2.4.1",
     "protractor": "file:../",
-    "typescript": "^2.1.1"
+    "typescript": "~2.0.0"
+  },
+  "devDependencies": {
+    "@types/jasminewd2": "^2.0.0"
   }
 }

gulpfile.js

@@ -94,17 +94,14 @@ gulp.task('tsc', function(done) {
   runSpawn(done, 'node', ['node_modules/typescript/bin/tsc']);
 });
 
-gulp.task('tsc:spec', function(done) {
-  runSpawn(done, 'node', ['node_modules/typescript/bin/tsc', '-p', 'ts_spec_config.json']);
-});
 
 gulp.task('prepublish', function(done) {
-  runSequence('checkVersion', 'jshint', 'tsc', 'built:copy', 'tsc:spec', done);
+  runSequence('checkVersion', 'jshint', 'tsc', 'built:copy', done);
 });
 
 gulp.task('pretest', function(done) {
   runSequence('checkVersion',
-    ['webdriver:update', 'jshint', 'tslint', 'format'], 'tsc', 'built:copy', 'tsc:spec', done);
+    ['webdriver:update', 'jshint', 'tslint', 'format'], 'tsc', 'built:copy', done);
 });
 
 gulp.task('default',['prepublish']);

lib/element.ts

@@ -17,7 +17,7 @@ let WEB_ELEMENT_FUNCTIONS = [
   'click', 'sendKeys', 'getTagName', 'getCssValue', 'getAttribute', 'getText', 'getSize',
   'getLocation', 'isEnabled', 'isSelected', 'submit', 'clear', 'isDisplayed', 'getId',
   'takeScreenshot'
-] as (keyof WebdriverWebElement)[];
+];
 
 /**
  * ElementArrayFinder is used for operations on an array of elements (as opposed

package.json

@@ -15,7 +15,7 @@
     "@types/node": "^6.0.46",
     "@types/q": "^0.0.32",
     "@types/selenium-webdriver": "~2.53.39",
-    "blocking-proxy": "0.0.4",
+    "blocking-proxy": "0.0.5",
     "chalk": "^1.1.3",
     "glob": "^7.0.3",
     "jasmine": "^2.5.3",
@@ -54,7 +54,7 @@
     "semver": "^5.3.0",
     "tslint": "~4.3.0",
     "tslint-eslint-rules": "^3.2.0",
-    "typescript": "^2.0.0",
+    "typescript": "~2.0.0",
     "vrsource-tslint-rules": "^4.0.1"
   },
   "repository": {

scripts/test.js

@@ -38,8 +38,6 @@ var passingTests = [
   'node built/cli.js spec/noGlobalsConf.js',
   'node built/cli.js spec/angular2Conf.js',
   'node built/cli.js spec/hybridConf.js',
-  'node built/cli.js spec/built/noCFSmokeConf.js',
-  'node built/cli.js spec/built/noCFPluginConf.js',
   'node scripts/driverProviderAttachSession.js',
   'node scripts/errorTest.js',
   // Interactive Element Explorer tasks

spec/install/.gitignore

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

spec/install/conf.ts

@@ -1,6 +1,6 @@
 import {Config} from 'protractor';
 
-var env = require('../environment');
+var env = require('../../environment');
 
 export let config: Config = {
   seleniumAddress: env.seleniumAddress,

spec/ts/noCF/plugin_spec.ts → spec/install/noCF/plugin_spec.ts

@@ -1,4 +1,4 @@
-import {browser, protractor} from '../../..';
+import {browser, protractor} from 'protractor';
 
 describe('category', function() {
   it('name', async function() {

spec/ts/noCF/smoke_spec.ts → spec/install/noCF/smoke_spec.ts

@@ -1,7 +1,7 @@
 // Based off of spec/basic/elements_spec.js
 import * as q from 'q';
 
-import {$, $$, browser, by, By, element, ElementArrayFinder, ElementFinder, ExpectedConditions, promise as ppromise, WebElement} from '../../..';
+import {$, $$, browser, by, By, element, ElementArrayFinder, ElementFinder, ExpectedConditions, promise as ppromise, WebElement} from 'protractor';
 
 describe('verify control flow is off', function() {
   it('should have set webdriver.promise.USE_PROMISE_MANAGER', () => {

spec/ts/noCFPluginConf.ts → spec/install/noCFPluginConf.ts

@@ -1,7 +1,7 @@
 import * as q from 'q';
-import {Config, protractor} from '../..';
+import {Config, protractor} from 'protractor';
 import {promise as wdpromise} from 'selenium-webdriver';
-const env = require('../environment.js');
+const env = require('../../environment');
 
 export let config: Config = {
   seleniumAddress: env.seleniumAddress,

spec/ts/noCFSmokeConf.ts → spec/install/noCFSmokeConf.ts

@@ -1,5 +1,5 @@
 import {Config} from '../..';
-const env = require('../environment.js');
+const env = require('../../environment');
 
 export let config: Config = {
   seleniumAddress: env.seleniumAddress,

spec/install/package.json

@@ -4,15 +4,23 @@
   "description": "e2e typescript => javascript => running",
   "main": "index.js",
   "scripts": {
-    "tsc": "node_modules/typescript/bin/tsc",
-    "test": "protractor conf.js"
+    "tsc": "tsc",
+    "test": "protractor tmp/conf.js"
   },
   "author": "",
   "license": "MIT",
   "dependencies": {
     "@types/jasmine": "^2.5.38",
+    "@types/selenium-webdriver": "^2.53.39",
     "protractor": "file:../../",
+    "q": "^1.4.1",
     "rimraf": "^2.5.4",
-    "typescript": "^2.1.1"
+    "selenium-webdriver": "^3.0.1",
+    "typescript": "~2.0.0"
+  },
+  "devDependencies": {
+    "@types/jasmine": "^2.5.41",
+    "@types/jasminewd2": "^2.0.0",
+    "@types/q": "0.0.32"
   }
 }

spec/install/test.js

@@ -60,5 +60,7 @@ function test(file) {
 
 install();
 tsc();
-test('conf.js');
-test('typescript_conf.js');
+test('tmp/conf.js');
+test('tmp/typescript_conf.js');
+test('tmp/noCFSmokeConf.js');
+test('tmp/noCFPluginConf.js');

spec/install/tsconfig.json

@@ -6,7 +6,8 @@
     "sourceMap": false,
     "declaration": false,
     "noImplicitAny": false,
-    "types": ["node", "jasmine"]
+    "types": ["node", "jasmine"],
+    "outDir": "tmp"
   },
   "exclude": [
     "node_modules",

ts_spec_config.json → spec/tsconfig.json

@@ -7,7 +7,7 @@
     "declaration": true,
     "removeComments": false,
     "noImplicitAny": true,
-    "outDir": "spec/built",
+    "outDir": "built",
     "types": [
       "jasmine", "jasminewd2", "node",
       "chalk", "glob", "minimatch",
@@ -16,6 +16,6 @@
     ]
   },
   "include": [
-    "spec/ts"
+    "ts"
   ]
 }

tsconfig.json

@@ -16,6 +16,6 @@
     "website",
     "scripts",
     "exampleTypescript",
-    "spec"
+    "spec/install"
   ]
 }