Merge branch 'master' of https://github.com/openlayers/ol3

test/index.html

@@ -10,6 +10,7 @@
 
   <!-- include source files here... -->
   <script type="text/javascript" src="http://localhost:9810/compile?id=ol&amp;mode=SIMPLE"></script>
+  <script type="text/javascript" src="http://localhost:9810/compile?id=ol&amp;mode=RAW"></script>
 
   <!-- common jasmine extensions -->
   <script type="text/javascript" src="jasmine-extensions.js"></script>

test/spec/ol/layer/XYZ.test.js

@@ -64,7 +64,6 @@ describe('ol.layer.XYZ', function() {
             });
         });
 
-        /*
         describe('extent -64,-64,64,64, resolution 0.5', function() {
 
             it('returns the expected data', function() {
@@ -94,6 +93,6 @@ describe('ol.layer.XYZ', function() {
                 expect(tile.getImg()).toBeDefined();
             });
         });
-        */
+
     });
 });