Fix a bug when base is set to root path

yooSeeFly · Jan 28, 2013 · 8bbba63 · 8bbba63
1 parent dc04cc6
commit 8bbba63
Show file tree

Hide file tree

Showing 14 changed files with 38 additions and 139 deletions.
diff --git a/dist/sea-debug.js b/dist/sea-debug.js
@@ -1057,7 +1057,8 @@ function checkConfigConflict(prev, curr, k, key) {
 function makeBaseAbsolute() {
   var base = configData.base
   if (!isAbsolute(base)) {
-    configData.base = id2Uri((isRoot(base) ? "" : "./") + base + "/")
+    configData.base = id2Uri((isRoot(base) ? "" : "./") + base
+        + (base.charAt(base.length - 1) === "/" ? "" : "/"))
   }
 }
 

diff --git a/dist/sea.js b/dist/sea.js
diff --git a/dist/sea.js.map b/dist/sea.js.map
diff --git a/src/config.js b/src/config.js
@@ -83,7 +83,8 @@ function checkConfigConflict(prev, curr, k, key) {
 function makeBaseAbsolute() {
   var base = configData.base
   if (!isAbsolute(base)) {
-    configData.base = id2Uri((isRoot(base) ? "" : "./") + base + "/")
+    configData.base = id2Uri((isRoot(base) ? "" : "./") + base
+        + (base.charAt(base.length - 1) === "/" ? "" : "/"))
   }
 }
 

diff --git a/tests/issues/config-base-is-root/js/main.js b/tests/issues/config-base-is-root/js/main.js
diff --git a/tests/issues/config-base-is-root/test.html b/tests/issues/config-base-is-root/test.html
diff --git a/tests/issues/config-base/js/a.js b/tests/issues/config-base/js/a.js
diff --git a/tests/issues/config-base/js/biz/b.js b/tests/issues/config-base/js/biz/b.js
diff --git a/tests/issues/config-base/js/biz/sub/c.js b/tests/issues/config-base/js/biz/sub/c.js
diff --git a/tests/issues/config-base/js/main.js b/tests/issues/config-base/js/main.js
diff --git a/tests/issues/config-base/js/xxlib/1.0.0/xxlib.js b/tests/issues/config-base/js/xxlib/1.0.0/xxlib.js
diff --git a/tests/issues/config-base/test.html b/tests/issues/config-base/test.html
diff --git a/tests/specs/config/base/main.js b/tests/specs/config/base/main.js
@@ -12,13 +12,36 @@ define(function(require) {
   test.assert(a.name === 'a', a.name)
 
 
+  // relative
   seajs.config({
     base: './'
   })
 
   var base = seajs.config.data.base
   test.assert(/tests\/specs\/config\/$/.test(base), base)
 
+
+  // root
+  seajs.config({
+    base: '/root-path/'
+  })
+
+  function expectedPath(str) {
+    return location.protocol + '//' + location.host + '/root-path/' + str + '.js'
+  }
+
+  test.assert(require.resolve('z') === expectedPath('z'), require.resolve('z'))
+
+
+  // rare but allowed case
+  seajs.config({
+    base: '/'
+  })
+
+  base = seajs.config.data.base
+  test.assert(location.href.indexOf(base) === 0, base)
+
+
   test.next()
 
 })

diff --git a/tests/specs/util/path.js b/tests/specs/util/path.js
@@ -120,6 +120,15 @@ define(function(require) {
   assert(id2Uri('./front/jquery.x.queue.js#') === pageDir + 'front/jquery.x.queue.js', 'id2Uri')
 
 
+  assert(isAbsolute('http://test.com/') === true, 'isAbsolute')
+  assert(isAbsolute('//test.com/') === true, 'isAbsolute')
+  assert(isAbsolute('file:///c/') === true, 'isAbsolute')
+  assert(isRelative('./') === true, 'isRelative')
+  assert(isRelative('../') === true, 'isRelative')
+  assert(isRoot('/') === true, 'isRoot')
+  assert(isTopLevel('xxx') === true, 'isTopLevel')
+
+
   test.next()
 
 });