1. arranged config files. 2. added e2e protractor test 3. refactored some test-related javascripts

Author: allenhwkim

karma.conf.js renamed to config/karma.conf.js

@@ -16,31 +16,29 @@ module.exports = function(config) {
     // list of files / patterns to load in the browser
     files: [
       // libraries
-      'spec/lib/angular.js',
-      'spec/lib/angular-mocks.js',
+      __dirname + '/../spec/lib/angular.js',
+      __dirname + '/../spec/lib/angular-mocks.js',
       'https://maps.google.com/maps/api/js',
-      'spec/lib/markerclusterer.js',
+      __dirname + '/../spec/lib/markerclusterer.js',
 
       // our app
-      'app/scripts/app.js',
-      'app/scripts/directives/*.js',
-      'app/scripts/services/*.js',
+      __dirname + '/../app/scripts/app.js',
+      __dirname + '/../app/scripts/directives/*.js',
+      __dirname + '/../app/scripts/services/*.js',
 
       // tests
-      'spec/directives/*_spec.js',
-      'spec/services/*_spec.js'
+      __dirname + '/../spec/directives/*_spec.js',
+      __dirname + '/../spec/services/*_spec.js'
     ],
 
 
     // list of files to exclude
-    exclude: [
-    ],
+    exclude: [ ],
 
 
     // preprocess matching files before serving them to the browser
     // available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
-    preprocessors: {
-    },
+    preprocessors: { },
 
 
     // test results reporter to use

config/protractor.conf.js

@@ -0,0 +1,20 @@
+// The main suite of Protractor tests.
+exports.config = {
+  seleniumServerJar: __dirname + 
+    '/../node_modules/gulp-protractor' +
+    '/node_modules/protractor/selenium/selenium-server-standalone-2.44.0.jar',
+
+  browserName: 'chrome',
+
+  // Exclude patterns are relative to this directory.
+  // exclude: [],
+
+  jasmineNodeOpts: {
+    showColors: true,
+    isVerbose: true, // List all tests in the console
+    includeStackTrace: true,
+    defaultTimeoutInterval: 30000
+  }
+
+  //baseUrl: 'http://localhost:8081'
+};

gulpfile.js

@@ -4,7 +4,6 @@ var uglify = require('gulp-uglify');
 var debug = require('gulp-debug');
 var rename = require('gulp-rename');
 var stripDebug = require('gulp-strip-debug');
-var filesize = require('gulp-filesize');
 var gutil = require('gulp-util');
 var clean = require('gulp-clean');
 var runSequence = require('run-sequence');
@@ -14,6 +13,9 @@ var replace = require('gulp-replace');
 var tap = require('gulp-tap');
 var bump = require('gulp-bump');
 var shell = require('gulp-shell');
+var karma = require('karma').server;
+var connect = require('gulp-connect');
+var gulpProtractor = require("gulp-protractor").protractor;
 var bumpVersion = function(type) {
   type = type || 'patch';
   var version = '';
@@ -42,17 +44,17 @@ gulp.task('clean', function() {
 });
 
 gulp.task('build-js', function() {
-  return gulp.src(['app/scripts/app.js',
-    'app/scripts/services/*.js',
-    'app/scripts/directives/*.js'])
+  return gulp.src([
+      'app/scripts/app.js',
+      'app/scripts/services/*.js',
+      'app/scripts/directives/*.js'
+    ])
     .pipe(concat('ng-map.js'))
     .pipe(gulp.dest('build/scripts'))
-    .pipe(filesize())
     .pipe(stripDebug())
     .pipe(uglify())
     .pipe(rename('ng-map.min.js'))
     .pipe(gulp.dest('build/scripts'))
-    .pipe(filesize())
     .on('error', gutil.log);
 });
 
@@ -74,6 +76,37 @@ gulp.task('build', function(callback) {
   runSequence('clean', 'build-js', 'test', 'docs', callback);
 });
 
-gulp.task('test', shell.task([
-  './node_modules/karma/bin/karma start'
-]));
+gulp.task('test', function (done) {
+  karma.start({
+    configFile: __dirname + '/config/karma.conf.js',
+    singleRun: true
+  }, done);
+});
+
+gulp.task('testapp-server',  function() {
+  connect.server({
+    root: __dirname + '/testapp',
+    port: 8888
+  });
+});
+
+/**
+ * For first-time user, we need to update webdrivers
+ * $ node_modules/gulp-protractor/node_modules/protractor/bin/webdriver-manager update
+ */
+gulp.task('e2e-test', ['testapp-server'], function() {
+  gulp.src([__dirname + "/spec/e2e/*_spec.js"])  
+    .pipe(gulpProtractor({
+      configFile: __dirname + "/config/protractor.conf.js",
+      args: [
+        '--baseUrl', 'http://localhost:8888'
+      ]
+    })) 
+    .on('error', function(e) { 
+      throw e;
+    })
+    .on('end', function() { // when process exits:
+      connect.serverClose();
+    });
+});
+

package.json

@@ -3,8 +3,8 @@
   "version": "1.2.1",
   "main": "build/scripts/ng-map.js",
   "dependencies": {
-    "gulp": "~3.7.0",
-    "glob": "~4.0.2"
+    "glob": "~4.0.2",
+    "gulp": "^3.8.0"
   },
   "engines": {
     "node": ">=0.8.0"
@@ -19,9 +19,10 @@
     "gulp-bump": "~0.1.9",
     "gulp-clean": "~0.3.0",
     "gulp-concat": "~2.2.0",
+    "gulp-connect": "^2.2.0",
     "gulp-debug": "~0.3.0",
-    "gulp-filesize": "0.0.6",
     "gulp-html-replace": "~1.1.0",
+    "gulp-protractor": "0.0.12",
     "gulp-rename": "~1.2.0",
     "gulp-replace": "~0.3.0",
     "gulp-rev": "~0.4.0",
@@ -36,8 +37,9 @@
     "karma-jasmine": "~0.1.5",
     "karma-ng-html2js-preprocessor": "~0.1.0",
     "karma-phantomjs-launcher": "~0.1.4",
-    "protractor": "~0.23.1",
     "run-sequence": "~0.3.6",
-    "through2": "~0.5.1"
+    "selenium-webdriver": "^2.44.0",
+    "through2": "~0.5.1",
+    "zeparser": "0.0.7"
   }
 }