Skip to content
This repository has been archived by the owner on Dec 1, 2020. It is now read-only.

Commit

Permalink
- ran e2e tests successfully for angular pre-1.6.0
Browse files Browse the repository at this point in the history
- updated test pages to angular post-1.6.0
- ran e2e tests successfully for angular post-1.6.0
- error handling update to gulpfile
  • Loading branch information
Jacob Wasilkowski committed Jan 16, 2017
1 parent 25b04c1 commit e511e51
Show file tree
Hide file tree
Showing 22 changed files with 29 additions and 28 deletions.
3 changes: 2 additions & 1 deletion gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,8 @@ gulp.task('test', ['karma-coverage', 'serve-test'], function() {
browserSync.exit();
})
.on('error', function(e) {
throw e;
browserSync.exit();
gutil.log(e);
});
});

Expand Down
2 changes: 1 addition & 1 deletion test/add-remove-layers.html
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ <h2>Add/Remove Layers</h2>
<!-- load Esri JavaScript API -->
<script type="text/javascript" src="//js.arcgis.com/3.11compact"></script>
<!-- load Angular -->
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.0/angular.js"></script>
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.6.1/angular.js"></script>
<!-- load angular-esri-map directives -->
<script src="lib/angular-esri-map.js"></script>
<!-- run example app controller -->
Expand Down
4 changes: 2 additions & 2 deletions test/additional-map-options.html
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ <h3>Inline Object Hash Attribute String, along with a WebmapId</h3>
<!-- load Esri JavaScript API -->
<script type="text/javascript" src="//js.arcgis.com/3.11compact"></script>
<!-- load Angular -->
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.0/angular.js"></script>
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.0/angular-sanitize.js"></script>
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.6.1/angular.js"></script>
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.6.1/angular-sanitize.js"></script>
<!-- load angular-esri-map directives -->
<script src="lib/angular-esri-map.js"></script>
<!-- run example app controller -->
Expand Down
2 changes: 1 addition & 1 deletion test/custom-basemap.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ <h2>Custom Basemap</h2>
<!-- load Esri JavaScript API -->
<script type="text/javascript" src="//js.arcgis.com/3.13compact"></script>
<!-- load Angular -->
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.0/angular.min.js"></script>
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.6.1/angular.js"></script>
<!-- load angular-esri-map directives -->
<script src="lib/angular-esri-map.js"></script>
<!-- run example app controller -->
Expand Down
2 changes: 1 addition & 1 deletion test/custom-directive.html
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ <h2>Custom Directive</h2>
<!-- NOTE: BlendRenderer requires v3.14 -->
<script type="text/javascript" src="//js.arcgis.com/3.14compact"></script>
<!-- load Angular -->
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.0/angular.js"></script>
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.6.1/angular.js"></script>
<!-- load just the angular-esri-map core services -->
<script src="lib/angular-esri-core.js"></script>
<!-- run example app controller -->
Expand Down
2 changes: 1 addition & 1 deletion test/custom-factory.html
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ <h2>Custom Factory</h2>
<!-- load Esri JavaScript API -->
<script type="text/javascript" src="//js.arcgis.com/3.13compact"></script>
<!-- load Angular -->
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.0/angular.min.js"></script>
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.6.1/angular.js"></script>
<!-- load angular-esri-map directives -->
<script src="lib/angular-esri-map.js"></script>
<!-- run example app controller -->
Expand Down
2 changes: 1 addition & 1 deletion test/deferred-map.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ <h2>Deferred Map</h2>
</div>

