More test fixes.

This commit is contained in:
Ian Gilman 2014-08-19 15:27:04 -07:00
parent b2e2b2b125
commit 08a38a8602
4 changed files with 12 additions and 5 deletions

7
test/controls.js vendored
View File

@ -5,7 +5,12 @@
module('Controls', {
setup: function () {
var example = $('<div id="controlsTests"></div>').appendTo("#qunit-fixture");
var example = $('<div id="controlsTests"></div>')
.css({
width: 1000,
height: 1000
})
.appendTo("#qunit-fixture");
testLog.reset();

View File

@ -105,7 +105,7 @@
}
function goHome() {
_viewer.goHome();
_viewer.viewport.goHome();
}
</script>

View File

@ -270,7 +270,7 @@
waitForViewer( function() {
checkOverlayPosition( "after zoom and pan using image coordinates" );
viewer.goHome();
viewer.viewport.goHome();
waitForViewer( function() {
checkOverlayPosition( "after goHome using image coordinates" );
start();
@ -333,7 +333,7 @@
waitForViewer( function() {
checkOverlayPosition( "after zoom and pan using viewport coordinates" );
viewer.goHome();
viewer.viewport.goHome();
waitForViewer( function() {
checkOverlayPosition( "after goHome using viewport coordinates" );
start();

View File

@ -22,7 +22,6 @@
reassignments which could be done by other test. -->
<script src="/test/polyfills.js"></script>
<script src="/test/basic.js"></script>
<script src="/test/navigator.js"></script>
<script src="/test/strings.js"></script>
<script src="/test/formats.js"></script>
<script src="/test/utils.js"></script>
@ -31,5 +30,8 @@
<script src="/test/multi-image.js"></script>
<script src="/test/overlays.js"></script>
<script src="/test/controls.js"></script>
<!-- The navigator tests are the slowest (for now; hopefully they can be sped up)
so we put them last. -->
<script src="/test/navigator.js"></script>
</body>
</html>