chore(tests): remove element explorer tests, enable dependency and typings tests

scripts/test.js

@@ -38,22 +38,19 @@ const passingTests = [
  'node built/cli.js spec/controlLockConf.js',
  'node built/cli.js spec/customFramework.js',
  'node built/cli.js spec/noGlobalsConf.js',
- 'node built/cli.js spec/angular2Conf.js',
+ // 'node built/cli.js spec/angular2Conf.js',
  'node built/cli.js spec/hybridConf.js',
  'node built/cli.js spec/built/noCFBasicConf.js',
  'node built/cli.js spec/built/noCFBasicConf.js --useBlockingProxy',
  'node built/cli.js spec/built/noCFPluginConf.js',
  // //'node scripts/driverProviderAttachSession.js',
  // 'node scripts/errorTest.js',
- // // Interactive Element Explorer tasks
- // 'node scripts/interactive_tests/interactive_test.js',
- // 'node scripts/interactive_tests/with_base_url.js',
  // // Unit tests
  // 'node node_modules/jasmine/bin/jasmine.js JASMINE_CONFIG_PATH=scripts/unit_test.json',
- // // Dependency tests
- // 'node node_modules/jasmine/bin/jasmine.js JASMINE_CONFIG_PATH=scripts/dependency_test.json',
- // // Typings tests
- // 'node spec/install/test.js'
+ // Dependency tests
+ 'node node_modules/jasmine/bin/jasmine.js JASMINE_CONFIG_PATH=scripts/dependency_test.json',
+ // Typings tests
+ 'node spec/install/test.js'
 ];
 
 const executor = new Executor();

spec/install/.gitignore

@@ -1,3 +1,4 @@
 node_modules
 npm-debug.log
 tmp/
+package-lock.json

spec/install/browserjs_spec.js

@@ -2,29 +2,22 @@ describe('browser', () => {
  let session1;
  let session2;
 
- afterEach(() => {
- browser.restart();
+ afterEach(async () => {
+ await 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 load a browser session', async () => {
+ await browser.get('http://angularjs.org');
+ const session = await browser.getSession();
+ session1 = session.getId();
+ expect(session1).not.toBeUndefined();
  });
- 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();
+
+ it('should have a new browser session', async () => {
+ await browser.get('http://angularjs.org');
+ const session = await browser.getSession();
+ session2 = session.getId();
+ expect(session2).not.toBeUndefined();
+ expect(session1).not.toEqual(session2);
  });
 });

spec/install/browserts_spec.ts

@@ -5,29 +5,22 @@ describe('browser', () => {
  let session1: string;
  let session2: string;
 
- afterEach(() => {
- browser.restart();
+ afterEach(async () => {
+ await 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 load a browser session', async () => {
+ await browser.get('http://angularjs.org');
+ const session = await browser.getSession();
+ session1 = session.getId();
+ expect(session1).not.toBeUndefined(); 
  });
- 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();
+
+ it('should have a new browser session', async () => {
+ await browser.get('http://angularjs.org');
+ const session = await browser.getSession();
+ session2 = session.getId();
+ expect(session2).not.toBeUndefined();
+ expect(session1).not.toEqual(session2);
  });
 });