Move target URI handling out of zipfile module

2 files changed, 23 insertions, 17 deletions

diff --git a/test/docx/uris.tests.js b/test/docx/uris.tests.js
new file mode 100644
index 0000000..5b2afab
--- /dev/null
+++ b/test/docx/uris.tests.js
@@ -0,0 +1,22 @@
+var assert = require("assert");
+
+var zipfile = require("../../lib/docx/uris");
+var test = require("../test")(module);
+
+
+test("uriToZipEntryName", {
+    "when path does not have leading slash then path is resolved relative to base": function() {
+        assert.equal(
+            zipfile.uriToZipEntryName("one/two", "three/four"),
+            "one/two/three/four"
+        )
+    },
+
+    "when path has leading slash then base is ignored": function() {
+        assert.equal(
+            zipfile.uriToZipEntryName("one/two", "/three/four"),
+            "three/four"
+        )
+    }
+});
+
diff --git a/test/zipfile.tests.js b/test/zipfile.tests.js
index 8c2f6c1..56c7f9b 100644
--- a/test/zipfile.tests.js
+++ b/test/zipfile.tests.js
@@ -2,8 +2,8 @@ var assert = require("assert");
 
 var JSZip = require("jszip");
 
-var test = require("./test")(module);
 var zipfile = require("../lib/zipfile");
+var test = require("./test")(module);
 
 test('file in zip can be read after being written', function() {
     var zip = emptyZipFile();
@@ -22,19 +22,3 @@ function emptyZipFile() {
     var buffer = zip.generate({type: "arraybuffer"});
     return zipfile.openArrayBuffer(buffer);
 }
-
-test("uriToZipEntryName", {
-    "when path does not have leading slash then path is resolved relative to base": function() {
-        assert.equal(
-            zipfile.uriToZipEntryName("one/two", "three/four"),
-            "one/two/three/four"
-        )
-    },
-
-    "when path has leading slash then base is ignored": function() {
-        assert.equal(
-            zipfile.uriToZipEntryName("one/two", "/three/four"),
-            "three/four"
-        )
-    }
-});