Replacing spaces with dashes in PULL_REQUEST_URL #82

 * Was evaluating to wrong URL if repo name included spaces.

Author: tomasbjerre

CHANGELOG.md

@@ -2,6 +2,9 @@
 
 Changelog of Pull Request Notifier for Stash.
 
+## 1.36
+* Bugfix: Replacing spaces with dashes in ${PULL_REQUEST_URL}. Was evaluating to wrong URL if repo name included spaces.
+
 ## 1.35
 * Processing events on Bitbucket Server's event threads
 

src/main/java/se/bjurr/prnfs/listener/PrnfsRenderer.java

@@ -380,8 +380,9 @@ private static String cloneUrlFromRepository(REPO_PROTOCOL protocol, Repository
   }
 
   private static String getPullRequestUrl(ApplicationPropertiesService propertiesService, PullRequest pullRequest) {
-   return propertiesService.getBaseUrl() + "/projects/" + pullRequest.getToRef().getRepository().getProject().getKey()
-     + "/repos/" + pullRequest.getToRef().getRepository().getName() + "/pull-requests/" + pullRequest.getId();
+   return (propertiesService.getBaseUrl() + "/projects/" + pullRequest.getToRef().getRepository().getProject().getKey()
+     + "/repos/" + pullRequest.getToRef().getRepository().getName() + "/pull-requests/" + pullRequest.getId())
+     .replaceAll(" ", "-");
   }
 
   PrnfsVariable(Resolver resolver) {

src/test/java/se/bjurr/prnfs/admin/PrnfsPullRequestEventListenerTest.java

@@ -413,7 +413,7 @@ public void testThatAUrlWithVariablesExceptFromAndToCanBeInvoked() throws Except
         .withToRef( //
           pullRequestRefBuilder() //
             .withProjectKey("theProject") //
-            .withRepositoryName("theRepoName") //
+            .withRepositoryName("the Repo Name") //
         ) //
         .withPullRequestAction(OPENED) //
         .withAuthor( //
@@ -429,7 +429,7 @@ public void testThatAUrlWithVariablesExceptFromAndToCanBeInvoked() throws Except
     ) //
     .invokedUrl(
       0,
-      "http://bjurr.se/id=10&action=OPENED&displayName=authorDisplayName&authorEmail=authorEmail&authorId=100&authorName=authorName&authorSlug=authorSlug&pullRequestUrl=http%3A%2F%2Fstash.server%2Fprojects%2FtheProject%2Frepos%2FtheRepoName%2Fpull-requests%2F10" //
+      "http://bjurr.se/id=10&action=OPENED&displayName=authorDisplayName&authorEmail=authorEmail&authorId=100&authorName=authorName&authorSlug=authorSlug&pullRequestUrl=http%3A%2F%2Fstash.server%2Fprojects%2FtheProject%2Frepos%2Fthe-Repo-Name%2Fpull-requests%2F10" //
     );
  }