From 90e55587047c1a76f183fe857a80ebfd1aed34fb Mon Sep 17 00:00:00 2001
From: Ilya Chernikov <ilya.chernikov@jetbrains.com>
Date: Wed, 15 Nov 2017 13:30:17 +0100
Subject: [PATCH] Re-add node.js tests, switch to direct usage of
 node_utils.xml, remove node parts from update_dependencies.xml

---
 js/js.tests/build.gradle.kts | 13 +++++++++++++
 update_dependencies.xml      | 12 ------------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/js/js.tests/build.gradle.kts b/js/js.tests/build.gradle.kts
index 61bd536ba6a..e8fe203a143 100644
--- a/js/js.tests/build.gradle.kts
+++ b/js/js.tests/build.gradle.kts
@@ -82,6 +82,19 @@ projectTest("quickTest") {
     }
 }
 
+ant.importBuild(File(rootDir, "node_utils.xml"))
+
+val prepareNode: Task = tasks["download-nodejs-and-npm"]
+prepareNode.apply {
+    outputs.upToDateWhen { File(rootDir, "dependencies/node").exists() }
+}
+
+projectTest("nodeTest") {
+    workingDir = rootDir
+    dependsOn(prepareNode)
+    dependsOn("run-nodejs-tests")
+}
+
 val generateTests by generator("org.jetbrains.kotlin.generators.tests.GenerateJsTestsKt")
 val testDataDir = project(":js:js.translator").projectDir.resolve("testData")
 
diff --git a/update_dependencies.xml b/update_dependencies.xml
index 1b424a520dc..46db37dce77 100644
--- a/update_dependencies.xml
+++ b/update_dependencies.xml
@@ -171,18 +171,6 @@
             </patternset>
             <mapper type="flatten"/>
         </unzip>
-
-        <download_teamcity_artifact
-            teamcity.server.url="https://teamcity.jetbrains.com"
-            build.locator.request="${markdown.locator}"
-            artifact.path="markdown_jar/markdown.jar"
-            dest="${dependencies}/markdown.jar"
-            usetimestamp="true"
-            build.number.pattern="\d+\s-\sKotlin\s[\w-+\.]+"
-        />
-
-        <!-- node.js -->
-        <antcall target="download-nodejs-and-npm"/>
     </target>
 
     <macrodef name="download_teamcity_artifact">