From 6ab87ad66aaac981c399e9473c906caca9d1af1f Mon Sep 17 00:00:00 2001
From: Alexey Andreev <Alexey.Andreev@jetbrains.com>
Date: Thu, 23 Nov 2017 11:43:36 +0300
Subject: [PATCH] Fix failing JS tests

---
 .../outerCapturedInLambdaInSecondaryConstructor.kt        | 3 ---
 .../js/test/semantics/JsCodegenBoxTestGenerated.java      | 8 +-------
 .../testData/box/expression/stringTemplates/nonStrings.kt | 2 +-
 3 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/compiler/testData/codegen/box/closures/captureInSuperConstructorCall/outerCapturedInLambdaInSecondaryConstructor.kt b/compiler/testData/codegen/box/closures/captureInSuperConstructorCall/outerCapturedInLambdaInSecondaryConstructor.kt
index 7b6f17e3f1f..33d6595fe4f 100644
--- a/compiler/testData/codegen/box/closures/captureInSuperConstructorCall/outerCapturedInLambdaInSecondaryConstructor.kt
+++ b/compiler/testData/codegen/box/closures/captureInSuperConstructorCall/outerCapturedInLambdaInSecondaryConstructor.kt
@@ -1,6 +1,3 @@
-// IGNORE_BACKEND: JS
-// ^ see KT-21041
-
 open class Base(val callback: () -> String)
 
 class Outer {
diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java
index e78a6b64a67..70e8c663a88 100644
--- a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java
@@ -4654,13 +4654,7 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
             @TestMetadata("outerCapturedInLambdaInSecondaryConstructor.kt")
             public void testOuterCapturedInLambdaInSecondaryConstructor() throws Exception {
                 String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/captureInSuperConstructorCall/outerCapturedInLambdaInSecondaryConstructor.kt");
-                try {
-                    doTest(fileName);
-                }
-                catch (Throwable ignore) {
-                    return;
-                }
-                throw new AssertionError("Looks like this test can be unmuted. Remove IGNORE_BACKEND directive for that.");
+                doTest(fileName);
             }
 
             @TestMetadata("outerCapturedInLambdaInSubExpression.kt")
diff --git a/js/js.translator/testData/box/expression/stringTemplates/nonStrings.kt b/js/js.translator/testData/box/expression/stringTemplates/nonStrings.kt
index f697630a933..34b7ccb170d 100644
--- a/js/js.translator/testData/box/expression/stringTemplates/nonStrings.kt
+++ b/js/js.translator/testData/box/expression/stringTemplates/nonStrings.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 1024
+// EXPECTED_REACHABLE_NODES: 1127
 fun box(): String {
     val x = foo()
     val y = bar()