Skip to content
This repository has been archived by the owner on Aug 5, 2020. It is now read-only.

Commit

Permalink
fixes combo warm cache test by adding a fixture that was somehow drop…
Browse files Browse the repository at this point in the history
…ped, it is unclear to me why this has been passing with phantomjs
  • Loading branch information
noahadams committed Mar 5, 2013
1 parent 2585b16 commit c660990
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 4 deletions.
5 changes: 5 additions & 0 deletions tests/fixtures/push.js
@@ -0,0 +1,5 @@
if(a.length == 1) {
a.push("b");
} else {
a.push("d");
}
10 changes: 6 additions & 4 deletions tests/index.html
Expand Up @@ -63,9 +63,9 @@ <h2 id="qunit-userAgent"></h2>

<textarea id="combineScripts-1">
<script>var a = ['a']</script>
<script x-src="push.js#b"></script>
<script x-src="fixtures/push.js#b"></script>
<script>a.push('c')</script>
<script x-src="push.js#d"></script>
<script x-src="fixtures/push.js#d"></script>
</textarea>

<textarea id="combineScripts-2">
Expand Down Expand Up @@ -195,10 +195,12 @@ <h2 id="qunit-userAgent"></h2>
}
}
, $scripts = $($('#combineScripts-1').text())
, $result = $scripts.combineScripts()
, $result
, html = '';

httpCache.reset(cache);
$result = $scripts.combineScripts();

httpCache.save(function(err) {
if (err) {
return;
Expand Down Expand Up @@ -226,7 +228,7 @@ <h2 id="qunit-userAgent"></h2>
iframe.document.write(html);

function load() {
equal(iframe.window.a.length, 4, 'a = [a, b, c , d]');
deepEqual(iframe.window.a, ['a', 'b', 'c', 'd'], 'a = [a, b, c , d]');

start();
}
Expand Down

0 comments on commit c660990

Please sign in to comment.