From 3aa88a6ebe0003c6b45384e575c6422346d63d42 Mon Sep 17 00:00:00 2001
From: Ivan Kylchik <ivan.kylchik@jetbrains.com>
Date: Thu, 18 Nov 2021 15:14:38 +0300
Subject: [PATCH] [JS TESTS] Allow saving artifacts into build directory on
 teamcity

This is required to properly run node js tests.
---
 .../kotlin/js/test/AbstractJsBlackBoxCodegenTestBase.kt       | 4 ++--
 .../kotlin/js/test/handlers/JsArtifactsDumpHandler.kt         | 1 -
 .../kotlin/js/test/handlers/NodeJsGeneratorHandler.kt         | 3 ++-
 .../test/org/jetbrains/kotlin/js/test/ir/AbstractJsIrTest.kt  | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/AbstractJsBlackBoxCodegenTestBase.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/AbstractJsBlackBoxCodegenTestBase.kt
index c13b005896e..db236dccfb2 100644
--- a/js/js.tests/test/org/jetbrains/kotlin/js/test/AbstractJsBlackBoxCodegenTestBase.kt
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/AbstractJsBlackBoxCodegenTestBase.kt
@@ -100,10 +100,10 @@ abstract class AbstractJsBlackBoxCodegenTestBase<R : ResultingArtifact.FrontendO
         facadeStep(recompileFacade)
         jsArtifactsHandlersStep {
             useHandlers(
-                ::JsBoxRunner,
                 ::NodeJsGeneratorHandler,
-                ::JsMinifierRunner,
                 ::JsArtifactsDumpHandler,
+                ::JsBoxRunner,
+                ::JsMinifierRunner,
                 ::JsAstHandler
             )
         }
diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/handlers/JsArtifactsDumpHandler.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/handlers/JsArtifactsDumpHandler.kt
index 3176c2c6d78..f440f030cd4 100644
--- a/js/js.tests/test/org/jetbrains/kotlin/js/test/handlers/JsArtifactsDumpHandler.kt
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/handlers/JsArtifactsDumpHandler.kt
@@ -19,7 +19,6 @@ class JsArtifactsDumpHandler(testServices: TestServices) : JsBinaryArtifactHandl
     override fun processModule(module: TestModule, info: BinaryArtifacts.Js) {}
 
     override fun processAfterAllModules(someAssertionWasFailed: Boolean) {
-        if (JUnit5Assertions.isTeamCityBuild) return
         val originalFile = testServices.moduleStructure.originalTestDataFiles.first()
         val allDirectives = testServices.moduleStructure.allDirectives
 
diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/handlers/NodeJsGeneratorHandler.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/handlers/NodeJsGeneratorHandler.kt
index b032d746529..1fd01de8cbb 100644
--- a/js/js.tests/test/org/jetbrains/kotlin/js/test/handlers/NodeJsGeneratorHandler.kt
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/handlers/NodeJsGeneratorHandler.kt
@@ -36,7 +36,8 @@ class NodeJsGeneratorHandler(testServices: TestServices) : AbstractJsArtifactsCo
 
         val mainModuleName = getMainModuleName(testServices)
         val outputDir = File(JsEnvironmentConfigurator.getJsArtifactsOutputDir(testServices).absolutePath)
-        val ignored = globalDirectives[CodegenTestDirectives.IGNORE_BACKEND].contains(TargetBackend.JS)
+        val ignored = globalDirectives[CodegenTestDirectives.IGNORE_BACKEND]
+            .contains(testServices.defaultsProvider.defaultTargetBackend)
         val testPackage = extractTestPackage(testServices)
         val nodeRunnerText = generateNodeRunner(allJsFiles, outputDir, mainModuleName, ignored, testPackage)
 
diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/ir/AbstractJsIrTest.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/ir/AbstractJsIrTest.kt
index 79f13606da6..aa80a1912c0 100644
--- a/js/js.tests/test/org/jetbrains/kotlin/js/test/ir/AbstractJsIrTest.kt
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/ir/AbstractJsIrTest.kt
@@ -71,7 +71,7 @@ abstract class AbstractJsIrTest(
 
 open class AbstractIrBoxJsTest : AbstractJsIrTest(
     pathToTestDir = "${JsEnvironmentConfigurator.TEST_DATA_DIR_PATH}/box/",
-    testGroupOutputDirPrefix = "box/"
+    testGroupOutputDirPrefix = "irBox/"
 )
 
 open class AbstractIrJsCodegenBoxTest : AbstractJsIrTest(