Skip to content

Commit

Permalink
Merge pull request #93 from DracoNoir/master
Browse files Browse the repository at this point in the history
Updates tests to Polymer 0.5.1
  • Loading branch information
addyosmani committed Jan 24, 2015
2 parents c21c852 + 80df3a6 commit 752d595
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions test/google-map-basic.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, minimum-scale=1.0, initial-scale=1.0, user-scalable=yes">
<script src="../../platform/platform.js"></script>
<script src="../../webcomponentsjs/webcomponents.js"></script>
<script src="../../web-component-tester/browser.js"></script>
<link rel="import" href="../google-map.html">
</head>
Expand Down Expand Up @@ -80,4 +80,4 @@

</script>
</body>
</html>
</html>
4 changes: 2 additions & 2 deletions test/google-map-update-pos.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, minimum-scale=1.0, initial-scale=1.0, user-scalable=yes">
<script src="../../platform/platform.js"></script>
<script src="../../webcomponentsjs/webcomponents.js"></script>
<script src="../../web-component-tester/browser.js"></script>
<link rel="import" href="../google-map.html">
</head>
Expand All @@ -21,7 +21,7 @@
map.addEventListener('google-map-ready', function(e) {
assert.equal(map.latitude, 37.555);
assert.equal(map.longitude, -122.555);

asyncPlatformFlush(function() {
assert.equal(map.latitude, map.map.getCenter().lat(),
'map lat was not updated');
Expand Down
2 changes: 1 addition & 1 deletion test/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@
]);
</script>
</body>
</html>
</html>
4 changes: 2 additions & 2 deletions test/marker-basic.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, minimum-scale=1.0, initial-scale=1.0, user-scalable=yes">
<script src="../../platform/platform.js"></script>
<script src="../../webcomponentsjs/webcomponents.js"></script>
<script src="../../web-component-tester/browser.js"></script>
<link rel="import" href="../google-map.html">
</head>
Expand Down Expand Up @@ -76,4 +76,4 @@

</script>
</body>
</html>
</html>
4 changes: 2 additions & 2 deletions test/markers-add-remove.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, minimum-scale=1.0, initial-scale=1.0, user-scalable=yes">
<script src="../../platform/platform.js"></script>
<script src="../../webcomponentsjs/webcomponents.js"></script>
<script src="../../web-component-tester/browser.js"></script>
<link rel="import" href="../google-map.html">
</head>
Expand Down Expand Up @@ -46,7 +46,7 @@

});

});
});
});
});

Expand Down

0 comments on commit 752d595

Please sign in to comment.