Merge pull request #99 from guibou/fix_url_and_test

Fix url and test

krank.cabal

@@ -72,6 +72,7 @@ test-suite krank-test
                        Utils.Req
   build-depends: hspec >= 2.7
                , hspec-expectations
+               , hspec-discover
   ghc-options:         -threaded -rtsopts -with-rtsopts=-N
 
 executable krank

src/Krank/Checkers/IssueTracker.hs

@@ -64,7 +64,7 @@ serverDomain (Gitlab (GitlabHost h)) = h
 gitRepoRe :: RE.Regex
 -- NOTE: \b at the beginning is really import for performances
 -- because it dramatically reduces the number of backtracks
-gitRepoRe = [RE.re|\b(?>https?://)?(?>www\.)?([^/ ]+)/([^ ]+)/([^- ][^/ ]*)(?>/-)?/issues/([0-9]+)|]
+gitRepoRe = [RE.re|\b(?>https?://)?(?>www\.)?([^/ ]+)/([^ /][^ ]*)/([^-/ ][^/ ]*)(?>/-)?/issues/([0-9]+)|]
 
 -- | Extract all issues on one line and returns a list of the raw text associated with an issue
 extractIssuesOnALine :: ByteString -> [(Int, GitIssueRef)]

tests/Test/Krank/Checkers/IssueTrackerSpec.hs

@@ -104,13 +104,16 @@ giturlTests domain = do
   it "handles long gitlab url with groups and with the odd /-" $ do
     let match = check [fmt|{domainName}/gbataille_main/sub_level_1/sub_level_2/deep_in_groups/-/issues/12|]
     match `shouldBe` Just (GitIssueRef domain "gbataille_main/sub_level_1/sub_level_2" "deep_in_groups" 12)
+  it "handle an url embeded in markdown" $ do
+    let match = check [fmt|lalalalalalaalla [Issue XX](https://{domainName}/foo/bar/issues/123) blo blo blu|]
+    match `shouldBe` Just (GitIssueRef domain "foo" "bar" 123)
 
 spec :: Spec
 spec = do
   context "Test.Krank.Checkers.specIssueTracker" $ do
     describe "#githubParser" $
       giturlTests Github
-    describe "#githlabParser" $
+    describe "#gitlabParser" $
       giturlTests (Gitlab (GitlabHost "gitlab.com"))
     describe "#extractIssues" $
       it "handles both github and gitlab" $

tests/Test/Utils/GithubSpec.hs

@@ -56,7 +56,9 @@ spec = do
         showGithubException exception `shouldBe` showHTTPException showRawResponse exception
 
 dummyResponse :: Status -> Response ()
-#if MIN_VERSION_http_client(0,7,8)
+#if MIN_VERSION_http_client(0,7,16)
+dummyResponse status = Response status http11 [] () (createCookieJar []) (ResponseClose $ pure ()) (error "WTF") []
+#elif MIN_VERSION_http_client(0,7,8)
 dummyResponse status = Response status http11 [] () (createCookieJar []) (ResponseClose $ pure ()) (error "WTF")
 #else
 dummyResponse status = Response status http11 [] () (createCookieJar []) (ResponseClose $ pure ())

tests/Test/Utils/GitlabSpec.hs

@@ -63,7 +63,9 @@ spec = do
         showGitlabException exception `shouldBe` showHTTPException showRawResponse exception
 
 dummyResponse :: Status -> Response ()
-#if MIN_VERSION_http_client(0,7,8)
+#if MIN_VERSION_http_client(0,7,16)
+dummyResponse status = Response status http11 [] () (createCookieJar []) (ResponseClose $ pure ()) (error "WTF") []
+#elif MIN_VERSION_http_client(0,7,8)
 dummyResponse status = Response status http11 [] () (createCookieJar []) (ResponseClose $ pure ()) (error "WTF")
 #else
 dummyResponse status = Response status http11 [] () (createCookieJar []) (ResponseClose $ pure ())