[#197] Golden tests

serokell · Dec 7, 2022 · 9bc47b2 · 9bc47b2
1 parent e086619
commit 9bc47b2
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 15 deletions.
diff --git a/src/Xrefcheck/Verify.hs b/src/Xrefcheck/Verify.hs
@@ -415,17 +415,16 @@ verifyReference
     = retryVerification 0 $
         if shouldCheckLocType mode rInfo
         then case rInfo of
-          RIFileLocal -> do
-            let fromRoot = ""
-            checkRef rAnchor root file fromRoot
+          RIFileLocal -> checkRef rAnchor root file ""
           RIFileRelative -> do
+            let relativeToRoot = getRelativeOrAbsoluteChild root (takeDirectory file)
+                  </> toString rLink
             canonicalPath <- takeDirectory file </ toString rLink
-            let fromRoot = getRelativeOrAbsoluteChild root (takeDirectory file) </> toString rLink
-            checkRef rAnchor root canonicalPath fromRoot
+            checkRef rAnchor root canonicalPath relativeToRoot
           RIFileAbsolute -> do
-            canonicalPath <- root </ dropWhile isPathSeparator (toString rLink)
-            let fromRoot = dropWhile isPathSeparator (toString rLink)
-            checkRef rAnchor root canonicalPath fromRoot
+            let relativeToRoot = dropWhile isPathSeparator (toString rLink)
+            canonicalPath <- root </ relativeToRoot
+            checkRef rAnchor root canonicalPath relativeToRoot
           RIExternal -> checkExternalResource config rLink
           RIOtherProtocol -> verifying pass
         else return mempty
@@ -515,12 +514,12 @@ verifyReference
 
     isVirtual canonicalRoot = matchesGlobPatterns canonicalRoot (ecIgnoreLocalRefsTo cExclusions)
 
-    checkRef mAnchor canonicalRoot referredFile fromRoot = verifying $
+    checkRef mAnchor canonicalRoot referredFile relativeToRoot = verifying $
       unless (isVirtual canonicalRoot referredFile) do
         referredFileRelative <-
           case getRelativeChild canonicalRoot referredFile of
             Just ps -> pure ps
-            Nothing -> throwError (LocalFileOutsideRepo fromRoot)
+            Nothing -> throwError (LocalFileOutsideRepo relativeToRoot)
 
         mFileStatus <- tryGetFileStatus referredFileRelative referredFile
         case mFileStatus of

diff --git a/tests/golden/check-local-refs/expected1.gold b/tests/golden/check-local-refs/expected1.gold
@@ -24,7 +24,7 @@
        - anchor: -
 
      File does not exist:
-       dir1/dir2/D2F2.md/
+       dir1/dir2/D2F2.md
 
   ➥  In file dir1/dir2/d2f1.md
      bad reference (relative) at src:29:1-32:
@@ -33,7 +33,7 @@
        - anchor: -
 
      File does not exist:
-       dir1/dir2/../DIR2
+       dir1/DIR2
 
   ➥  In file dir1/dir2/d2f1.md
      bad reference (relative) at src:31:1-38:

diff --git a/tests/golden/check-local-refs/expected2.gold b/tests/golden/check-local-refs/expected2.gold
@@ -24,7 +24,7 @@
        - anchor: -
 
      File does not exist:
-       dir2/D2F2.md/
+       dir2/D2F2.md
 
   ➥  In file dir2/d2f1.md
      bad reference (relative) at src:29:1-32:

diff --git a/tests/golden/check-local-refs/expected3.gold b/tests/golden/check-local-refs/expected3.gold
@@ -24,9 +24,9 @@
        - anchor: -
 
      File does not exist:
-       dir2/D2F2.md/
+       dir2/D2F2.md
 
-  ➥  In file dir1/dir2/d2f1.md
+  ➥  In file dir2/d2f1.md
      bad reference (relative) at src:31:1-38:
        - text: "bad-anchor-rel-1"
        - link: d2f2.md