Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,9 @@ open class AllureAdapterExtension @Inject constructor(

fun gatherResultsFrom(tasks: TaskCollection<out Task>) {
project.apply<AllureAdapterBasePlugin>()
// Expose outgoing artifact without relying on afterEvaluate
exposeArtifact(tasks)
tasks.configureEach {
// Expose outgoing artifact and configure per-task without relying on afterEvaluate
exposeArtifact(project.tasks.named(name))
internalGatherResultsFrom(this)
}
}
Expand Down Expand Up @@ -160,15 +160,14 @@ open class AllureAdapterExtension @Inject constructor(
}
}

private fun exposeArtifact(task: TaskProvider<*>) {
private fun exposeArtifact(taskOrTasks: Any) {
// Expose the gathered raw results
val allureResults =
project.configurations[AllureAdapterBasePlugin.ALLURE_RAW_RESULT_ELEMENTS_CONFIGURATION_NAME]
allureResults.outgoing.artifact(allureResultsDir) {
builtBy(task)
builtBy(taskOrTasks)
}
}

private fun generateExecutorInfo(resultsDir: File, project: Project, taskName: String) {
val executorInfo = mapOf(
"name" to "Gradle",
Expand Down
5 changes: 5 additions & 0 deletions allure-plugin/src/it/expose-artifacts/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
plugins {
java
`jacoco-report-aggregation`
id("io.qameta.allure-adapter")
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
package io.qameta.allure.gradle.allure;

import static org.assertj.core.api.Assertions.assertThat;

import java.util.Arrays;
import java.util.Collection;

import org.gradle.testkit.runner.BuildResult;
import org.gradle.testkit.runner.TaskOutcome;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;

import io.qameta.allure.gradle.rule.GradleRunnerRule;

@RunWith(Parameterized.class)
public class ExposeArtifactsTest {
@Parameterized.Parameter(0)
public String version;

@Rule
public GradleRunnerRule gradleRunner = new GradleRunnerRule()
.version(() -> version)
.project("src/it/expose-artifacts")
.tasks("testCodeCoverageReport", "--dry-run");

@Parameterized.Parameters(name = "{0}")
public static Collection<String> getFrameworks() {
return Arrays.asList("9.0.0", "8.14.3", "8.11.1");
}

@Test
public void allureExposesElements() {
BuildResult buildResult = gradleRunner.getBuildResult();

assertThat(buildResult.getOutput())
.contains("BUILD SUCCESSFUL");
}

}