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

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

Browse Source
This commit is contained in:
ahocevar
2013-03-11 15:21:01 +01:00
parent b971fc1aae a6395cd2f5
commit a66f26f839
46 changed files with 699 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
test/readme.md → test/README.md
View File

@@ -22,8 +22,11 @@ With PhantomJS installed, and assuming phantomjs is in the PATH:
(Works with PhantomJS 1.6.1, untested with other versions.)
This command can also be run by doing `make test` at the root of ol3.
This command can also be run by doing `./build.py test` at the root of ol3.
Make sure that the polvr web server is running (`./build.py serve`), otherwise
you will most likely see something like `0 specs, 0 failures in 0.001s.`.
Tip for TDD'ers: to make PhantomJS run the test suite continuously each time
a spec file is changed you can use nosier (http://pypi.python.org/pypi/nosier)
and do `nosier -p test -p src "make test"`.
and do `nosier -p test -p src "./build.py test"`.

7
test/spec/ol/source/tilesource.test.js
View File

@@ -220,12 +220,9 @@ goog.inherits(ol.test.source.MockTileSource, ol.source.TileSource);
* @inheritDoc
*/
ol.test.source.MockTileSource.prototype.getTile = function(tileCoord) {
var tile = new ol.Tile(tileCoord);
var key = tileCoord.toString();
if (this.loaded_[key]) {
tile.state = ol.TileState.LOADED;
}
return tile;
var tileState = this.loaded_[key] ? ol.TileState.LOADED : ol.TileState.IDLE;
return new ol.Tile(tileCoord, tileState);
};