Skip to content

Commit

Permalink
Fix AMD tests. jQuery is modern enough that we dont need a shim. Remo…
Browse files Browse the repository at this point in the history
…ve JSLitmus, and add in stubbed xhr environment file
  • Loading branch information
akre54 committed Nov 7, 2013
1 parent e4e349f commit d9faafd
Showing 1 changed file with 1 addition and 7 deletions.
8 changes: 1 addition & 7 deletions test/test-amd.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<link rel="stylesheet" href="vendor/qunit.css" type="text/css" media="screen" />
<script type="text/javascript" src="vendor/json2.js"></script>
<script type="text/javascript" src="vendor/qunit.js"></script>
<script type="text/javascript" src="vendor/jslitmus.js"></script>
<script type="text/javascript" src="vendor/require.js"></script>
<script>
// Tests are loaded async, so wait for them
Expand All @@ -17,19 +16,14 @@
'jquery': 'vendor/jquery',
'underscore': 'vendor/underscore',
'backbone': '../backbone'
},
// jQuery is old, so shim.
shim: {
jquery: {
exports: 'jQuery'
}
}
});

var root = this;

require(['backbone'], function(Backbone) {
require([
'environment',
'noconflict',
'events',
'model',
Expand Down

0 comments on commit d9faafd

Please sign in to comment.