Merge branch 'master' of github.com:seajs/seajs

zhuhh · Aug 27, 2013 · fa4b918 · fa4b918
2 parents 2ede283 + 1399a2e
commit fa4b918
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 17 deletions.
diff --git a/tests/specs/extensible/seajs-debug/a-debug.js b/tests/specs/extensible/seajs-debug/a-debug.js
@@ -1 +1 @@
-define({ name: 'a' });
+define({ name: 'a' })
diff --git a/tests/specs/extensible/seajs-debug/main.js b/tests/specs/extensible/seajs-debug/main.js
@@ -2,11 +2,9 @@ define(function(require) {
 
   var test = require('../../../test')
 
-  var a = require('./a')
-  var b = require('./b')
+  var a = require('./a-debug')
 
   test.assert(a.name === 'a', a.name)
-  test.assert(b.name === 'b', b.name)
 
   test.assert(document.getElementById('seajs-debug-console'), 'console div')
 
@@ -21,13 +19,6 @@ define(function(require) {
   test.assert(seajs.find('seajs-find/xx')[1].name === '2', 'seajs.find')
   test.assert(seajs.find('seajs-find/zz').length === 0, 'seajs.find')
 
-  //console.log(require.resolve('./c'))
-
-  require.async('./c', function(c) {
-    test.assert(c.name === 'c', c.name)
-
-    document.cookie = 'seajs-debug=0``0; path=/; expires=' + new Date(0)
-    test.next()
-  })
+  test.next()
 
 })
diff --git a/tests/specs/extensible/seajs-debug/test.html b/tests/specs/extensible/seajs-debug/test.html
@@ -5,17 +5,15 @@
 <title>test</title>
 </head>
 <body>
-<script>
-  document.cookie = 'seajs-debug=1`' + location.href.replace('test.html', 'seajs-map.js') + '`1; path=/'
-</script>
 
 <script src="../../../../dist/sea.js"></script>
 <script>
 
   seajs.config({
     alias: {
-      'seajs-debug': '../../../../../seajs-debug/dist/seajs-debug'
-    }
+      'seajs-debug': '../../../../../seajs-debug/src/seajs-debug'
+    },
+    preload: ['../../../../../seajs-debug/src/seajs-debug']
   })
 
   seajs.use('./main')