<!-- load Angular -->
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.0/angular.js"></script>
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.6.1/angular.js"></script>
<!-- load angular-esri-map directives -->
<script src="lib/angular-esri-map.js"></script>
<!-- run example app controller -->
Expand Down
2 changes: 1 addition & 1 deletion test/dynamic-map-service-layer.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ <h2>Dynamic Map Service Layer</h2>
<!-- load Esri JavaScript API -->
<script type="text/javascript" src="//js.arcgis.com/3.11compact"></script>
<!-- load Angular -->
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.0/angular.min.js"></script>
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.6.1/angular.js"></script>
<!-- load angular-esri-map directives -->
<script src="lib/angular-esri-map.js"></script>
<!-- run example app controller -->
Expand Down
2 changes: 1 addition & 1 deletion test/dynamic-map-service-layers.html
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ <h2>Dynamic Map Service Layers</h2>
<!-- load Esri JavaScript API -->
<script type="text/javascript" src="//js.arcgis.com/3.11compact"></script>
<!-- load Angular -->
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.0/angular.min.js"></script>
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.6.1/angular.js"></script>
<!-- load angular-esri-map directives -->
<script src="lib/angular-esri-map.js"></script>
<!-- run example app controller -->
Expand Down
8 changes: 4 additions & 4 deletions test/e2e/specs/set-center-zoom.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ describe('Set Map Center and Zoom', function() {
expectedLat = '37.75',
expectedLng = '-122.45';
expect(newValue).toEqual(expectedZoom);
expect(zoomSelect.getAttribute('value')).toEqual(expectedZoom);
expect(zoomSelect.getAttribute('value')).toEqual('number:' + expectedZoom);
expect(lat.getAttribute('value')).toEqual(expectedLat);
expect(lng.getAttribute('value')).toEqual(expectedLng);
});
Expand All @@ -48,8 +48,8 @@ describe('Set Map Center and Zoom', function() {
var expectedZoom = '12',
expectedLat = '40.7127',
expectedLng = '-74.0059';
expect(newValue).toEqual(expectedZoom.toString());
expect(zoomSelect.getAttribute('value')).toEqual(expectedZoom);
expect(newValue).toEqual(expectedZoom);
expect(zoomSelect.getAttribute('value')).toEqual('number:' + expectedZoom);
expect(lat.getAttribute('value')).toEqual(expectedLat);
expect(lng.getAttribute('value')).toEqual(expectedLng);
});
Expand All @@ -65,4 +65,4 @@ describe('Set Map Center and Zoom', function() {
expect(newValue).toEqual(expectedZoom);
});
});
});
});
2 changes: 1 addition & 1 deletion test/feature-layers.html
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ <h2>Feature Layers</h2>
<!-- load Esri JavaScript API -->
<script type="text/javascript" src="//js.arcgis.com/3.11compact"></script>
<!-- load Angular -->
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.0/angular.js"></script>
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.6.1/angular.js"></script>
<!-- load angular-esri-map directives -->
<script src="lib/angular-esri-map.js"></script>
<!-- run example app controller -->
Expand Down
2 changes: 1 addition & 1 deletion test/layer-events.html
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ <h2>Layer Events</h2>
<!-- load Esri JavaScript API -->
<script type="text/javascript" src="//js.arcgis.com/3.11compact"></script>
<!-- load Angular -->
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.0/angular.js"></script>
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.6.1/angular.js"></script>
<!-- load angular-esri-map directives -->
<script src="lib/angular-esri-map.js"></script>
<!-- run example app controller -->
Expand Down
2 changes: 1 addition & 1 deletion test/legend.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ <h2>Legend</h2>
<!-- load Esri JavaScript API -->
<script type="text/javascript" src="//js.arcgis.com/3.11compact"></script>
<!-- load Angular -->
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.0/angular.js"></script>
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.6.1/angular.js"></script>
<!-- load angular-esri-map directives -->
<script src="lib/angular-esri-map.js"></script>
<!-- run example app controller -->
Expand Down
2 changes: 1 addition & 1 deletion test/map-events.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ <h2>Map Events</h2>
<!-- load Esri JavaScript API -->
<script type="text/javascript" src="//js.arcgis.com/3.11compact"></script>
<!-- load Angular -->
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.0/angular.js"></script>
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.6.1/angular.js"></script>
<!-- load angular-esri-map directives -->
<script src="lib/angular-esri-map.js"></script>
<!-- run example app controller -->
Expand Down
2 changes: 1 addition & 1 deletion test/other-esri-modules.html
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ <h2>Other Esri Modules</h2>
<!-- load Esri JavaScript API -->
<script type="text/javascript" src="//js.arcgis.com/3.11compact"></script>
<!-- load Angular -->
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.0/angular.js"></script>
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.6.1/angular.js"></script>
<!-- load angular-esri-map directives -->
<script src="lib/angular-esri-map.js"></script>
<!-- run example app controller -->
Expand Down
2 changes: 1 addition & 1 deletion test/registry-pattern.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ <h2>Registry Pattern</h2>
<!-- load Esri JavaScript API -->
<script type="text/javascript" src="//js.arcgis.com/3.11compact"></script>
<!-- load Angular -->
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.0/angular.js"></script>
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.6.1/angular.js"></script>
<!-- load angular-esri-map directives -->
<script src="lib/angular-esri-map.js"></script>
<!-- run example app controller -->
Expand Down
2 changes: 1 addition & 1 deletion test/set-basemap.html
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ <h2>Set Basemap</h2>
<!-- load Esri JavaScript API -->
<script type="text/javascript" src="//js.arcgis.com/3.11compact"></script>
<!-- load Angular -->
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.0/angular.js"></script>
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.6.1/angular.js"></script>
<!-- load angular-esri-map directives -->
<script src="lib/angular-esri-map.js"></script>
<!-- run example app controller -->
Expand Down
2 changes: 1 addition & 1 deletion test/set-center-zoom.html
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ <h2>Set Map Center and Zoom</h2>
<!-- load Esri JavaScript API -->
<script type="text/javascript" src="//js.arcgis.com/3.11compact"></script>
<!-- load Angular -->
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.0/angular.js"></script>
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.6.1/angular.js"></script>
<!-- load angular-esri-map directives -->
<script src="lib/angular-esri-map.js"></script>
<!-- run example app controller -->
Expand Down
2 changes: 1 addition & 1 deletion test/simple-map.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ <h2>Simple Map</h2>
<!-- load Esri JavaScript API -->
<script type="text/javascript" src="//js.arcgis.com/3.11compact"></script>
<!-- load Angular -->
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.0/angular.js"></script>
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.6.1/angular.js"></script>
<!-- load angular-esri-map directives -->
<script src="lib/angular-esri-map.js"></script>
<!-- run example app controller -->
Expand Down
2 changes: 1 addition & 1 deletion test/vector-tile-layer.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ <h2>Vector Tile Layer</h2>
<!-- load Esri JavaScript API -->
<script type="text/javascript" src="//js.arcgis.com/3.15compact"></script>
<!-- load Angular -->
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.0/angular.js"></script>
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.6.1/angular.js"></script>
<!-- load angular-esri-map directives -->
<script src="lib/angular-esri-map.js"></script>
<!-- run example app controller -->
Expand Down
4 changes: 2 additions & 2 deletions test/web-map-webmapid-param.html
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ <h2>Web Map Param: {{itemInfo.item.title}}
<!-- load Esri JavaScript API -->
<script type="text/javascript" src="//js.arcgis.com/3.11compact"></script>
<!-- load Angular -->
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.0/angular.js"></script>
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.0/angular-sanitize.js"></script>
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.6.1/angular.js"></script>
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.6.1/angular-sanitize.js"></script>
<!-- load angular-esri-map directives -->
<script src="lib/angular-esri-map.js"></script>
<!-- run example app controller -->
Expand Down
4 changes: 2 additions & 2 deletions test/web-map.html
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ <h2>Web Map: {{itemInfo.item.title}}
<!-- load Esri JavaScript API -->
<script type="text/javascript" src="//js.arcgis.com/3.11compact"></script>
<!-- load Angular -->
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.0/angular.js"></script>
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.0/angular-sanitize.js"></script>
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.6.1/angular.js"></script>
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.6.1/angular-sanitize.js"></script>
<!-- load angular-esri-map directives -->
<script src="lib/angular-esri-map.js"></script>
<!-- run example app controller -->
Expand Down

0 comments on commit e511e51

Please sign in to comment.