diff --git a/.gitignore b/.gitignore index b0d7b1f3a..327b22fe2 100644 --- a/.gitignore +++ b/.gitignore @@ -100,3 +100,9 @@ nomulus.iws node_modules/** !node_modules/soyutils_usegoog.js /repos/ + +# Compiled JS/CSS code +core/**/registrar_bin*.js +core/**/registrar_dbg*.js +core/**/registrar_bin*.css +core/**/registrar_dbg*.css diff --git a/config/presubmits.py b/config/presubmits.py index 20364eac1..f0a6732d8 100644 --- a/config/presubmits.py +++ b/config/presubmits.py @@ -78,7 +78,7 @@ PRESUBMITS = { r".*Copyright 20\d{2} The Nomulus Authors\. All Rights Reserved\.", ("java", "js", "soy", "sql", "py", "sh", "gradle"), { ".git", "/build/", "/generated/", "node_modules/", - "JUnitBackports.java" + "JUnitBackports.java", "registrar_bin.", "registrar_dbg." }, REQUIRED): "File did not include the license header.", @@ -148,7 +148,7 @@ PRESUBMITS = { PresubmitCheck( r".*(innerHTML|outerHTML)\s*(=|[+]=)([^=]|$)", "js", - {"/node_modules/"}, + {"/node_modules/", "registrar_bin."}, ): "Do not assign directly to the dom. Use goog.dom.setTextContent to set" " to plain text, goog.dom.removeChildren to clear, or " @@ -156,7 +156,7 @@ PRESUBMITS = { PresubmitCheck( r".*console\.(log|info|warn|error)", "js", - {"/node_modules/", "google/registry/ui/js/util.js"}, + {"/node_modules/", "google/registry/ui/js/util.js", "registrar_bin."}, ): "JavaScript files should not include console logging." } diff --git a/core/build.gradle b/core/build.gradle index bc430dc54..d0b0e7014 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -651,5 +651,19 @@ task buildToolImage(dependsOn: nomulus, type: Exec) { commandLine 'docker', 'build', '-t', 'nomulus-tool', '.' } +task copyJsFilesForTestServer(dependsOn: assemble, type: Copy) { + // Unfortunately the test server relies on having some compiled JS/CSS + // in place, so copy it over here + from "${resourcesDir}/google/registry/ui/" + include '**/*.js' + include '**/*.css' + into "${project.projectDir}/src/main/resources/google/registry/ui/" +} + +task runTestServer(dependsOn: copyJsFilesForTestServer, type: JavaExec) { + main = 'google.registry.server.RegistryTestServerMain' + classpath = sourceSets.test.runtimeClasspath +} + project.build.dependsOn buildToolImage project.build.dependsOn ':stage' diff --git a/core/src/test/java/google/registry/server/RegistryTestServerMain.java b/core/src/test/java/google/registry/server/RegistryTestServerMain.java index 9b974587e..de9f55f61 100644 --- a/core/src/test/java/google/registry/server/RegistryTestServerMain.java +++ b/core/src/test/java/google/registry/server/RegistryTestServerMain.java @@ -41,7 +41,7 @@ public final class RegistryTestServerMain { @Parameter( names = "--mode", description = "UI console debug mode. RAW allows live editing; DEBUG allows rename testing.") - private ConsoleDebug mode = ConsoleDebug.RAW; + private ConsoleDebug mode = ConsoleDebug.PRODUCTION; @Parameter( names = "--address",