Test fix

wttech · Jul 1, 2021 · be7c86e · be7c86e
1 parent 95a1444
commit be7c86e
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -25,7 +25,6 @@ configurations.getByName("functionalTestImplementation").apply {
 }
 
 repositories {
-    mavenLocal()
     mavenCentral()
     gradlePluginPortal()
 }
@@ -35,7 +34,7 @@ dependencies {
     implementation("org.jetbrains.kotlin:kotlin-reflect:1.4.20")
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9")
 
-    implementation("com.cognifide.gradle:common-plugin:1.0.24")
+    implementation("com.cognifide.gradle:common-plugin:1.0.34")
 
     implementation("org.jsoup:jsoup:1.12.1")
     implementation("org.buildobjects:jproc:2.3.0")

diff --git a/src/functionalTest/kotlin/com/cognifide/gradle/aem/instance/local/LocalInstancePluginTest.kt b/src/functionalTest/kotlin/com/cognifide/gradle/aem/instance/local/LocalInstancePluginTest.kt
@@ -48,7 +48,7 @@ class LocalInstancePluginTest : AemBuildTest() {
                         provisioner {
                             deployPackage("https://repo1.maven.org/maven2/biz/netcentric/cq/tools/accesscontroltool/accesscontroltool-package/2.3.2/accesscontroltool-package-2.3.2.zip")
                             deployPackage("https://repo1.maven.org/maven2/biz/netcentric/cq/tools/accesscontroltool/accesscontroltool-oakindex-package/2.3.2/accesscontroltool-oakindex-package-2.3.2.zip")
-                            deployPackage("com.neva.felix:search-webconsole-plugin:1.3.0")
+                            // deployPackage("com.neva.felix:search-webconsole-plugin:1.3.0")
                             deployPackage("https://github.com/icfnext/aem-groovy-console/releases/download/14.0.0/aem-groovy-console-14.0.0.zip")
                         }
                     }
@@ -65,7 +65,7 @@ class LocalInstancePluginTest : AemBuildTest() {
             assertFileExists("build/instance/provision/files/4f135495/aem-groovy-console-14.0.0.zip")
             assertFileExists("build/instance/provision/files/6182d096/accesscontroltool-oakindex-package-2.3.2.zip")
             assertFileExists("build/instance/provision/files/f30506c4/accesscontroltool-package-2.3.2.zip")
-            assertPackage("build/package/wrapper/search-webconsole-plugin-1.3.0.zip")
+            // assertPackage("build/package/wrapper/search-webconsole-plugin-1.3.0.zip")
         }
     }
 
@@ -111,7 +111,7 @@ class LocalInstancePluginTest : AemBuildTest() {
                         provisioner {
                             enableCrxDe()
                             deployPackage("com.adobe.cq:core.wcm.components.all:2.8.0@zip")
-                            deployPackage("com.neva.felix:search-webconsole-plugin:1.2.0")
+                            // deployPackage("com.neva.felix:search-webconsole-plugin:1.3.0")
                         }
                     }
                     

diff --git a/src/functionalTest/kotlin/com/cognifide/gradle/aem/pkg/PackagePluginTest.kt b/src/functionalTest/kotlin/com/cognifide/gradle/aem/pkg/PackagePluginTest.kt
@@ -231,7 +231,7 @@ class PackagePluginTest : AemBuildTest() {
                     packageCompose {
                         installBundle("org.jsoup:jsoup:1.10.2")
                         installBundle("com.github.mickleroy:aem-sass-compiler:1.0.1")
-                        installBundle("com.neva.felix:search-webconsole-plugin:1.3.0") { runMode.set("author") }
+                        // installBundle("com.neva.felix:search-webconsole-plugin:1.3.0") { runMode.set("author") }
                         
                         nestPackage("com.adobe.cq:core.wcm.components.all:2.8.0")
                         nestPackage("com.adobe.cq:core.wcm.components.examples:2.8.0")
@@ -252,7 +252,7 @@ class PackagePluginTest : AemBuildTest() {
 
             assertZipEntry(pkg, "jcr_root/apps/package-nesting-repository/install/jsoup-1.10.2.jar")
             assertZipEntry(pkg, "jcr_root/apps/package-nesting-repository/install/aem-sass-compiler-1.0.1.jar")
-            assertZipEntry(pkg, "jcr_root/apps/package-nesting-repository/install.author/search-webconsole-plugin-1.3.0.jar")
+            // assertZipEntry(pkg, "jcr_root/apps/package-nesting-repository/install.author/search-webconsole-plugin-1.3.0.jar")
             assertZipEntry(pkg, "jcr_root/etc/packages/adobe/cq60/core.wcm.components.all-2.8.0.zip")
             assertZipEntry(pkg, "jcr_root/etc/packages/adobe/cq60/core.wcm.components.examples-2.8.0.zip")
             assertZipEntry(pkg, "jcr_root/etc/packages/ICF Next/aem-groovy-console-14.0.0.zip")
@@ -262,7 +262,6 @@ class PackagePluginTest : AemBuildTest() {
                 <workspaceFilter version="1.0">
                   <filter root="/apps/package-nesting-repository/install/jsoup-1.10.2.jar"/>
                   <filter root="/apps/package-nesting-repository/install/aem-sass-compiler-1.0.1.jar"/>
-                  <filter root="/apps/package-nesting-repository/install.author/search-webconsole-plugin-1.3.0.jar"/>
                   <filter root="/etc/packages/adobe/cq60/core.wcm.components.all-2.8.0.zip"/>
                   <filter root="/etc/packages/adobe/cq60/core.wcm.components.examples-2.8.0.zip"/>
                   <filter root="/etc/packages/ICF Next/aem-groovy-console-14.0.0.zip"/>

diff --git a/src/main/kotlin/com/cognifide/gradle/aem/common/instance/InstanceHttpClient.kt b/src/main/kotlin/com/cognifide/gradle/aem/common/instance/InstanceHttpClient.kt
@@ -14,6 +14,7 @@ open class InstanceHttpClient(private val aem: AemExtension, val instance: Insta
 
     init {
         baseUrl.set(instance.httpUrl)
+        escapeUrl.set(true)
         authorizationPreemptive.set(true)
         basicCredentials = instance.credentials