SCANGRADLE-252 ".github" folder should not be added to "sonar.sources" if the user explicitly overrides this property

Author: alban-auzeill

src/main/java/org/sonarqube/gradle/SonarPropertyComputer.java

@@ -130,6 +130,7 @@ private void computeDefaultProperties(Project project, Map<String, Object> prope
     }
 
     if (isRootProject(project)) {
+      addGithubFolder(project, rawProperties);
       addKotlinBuildScriptsToSources(project, rawProperties);
     }
 
@@ -147,7 +148,6 @@ private void computeDefaultProperties(Project project, Map<String, Object> prope
       rawProperties.putIfAbsent("sonar.moduleKey", projectKey + project.getPath());
     }
 
-    addGithubFolder(project, rawProperties);
     convertProperties(rawProperties, prefix, properties);
 
     List<Project> enabledChildProjects = project.getChildProjects().values().stream()

src/test/groovy/org/sonarqube/gradle/SonarQubePluginTest.groovy

@@ -1111,19 +1111,30 @@ class SonarQubePluginTest extends Specification {
     project.pluginManager.apply(GroovyPlugin)
 
     project.sourceSets.main.groovy.srcDirs = ["src"]
-    project.compileJava.options.encoding = 'ISO-8859-1'
 
-    def testResultsDir = new File(project.buildDir, "test-results/test")
-    testResultsDir.mkdirs()
-    new File(testResultsDir, 'TEST-.xml').createNewFile()
+    when:
+    def properties = project.tasks.sonar.properties.get()
+
+    then:
+    properties["sonar.sources"] == (new File(project.projectDir, "src") as String) + "," + (new File(project.projectDir, ".github") as String)
+  }
+
+  def ".github folder is not added if the user overrides sonar.sources"() {
+    def rootProject = ProjectBuilder.builder().withName("root").build()
+    def project = ProjectBuilder.builder().withName("parent").withParent(rootProject).withProjectDir(new File("src/test/projects/github-is-a-folder")).build()
+
+    project.pluginManager.apply(SonarQubePlugin)
+    project.pluginManager.apply(GroovyPlugin)
+    project.sonar.properties {
+      property "sonar.sources", "src"
+    }
+    project.sourceSets.main.groovy.srcDirs = ["src"]
 
     when:
     def properties = project.tasks.sonar.properties.get()
 
     then:
-    properties["sonar.sources"].contains(new File(project.projectDir, "src") as String)
-    properties["sonar.sources"].contains(new File(project.projectDir, ".github") as String)
-    properties["sonar.sourceEncoding"] == "ISO-8859-1"
+    properties["sonar.sources"] == "src"
   }
 
   def ".github is present but is a file so not added to sources"() {