Merge pull request #1759 from caminada/add-script-empty-context-fix

Return absolute path for scripts if contextPath is empty

Author: tarzanek

src/org/opensolaris/opengrok/web/Scripts.java

@@ -202,7 +202,7 @@ public Iterator<Script> iterator() {
      * @return true if script was added; false otherwise
      */
     public boolean addScript(String contextPath, String scriptName) {
-        contextPath = contextPath == null || contextPath.isEmpty() ? "" : contextPath + "/";
+        contextPath = contextPath == null || contextPath.isEmpty() ? "/" : contextPath + "/";
         if (SCRIPTS.containsKey(scriptName)) {
             this.addScript(
                     // put the context path end append the script path

test/org/opensolaris/opengrok/web/ScriptsTest.java

@@ -22,15 +22,16 @@
  */
 package org.opensolaris.opengrok.web;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
 import java.util.Map.Entry;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.opensolaris.opengrok.web.Scripts.Script;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
 /**
  *
  * @author Krystof Tulinger
@@ -123,11 +124,11 @@ public void testLookup() {
                 continue;
             }
             assertTrue(scripts.toHtml() + " must contain <script type=\"text/javascript\""
-                    + " src=\"" + s.getValue().getScriptData() + "\""
+                    + " src=\"/" + s.getValue().getScriptData() + "\""
                     + " data-priority=\"" + s.getValue().getPriority() + "\"></script>",
                     scripts.toHtml()
                             .contains("<script type=\"text/javascript\""
-                                    + " src=\"" + s.getValue().getScriptData() + "\""
+                                    + " src=\"/" + s.getValue().getScriptData() + "\""
                                     + " data-priority=\"" + s.getValue().getPriority() + "\"></script>"));
         }
     }