From e9bc64e103ed197bcaf85d4e7448e563c2c3bf23 Mon Sep 17 00:00:00 2001
From: Ilya Goncharov <ilya.goncharov@jetbrains.com>
Date: Thu, 2 Apr 2020 17:13:11 +0300
Subject: [PATCH] [Gradle, JS] Add test on css and migrate one test on groovy
 dsl

#KT-32721 fixed
---
 .../kotlin-js-browser-project/app/build.gradle.kts           | 1 +
 .../kotlin-js-browser-project/app/src/main/css/main.css      | 3 +++
 .../kotlin-js-browser-project/app/src/main/kotlin/App.kt     | 5 ++++-
 .../{build.gradle.kts => build.gradle}                       | 4 ++--
 .../{settings.gradle.kts => settings.gradle}                 | 0
 5 files changed, 10 insertions(+), 3 deletions(-)
 create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-browser-project/app/src/main/css/main.css
 rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-nodejs-project/{build.gradle.kts => build.gradle} (59%)
 rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-nodejs-project/{settings.gradle.kts => settings.gradle} (100%)

diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-browser-project/app/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-browser-project/app/build.gradle.kts
index 7261f2fac4a..9ac038b1989 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-browser-project/app/build.gradle.kts
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-browser-project/app/build.gradle.kts
@@ -5,6 +5,7 @@ plugins {
 dependencies {
     implementation(kotlin("stdlib-js"))
     implementation(project(":lib"))
+    implementation(npm(projectDir.resolve("src/main/css")))
 }
 
 kotlin {
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-browser-project/app/src/main/css/main.css b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-browser-project/app/src/main/css/main.css
new file mode 100644
index 00000000000..269de7394b5
--- /dev/null
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-browser-project/app/src/main/css/main.css
@@ -0,0 +1,3 @@
+body {
+    background-color: aliceblue;
+}
\ No newline at end of file
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-browser-project/app/src/main/kotlin/App.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-browser-project/app/src/main/kotlin/App.kt
index 6b4e8fd8103..b700d846d64 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-browser-project/app/src/main/kotlin/App.kt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-browser-project/app/src/main/kotlin/App.kt
@@ -6,5 +6,8 @@
 package com.example
 
 fun main() {
+    require("css/main.css")
     println("Sheldon: ${sheldon()}")
-}
\ No newline at end of file
+}
+
+external fun require(o: String)
\ No newline at end of file
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-nodejs-project/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-nodejs-project/build.gradle
similarity index 59%
rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-nodejs-project/build.gradle.kts
rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-nodejs-project/build.gradle
index 4c74d0cf114..d379f316339 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-nodejs-project/build.gradle.kts
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-nodejs-project/build.gradle
@@ -1,9 +1,9 @@
 plugins {
-    kotlin("js").version("<pluginMarkerVersion>")
+    id("org.jetbrains.kotlin.js") version "<pluginMarkerVersion>"
 }
 
 dependencies {
-    implementation(kotlin("stdlib-js"))
+    implementation("org.jetbrains.kotlin:kotlin-stdlib-js")
 }
 
 repositories {
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-nodejs-project/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-nodejs-project/settings.gradle
similarity index 100%
rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-nodejs-project/settings.gradle.kts
rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-nodejs-project/settings.gradle