jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

relativePath("foo", "foo") is now ".", not "" (#13452)

Browse source
This commit is contained in:
Timothee Cour 2020-02-22 00:07:53 -08:00 • committed by GitHub
commit a43583f9c8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 37 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
tests/js/tos.nim Normal file
View file

@ -0,0 +1,7 @@
static: doAssert defined(nodejs)
import os
block:
doAssert "./foo//./bar/".normalizedPath == "foo/bar"
doAssert relativePath(".//foo/bar", "foo") == "bar"

12
tests/stdlib/tos.nim
View file

@ -329,15 +329,19 @@ block ospaths:
doAssert relativePath("/Users/me/bar/z.nim", "/Users/me", '/') == "bar/z.nim"
doAssert relativePath("", "/users/moo", '/') == ""
doAssert relativePath("foo", "", '/') == "foo"
doAssert relativePath("/foo", "/Foo", '/') == (when FileSystemCaseSensitive: "../foo" else: "")
doAssert relativePath("/Foo", "/foo", '/') == (when FileSystemCaseSensitive: "../Foo" else: "")
doAssert relativePath("/foo", "/fOO", '/') == (when FileSystemCaseSensitive: "../foo" else: "")
doAssert relativePath("/foO", "/foo", '/') == (when FileSystemCaseSensitive: "../foO" else: "")
doAssert relativePath("/foo", "/Foo", '/') == (when FileSystemCaseSensitive: "../foo" else: ".")
doAssert relativePath("/Foo", "/foo", '/') == (when FileSystemCaseSensitive: "../Foo" else: ".")
doAssert relativePath("/foo", "/fOO", '/') == (when FileSystemCaseSensitive: "../foo" else: ".")
doAssert relativePath("/foO", "/foo", '/') == (when FileSystemCaseSensitive: "../foO" else: ".")
doAssert relativePath("foo", ".", '/') == "foo"
doAssert relativePath(".", ".", '/') == "."
doAssert relativePath("..", ".", '/') == ".."
doAssert relativePath("foo", "foo") == "."
doAssert relativePath("", "foo") == ""
doAssert relativePath("././/foo", "foo//./") == "."
when doslikeFileSystem:
doAssert relativePath(r"c:\foo.nim", r"C:\") == r"foo.nim"
doAssert relativePath(r"c:\foo\bar\baz.nim", r"c:\foo") == r"bar\baz.nim"

3
tests/test_nimscript.nims
View file

@ -22,4 +22,7 @@ import unicode
import uri
import macros
block:
doAssert "./foo//./bar/".normalizedPath == "foo/bar".unixToNativePath
echo "Nimscript imports are successful."