test enhancement and bug fixes on example

Author: allenhwkim

config/protractor.conf.js

@@ -6,29 +6,12 @@ exports.config = {
 
   browserName: 'chrome',
 
-  // Exclude patterns are relative to this directory.
-  // exclude: [],
-
-  // run tests in parallel
-  //capabilities: {
-  //  browserName: 'chrome',
-  //  shardTestFiles: true,
-  //  maxInstances: 10
-  //},
-
   jasmineNodeOpts: {
     showColors: true,
     isVerbose: true, // List all tests in the console
     includeStackTrace: true,
     defaultTimeoutInterval: 10000
   },
 
-  plugins: [{
-    path: __dirname + '/../node_modules/gulp-protractor/node_modules/' +
-      'protractor/node_modules/jasmine/node_modules/jasmine-core/lib/console/console.js',
-    failOnWarning: true,
-    failOnError: true
-  }],
-
   baseUrl: 'http://localhost:8888'
 };

controllers/map-controller.js

@@ -204,7 +204,6 @@
     var controlOptions = Attr2MapOptions.getControlOptions(filtered);
     var mapOptions = angular.extend(options, controlOptions);
     var mapEvents = Attr2MapOptions.getEvents($scope, filtered);
-    console.log('ng-map Options', mapOptions);
     Object.keys(mapEvents).length && console.log('ng-map Events', mapEvents);
 
     vm.mapOptions = mapOptions;

services/attr2-map-options.js

@@ -127,6 +127,14 @@
         } // catch(err2)
       } // catch(err)
 
+      // convert output more for center and position
+      if (
+        (options.key == 'center' || options.key == 'center') &&
+        output instanceof Array
+      ) {
+        output = new google.maps.LatLng(output[0], output[1]);
+      }
+
       // convert output more for shape bounds
       if (options.key == 'bounds' && output instanceof Array) {
         output = new google.maps.LatLngBounds(output[0], output[1]);

spec/e2e/testapp_spec.js

@@ -29,13 +29,7 @@ describe('testapp directory', function() {
   });
   console.log('files to run', allFiles);
 
-  afterEach(function() {
-    browser.manage().logs().get('browser').then(function(browserLog) {
-      expect(browserLog.length).toEqual(0);
-      browserLog.length && console.log(JSON.stringify(browserLog));
-    });
-  });
-
+  //TODO: apply retry when it has console error. e.g. google image 404 error
   allFiles.forEach(function(filename) {
     using(filename, function(url){
       it('testapp/'+url, function() {
@@ -50,7 +44,13 @@ describe('testapp directory', function() {
           }).then(function(map) {
             return map;
           });
-        }, 5000);
+        }, 2000);
+
+        browser.manage().logs().get('browser').then(function(browserLog) {
+          expect(browserLog.length).toEqual(0);
+          browserLog.length && console.log(JSON.stringify(browserLog));
+        });
+
       });
     });
   });

testapp/places-auto-complete.html

@@ -5,18 +5,17 @@
 <meta name="viewport" content="initial-scale=1.0, user-scalable=no" />
 <script src="script-tags-for-development.js"></script>
 <script>
-angular.module('myApp', ['ngMap'])
- .controller('MyCtrl', function() {
-   var vm = this;
-   vm.types = "['establishment']";
-   vm.placeChanged = function() {
-     vm.place = this.getPlace();
-     console.log(
-       vm.place.geometry.location.lat(),
-       vm.place.geometry.location.lng()
-     );
-     vm.map.setCenter(vm.place.geometry.location);
-   }
+angular.module('myApp', ['ngMap']).controller('MyCtrl', function(NgMap) {
+  var vm = this;
+  vm.types = "['establishment']";
+  vm.placeChanged = function() {
+    vm.place = this.getPlace();
+    console.log('location', vm.place.geometry.location);
+    vm.map.setCenter(vm.place.geometry.location);
+  }
+  NgMap.getMap().then(function(map) {
+    vm.map = map;
+  });
  });
 </script>
 </head>
@@ -43,4 +42,3 @@
   <map></ng-map>
 </body>
 </html>
-