Grails Bootstrap: Fixes GrailsResourceUtils.getPathFromBaseDir(), the…

… path relative to the project base directory
graceframework · May 25, 2023 · e7de7f5 · e7de7f5
1 parent 823943e
commit e7de7f5
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 10 deletions.
diff --git a/grails-bootstrap/src/main/groovy/org/grails/io/support/GrailsResourceUtils.java b/grails-bootstrap/src/main/groovy/org/grails/io/support/GrailsResourceUtils.java
@@ -934,12 +934,6 @@ public static String getPathFromRoot(String path) {
      * @return The path relative to the base directory or null if it can't be established
      */
     public static String getPathFromBaseDir(String path) {
-        for (String dir : Arrays.asList("grails-app/", "app/")) {
-            if (path.contains(dir)) {
-                return path.substring(path.indexOf(dir) + dir.length());
-            }
-        }
-
         try {
             File baseDir = BuildSettings.BASE_DIR;
             String basePath = baseDir != null ? baseDir.getCanonicalPath() : null;

diff --git a/grails-bootstrap/src/test/groovy/org/grails/io/support/GrailsResourceUtilsSpec.groovy b/grails-bootstrap/src/test/groovy/org/grails/io/support/GrailsResourceUtilsSpec.groovy
@@ -198,11 +198,9 @@ class GrailsResourceUtilsSpec extends Specification {
 
     void testGetPathFromBaseDir() {
         expect:
-        "views/demo/index.gsp" == GrailsResourceUtils.getPathFromBaseDir("${BuildSettings.BASE_DIR.absolutePath}/grails-app/views/demo/index.gsp")
+        "grails-app/views/demo/index.gsp" == GrailsResourceUtils.getPathFromBaseDir("${BuildSettings.BASE_DIR.absolutePath}/grails-app/views/demo/index.gsp")
         "src/main/demo/index.gsp" == GrailsResourceUtils.getPathFromBaseDir("${BuildSettings.BASE_DIR.absolutePath}/src/main/demo/index.gsp")
         "/alpha/index.gsp" == GrailsResourceUtils.getPathFromBaseDir("/alpha/index.gsp")
-
-        "views/demo/index.gsp" == GrailsResourceUtils.getPathFromBaseDir("/test/grails/myweb/app/views/demo/index.gsp")
     }
 
     private String toFileUrl(String path) {

diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/io/support/GrailsResourceUtilsSpec.groovy b/grails-test-suite-uber/src/test/groovy/org/grails/io/support/GrailsResourceUtilsSpec.groovy
@@ -173,7 +173,7 @@ class GrailsResourceUtilsSpec extends Specification {
 
     void testGetPathFromBaseDir() {
         expect:
-        "views/demo/index.gsp" == GrailsResourceUtils.getPathFromBaseDir("${BuildSettings.BASE_DIR.absolutePath}/grails-app/views/demo/index.gsp")
+        "grails-app/views/demo/index.gsp" == GrailsResourceUtils.getPathFromBaseDir("${BuildSettings.BASE_DIR.absolutePath}/grails-app/views/demo/index.gsp")
         "src/main/demo/index.gsp" == GrailsResourceUtils.getPathFromBaseDir("${BuildSettings.BASE_DIR.absolutePath}/src/main/demo/index.gsp")
         "/alpha/index.gsp" == GrailsResourceUtils.getPathFromBaseDir("/alpha/index.gsp")
     }