ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #6876 from fredj/filereader_tests

Browse Source 
Only test ol.interaction.DragAndDrop if FileReader is supported
This commit is contained in:
Frédéric Junod
2017-06-06 13:45:42 +02:00
committed by GitHub
parent df96cc6e56 66e0308028
commit c24bd209e6
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/spec/ol/interaction/draganddrop.test.js
+4 -2
View File
@@ -8,7 +8,7 @@ goog.require('ol.format.GeoJSON');
goog.require('ol.interaction.DragAndDrop'); goog.require('ol.interaction.DragAndDrop');
describe('ol.interaction.DragAndDrop', function() { where('FileReader').describe('ol.interaction.DragAndDrop', function() {
var viewport, map, interaction; var viewport, map, interaction;
beforeEach(function() { beforeEach(function() {
@@ -83,9 +83,11 @@ describe('ol.interaction.DragAndDrop', function() {
}); });
describe('#handleDrop_', function() { describe('#handleDrop_', function() {
var OrigFileReader = FileReader; var OrigFileReader;
beforeEach(function() { beforeEach(function() {
OrigFileReader = FileReader;
FileReader = function() { FileReader = function() {
ol.events.EventTarget.apply(this, arguments); ol.events.EventTarget.apply(this, arguments);
this.readAsText = function(file) { this.readAsText = function(file) {
test/test-extensions.js
+3 -2
View File
@@ -462,8 +462,9 @@
}; };
var features = { var features = {
ArrayBuffer: typeof ArrayBuffer === 'function', ArrayBuffer: 'ArrayBuffer' in global,
'ArrayBuffer.isView': typeof ArrayBuffer === 'function' && ArrayBuffer.isView, 'ArrayBuffer.isView': 'ArrayBuffer' in global && !!ArrayBuffer.isView,
FileReader: 'FileReader' in global,
Uint8ClampedArray: ('Uint8ClampedArray' in global) Uint8ClampedArray: ('Uint8ClampedArray' in global)
}; };