Upload task uploads empty folders of reports to an org

fundacionjala · Oct 7, 2015 · fcdc0d6 · fcdc0d6
1 parent 4346c46
commit fcdc0d6
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 3 deletions.
diff --git a/...in/groovy/org/fundacionjala/gradle/plugins/enforce/tasks/salesforce/SalesforceTask.groovy b/...in/groovy/org/fundacionjala/gradle/plugins/enforce/tasks/salesforce/SalesforceTask.groovy
@@ -43,6 +43,7 @@ abstract class SalesforceTask extends ForceTask {
     public ArrayList<String> arrayPaths
     public String projectPackagePath
     public Map parameters
+    ArrayList<String> FOLDERS_WITH_SUB_FOLDERS = ['documents', 'reports', 'dashboards']
 
     /**
      * Sets description and group task
@@ -106,8 +107,10 @@ abstract class SalesforceTask extends ForceTask {
      */
     void writePackage(String packagePath, ArrayList<File> files, boolean withProjectPath = true) {
         FileWriter fileWriter = new FileWriter(packagePath)
-        files = files.grep({ file ->
-            !file.name.endsWith(Constants.META_XML)
+        files = files.grep({ File file ->
+            String folderName = file.getParentFile().getName()
+            !file.name.endsWith(Constants.META_XML) || (FOLDERS_WITH_SUB_FOLDERS.contains(folderName)
+                    && file.name.endsWith(Constants.META_XML))
         })
         if (withProjectPath) {
             packageBuilder.createPackage(files, projectPath)

diff --git a/src/main/groovy/org/fundacionjala/gradle/plugins/enforce/utils/Util.groovy b/src/main/groovy/org/fundacionjala/gradle/plugins/enforce/utils/Util.groovy
@@ -43,7 +43,11 @@ class Util {
      * @param fileName the file typeName
      */
     public static String getFileName(String fileName) {
-        fileName.replaceFirst(PATTERN_FILE_EXT, '')
+        String result = fileName.replaceFirst(PATTERN_FILE_EXT, Constants.EMPTY)
+        if (fileName.contains(Constants.META_XML)) {
+            result = fileName.replaceFirst(Constants.META_XML, Constants.EMPTY)
+        }
+        return result
     }
 
     /**

diff --git a/src/test/groovy/org/fundacionjala/gradle/plugins/enforce/utils/UtilTest.groovy b/src/test/groovy/org/fundacionjala/gradle/plugins/enforce/utils/UtilTest.groovy
@@ -394,6 +394,20 @@ class UtilTest extends Specification {
             thrown(Exception)
     }
 
+    def "Test should return a file name Class1.cls without its extension"() {
+        when:
+            String result = Util.getFileName('Class1.cls')
+        then:
+            result == 'Class1'
+    }
+
+    def "Test should return a file name 'MyReports-meta.xml' without '-meta.xml'"() {
+        when:
+            String result = Util.getFileName('MyReports-meta.xml')
+        then:
+            result == 'MyReports'
+    }
+
     def cleanupSpec() {
         new File(Paths.get(RESOURCES_PATH, 'triggers').toString()).deleteDir()
         new File(Paths.get(RESOURCES_PATH, 'relativeTest').toString()).deleteDir()