Skip to content

Commit

Permalink
test update
Browse files Browse the repository at this point in the history
  • Loading branch information
guybedford committed Aug 30, 2013
1 parent f97b7d3 commit 2a01273
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 8 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
node_modules

3 changes: 3 additions & 0 deletions test/jquery-compare.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<!doctype html>
<html>
<script src="https://github.jspm.io/components/jquery@2.0.3/jquery.js"></script>
7 changes: 2 additions & 5 deletions test/test-advanced.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,15 @@
<script>
jspm.config({
map: {
'github:jquery/jquery@master/bower_components/sizzle/dist/sizzle': 'github:jquery/sizzle@master/dist/sizzle'
'github:guybedford/jquery@2.0.4/bower_components/sizzle/dist/sizzle': 'github:jquery/sizzle@1.10.7/dist/sizzle'
}
});
</script>

<script>
jspm.import('test-runner', function(runner) {
runner.execute([
{
name: 'Load jQuery from source',
run: function(complete) {
jspm.import('github:jquery/jquery@master/src/jquery', complete);
jspm.import('github:guybedford/jquery@2.0.4/src/jquery', complete);
},
confirm: function($) {
if (!$.fn)
Expand Down
6 changes: 3 additions & 3 deletions test/test.html
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
jspm.import(['tests/global-with-dep'], complete);
},
confirm: function(m) {
if (m.jQueryVersion != '1.8.3')
if (m != '1.8.3')
return 'Global dependency not defined';
}
},
Expand All @@ -88,7 +88,7 @@
jspm.import('tests/inline-depends | tests/inline-depends-dep', complete);
},
confirm: function(m) {
if (m.dep != 'dep')
if (m != 'dep')
return 'Inline depends dependency not defined';
}
},
Expand All @@ -103,7 +103,7 @@
jspm.import(['mypath:path'], complete);
},
confirm: function(m) {
if (m.p != 'path')
if (m != 'path')
return 'module not loaded';
}
},
Expand Down

0 comments on commit 2a01273

Please sign in to comment.