Skip to content

Commit 9476eff

Browse files
authored
Merge pull request #12 from SpringRoll/bugfix/tests
Getting tests running properly
2 parents f9f9139 + 2d59434 commit 9476eff

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"devDependencies":
1010
{
1111
"easeljs": "https://github.com/SpringRoll/EaselJS.git",
12-
"qunit": "*",
12+
"qunit": "2.6.*",
1313
"springroll": "*",
1414
"google-code-prettify": "*",
1515
"bind-polyfill": "*"

test/index.html

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
<div id="qunit"></div>
1111
<div id="qunit-fixture"></div>
1212

13+
<iframe id="frame"></iframe>
14+
1315
<!-- Unit testing dependencies -->
1416
<script src="../components/bind-polyfill/index.js"></script>
1517
<script src="../components/qunit/qunit/qunit.js"></script>
@@ -22,14 +24,13 @@
2224
<script src="../dist/container.js"></script>
2325

2426
<script>
25-
test('Container Test', function(assert)
27+
QUnit.test('Container Test', function(assert)
2628
{
27-
expect(1);
2829
var Container = include('springroll.Container');
29-
var container = new Container();
30+
var container = new Container('#frame');
3031
container.destroy();
31-
assert.ok(true, "Created a container");
32+
QUnit.assert.ok(true, "Created a container");
3233
});
3334
</script>
3435
</body>
35-
</html>
36+
</html>

0 commit comments

Comments
 (0)