test(ngHint): fix configs for testing

Author: btford

conf.js

@@ -1,5 +1,5 @@
 exports.config = {
-  seleniumAddress: 'http://localhost:4444/wd/hub',
+  seleniumServerJar: './node_modules/protractor/selenium/selenium-server-standalone-2.42.2.jar',
 
   capabilities: {
     'browserName': 'chrome'
@@ -10,4 +10,4 @@ exports.config = {
   jasmineNodeOpts: {
     showColors: true
   }
-};
+};

gulpfile.js

@@ -1,16 +1,52 @@
 var gulp = require('gulp');
 var source = require('vinyl-source-stream');
 var browserify = require('browserify');
+var exec = require('child_process').exec;
+var http = require('http');
+var st = require('st');
+var Router = require('routes-router');
 
 var main = require('./package.json').main;
 
-gulp.task('watch', function(){
-  gulp.watch(['./**/*.js', '!./dist/*.js'], ['browserify']);
+gulp.task('watch', function() {
+  gulp.watch(['./*.js'], ['browserify']);
 });
 
 gulp.task('browserify', function() {
   var bundleStream = browserify('./' + main).bundle().pipe(source(main));
   return bundleStream.pipe(gulp.dest('./dist'));
 });
 
-gulp.task('default', ['browserify']);
+
+gulp.task('serve', startServer);
+
+function startServer() {
+  var app = Router();
+  app.addRoute('/*', st({
+    path: __dirname + '/',
+    url: '/',
+    index: 'index.html'
+  }));
+  server = http.createServer(app);
+  server.listen(8080);
+  return server;
+}
+
+gulp.task('protractor', ['webdriver'], function (cb) {
+  var server = startServer();
+  exec('./node_modules/.bin/protractor conf.js', function (err, stdout, stderr) {
+    server.close();
+    if (err) {
+      console.log(stdout, stderr);
+    }
+    cb(err);
+  });
+});
+
+gulp.task('webdriver', function (cb) {
+  exec('./node_modules/.bin/webdriver-manager update', cb);
+});
+
+gulp.task('test', ['webdriver', 'protractor']);
+gulp.task('build', ['browserify']);
+gulp.task('default', ['build', 'test']);

hint_test.js

@@ -18,27 +18,24 @@ describe('angularHint', function() {
     // });
 
     it('should have an inclusive mode', function() {
-      browser.get('http://localhost:8080/e2e/inclusiveHint');
-      ptor.sleep(5000);
+      browser.get('http://localhost:8080/e2e/inclusiveHint/');
       expect(element(by.id('title')).getText()).toBe('Inclusive Hint Example');
       expect(element(by.id('console')).getText()).toContain('Angular best practices are to manipulate the DOM in the view.');
       expect(element(by.id('console')).getText()).not.toContain('Directive');
     });
 
     it('should have an exclusive mode', function() {
-      browser.get('http://localhost:8080/e2e/exclusiveHint');
-      ptor.sleep(5000);
+      browser.get('http://localhost:8080/e2e/exclusiveHint/');
       expect(element(by.id('title')).getText()).toBe('Exclusive Hint Example');
       expect(element(by.id('console')).getText()).not.toContain('Angular best practices are to manipulate the DOM in the view.');
       expect(element(by.id('console')).getText()).toContain('Directive');
     });
 
     it('should not add modules if ng-hint is not included', function() {
-      browser.get('http://localhost:8080/e2e/noHint');
-      ptor.sleep(5000);
+      browser.get('http://localhost:8080/e2e/noHint/');
       expect(element(by.id('title')).getText()).toBe('No Hint Example');
       expect(element(by.id('console')).getText()).not.toContain('Angular best practices are to manipulate the DOM in the view.');
       expect(element(by.id('console')).getText()).not.toContain('Directives');
     });
   });
-});
+});

package.json

@@ -25,17 +25,16 @@
   },
   "homepage": "https://github.com/angular/angular-hint",
   "dependencies": {
-    "browserify": "^4.2.0",
     "controller-training": "git://github.com/angular/angular-hint-dom",
-    "directive-director": "git://github.com/angular/angular-hint-directives",
-    "gulp": "^3.8.5",
-    "karma": "^0.12.16",
-    "karma-chrome-launcher": "^0.1.4",
-    "karma-jasmine": "^0.1.5"
+    "directive-director": "git://github.com/angular/angular-hint-directives"
   },
   "devDependencies": {
     "browserify": "^4.2.0",
     "gulp": "^3.8.5",
+    "http-server": "^0.6.1",
+    "protractor": "^1.0.0-rc4",
+    "routes-router": "^3.3.0",
+    "st": "^0.5.1",
     "vinyl-source-stream": "^0.1.1"
   }
 }