get rid test directory (via #71)

allure-framework · Sep 27, 2021 · 135345d · 135345d
1 parent 93d92c7
commit 135345d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/...-adapter-plugin/src/main/kotlin/io/qameta/allure/gradle/adapter/AllureAdapterExtension.kt b/...-adapter-plugin/src/main/kotlin/io/qameta/allure/gradle/adapter/AllureAdapterExtension.kt
@@ -121,7 +121,7 @@ open class AllureAdapterExtension @Inject constructor(
         task.run {
             // Each task should store results in its own folder
             // End user should not depend on the folder name, so we do not expose it
-            val rawResults = project.layout.buildDirectory.dir("allure-results/${task.name}").get().asFile
+            val rawResults = project.layout.buildDirectory.dir("allure-results").get().asFile
             // See https://github.com/allure-framework/allure2/issues/1236
             // We exclude categories.json since report task would copy categories right to the folder
             // of the current task

diff --git a/allure-plugin/src/test/java/io/qameta/allure/gradle/allure/DependenciesTest.java b/allure-plugin/src/test/java/io/qameta/allure/gradle/allure/DependenciesTest.java
@@ -67,7 +67,7 @@ public void shouldCreateAllureResults() {
                 .extracting("outcome")
                 .containsExactly(SUCCESS);
 
-        File resultsDir = new File(gradleRunner.getProjectDir(), "build/allure-results/test");
+        File resultsDir = new File(gradleRunner.getProjectDir(), "build/allure-results");
         assertThat(resultsDir).as("Allure results directory")
                 .exists();
 

diff --git a/allure-plugin/src/test/java/io/qameta/allure/gradle/allure/TestNgSpiOffTest.java b/allure-plugin/src/test/java/io/qameta/allure/gradle/allure/TestNgSpiOffTest.java
@@ -45,7 +45,7 @@ public void allureReportIsNotGenerated() {
                 .filteredOn(task -> task.getPath().equals(":test") || task.getPath().equals(":allureReport"))
                 .extracting("outcome")
                 .containsExactly(SUCCESS);
-        File resultsDir = new File(projectDir.getAbsolutePath() + "/build/allure-results/test");
+        File resultsDir = new File(projectDir.getAbsolutePath() + "/build/allure-results");
         // executor.json is always generated
         assertThat(resultsDir.listFiles())
                 .filteredOn(file -> !file.getName().equals("executor.json"))