Merge branch 'feature/first-tests' into develop

Author: CloudNiner

.jshintrc

@@ -53,10 +53,14 @@
 
   "browser": true,
   "node": true,
+  "mocha": true,
 
   "globals": {
     "angular": false,
     "L": false,
-    "$": false
+    "$": false,
+    "jasmine": false,
+    "inject": false,
+    "expect": false
   }
 }

dist/azavea-ng-leaflet.js

@@ -106,6 +106,7 @@
 
             ctl.getMap = getMap;
             ctl.setMap = setMap;
+            ctl.invalidateMapSize = invalidateMapSize;
         }
 
         /**
@@ -124,8 +125,15 @@
 
             // This helps in some situations where the map isn't initially rendered correctly due
             // to the container size being changed.
+            invalidateMapSize();
+        }
+
+        function invalidateMapSize() {
+            if (!_map) {
+                return;
+            }
             $timeout(function() {
-                map.invalidateSize();
+                _map.invalidateSize();
             }, 0);
         }
     }
@@ -334,13 +342,7 @@
             AZLeafletData.setMap(map, attrs.id);
 
             scope.$on('$destroy', onScopeDestroy);
-            scope.$on('az.leaflet.invalidatesize', onInvalidateSize);
-
-            function onInvalidateSize() {
-                $timeout(function () {
-                    map.invalidateSize();
-                });
-            }
+            scope.$on('az.leaflet.invalidatesize', controller.invalidateMapSize);
 
             function onScopeDestroy() {
                 map.remove();

dist/azavea-ng-leaflet.min.js

@@ -18,21 +18,33 @@ var rootDirectory = path.resolve('./');
 
 // Source directory for build process
 var sourceDirectory = path.join(rootDirectory, './src');
+// Test directory for test files
+var testDirectory = path.join(rootDirectory, './test');
 
 var sourceFiles = [
 
   // Make sure module files are handled first
   path.join(sourceDirectory, '/**/module.js'),
 
   // Then add all JavaScript files
-  path.join(sourceDirectory, '/**/*.js')
+  path.join(sourceDirectory, '/**/*.js'),
+
+];
+
+var testFiles = [
+  // All unit test files
+  path.join(testDirectory, '/unit/**/*.spec.js'),
+
+  path.join(testDirectory, '/e2e/**/*.spec.js')
 ];
 
+var allFiles = sourceFiles + testFiles;
+
 var lintFiles = [
   'gulpfile.js',
   // Karma configuration
-  'karma-*.conf.js'
-].concat(sourceFiles);
+  'karma.conf.js'
+].concat(allFiles);
 
 gulp.task('build', function() {
   gulp.src(sourceFiles)
@@ -49,7 +61,7 @@ gulp.task('build', function() {
  * Process
  */
 gulp.task('process-all', function (done) {
-  runSequence('jshint', 'test-src', 'build', done);
+  runSequence('jshint', 'test', 'build', done);
 });
 
 /**
@@ -58,7 +70,7 @@ gulp.task('process-all', function (done) {
 gulp.task('watch', function () {
 
   // Watch JavaScript files
-  gulp.watch(sourceFiles, ['process-all']);
+  gulp.watch(allFiles, ['process-all']);
 });
 
 /**
@@ -75,29 +87,9 @@ gulp.task('jshint', function () {
 /**
  * Run test once and exit
  */
-gulp.task('test-src', function (done) {
-  karma.start({
-    configFile: __dirname + '/karma-src.conf.js',
-    singleRun: true
-  }, done);
-});
-
-/**
- * Run test once and exit
- */
-gulp.task('test-dist-concatenated', function (done) {
-  karma.start({
-    configFile: __dirname + '/karma-dist-concatenated.conf.js',
-    singleRun: true
-  }, done);
-});
-
-/**
- * Run test once and exit
- */
-gulp.task('test-dist-minified', function (done) {
+gulp.task('test', function (done) {
   karma.start({
-    configFile: __dirname + '/karma-dist-minified.conf.js',
+    configFile: __dirname + '/karma.conf.js',
     singleRun: true
   }, done);
 });

gulpfile.js

@@ -10,23 +10,21 @@ module.exports = function(config) {
 
     // frameworks to use
     // available frameworks: https://npmjs.org/browse/keyword/karma-adapter
-    frameworks: ['mocha', 'chai-jquery', 'jquery-1.8.3', 'sinon-chai'],
+    frameworks: ['jasmine', 'jquery-1.8.3'],
 
     plugins: [
-      'karma-mocha',
-      'karma-chai',
-      'karma-sinon-chai',
       'karma-chrome-launcher',
       'karma-phantomjs-launcher',
       'karma-jquery',
-      'karma-chai-jquery',
+      'karma-jasmine',
       'karma-spec-reporter'
     ],
 
     // list of files / patterns to load in the browser
     files: [
       'bower/angular/angular.js',
       'bower/angular-mocks/angular-mocks.js',
+      'bower/leaflet/dist/leaflet-src.js',
       'src/**/module.js',
       'src/**/*.js',
       'test/unit/**/*.js'

karma-dist-concatenated.conf.js

@@ -28,21 +28,15 @@
     "gulp-plumber": "^0.6.6",
     "gulp-rename": "^1.2.0",
     "gulp-uglify": "^0.3.1",
+    "jasmine-core": "^2.4.1",
     "jshint-stylish": "^0.4.0",
     "karma": "^0.12.22",
-    "karma-chai": "^0.1.0",
-    "karma-chai-jquery": "^1.0.0",
     "karma-chrome-launcher": "^0.1.4",
-    "karma-jasmine": "^0.1.5",
+    "karma-jasmine": "^0.3.6",
     "karma-jquery": "^0.1.0",
-    "karma-mocha": "^0.1.8",
     "karma-phantomjs-launcher": "^0.1.4",
-    "karma-sinon-chai": "^0.2.0",
     "karma-spec-reporter": "^0.0.18",
-    "mocha": "^1.21.4",
-    "run-sequence": "^1.0.2",
-    "sinon": "^1.10.3",
-    "sinon-chai": "^2.5.0"
+    "run-sequence": "^1.0.2"
   },
   "engines": {
     "node": ">=0.8.0"

karma-dist-minified.conf.js

@@ -13,6 +13,7 @@
 
             ctl.getMap = getMap;
             ctl.setMap = setMap;
+            ctl.invalidateMapSize = invalidateMapSize;
         }
 
         /**
@@ -31,8 +32,15 @@
 
             // This helps in some situations where the map isn't initially rendered correctly due
             // to the container size being changed.
+            invalidateMapSize();
+        }
+
+        function invalidateMapSize() {
+            if (!_map) {
+                return;
+            }
             $timeout(function() {
-                map.invalidateSize();
+                _map.invalidateSize();
             }, 0);
         }
     }

karma-src.conf.js renamed to karma.conf.js

@@ -36,13 +36,7 @@
             AZLeafletData.setMap(map, attrs.id);
 
             scope.$on('$destroy', onScopeDestroy);
-            scope.$on('az.leaflet.invalidatesize', onInvalidateSize);
-
-            function onInvalidateSize() {
-                $timeout(function () {
-                    map.invalidateSize();
-                });
-            }
+            scope.$on('az.leaflet.invalidatesize', controller.invalidateMapSize);
 
             function onScopeDestroy() {
                 map.remove();