Skip to content

Commit

Permalink
Merge pull request #78 from zebrunner/develop
Browse files Browse the repository at this point in the history
1.0.2
  • Loading branch information
akamarouski authored Jun 1, 2023
2 parents 618b6c7 + ac0d2d8 commit 5a8e36e
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 8 deletions.
19 changes: 13 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>11</java.version>
<carina-core.version>1.0.1</carina-core.version>
<carina-core.version>1.0.2</carina-core.version>
<guava.version>31.1-jre</guava.version>
<cucumber.testng.version>7.12.0</cucumber.testng.version>
<cucumber.java.version>7.12.0</cucumber.java.version>
Expand All @@ -54,9 +54,9 @@
<maven-assembly-plugin.version>3.1.0</maven-assembly-plugin.version>
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
</properties>
<repositories>
<!-- Uncomment only for testing any SNAPSHOT version of carina! -->
<!--repository>
<!-- Uncomment only for testing any SNAPSHOT version of carina! -->
<!--repositories>
<repository>
<id>zebrunner_snapshots</id>
<name>zebrunner Snapshots</name>
<url>https://nexus.zebrunner.dev/repository/ce-snapshots/</url>
Expand All @@ -66,8 +66,8 @@
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository-->
</repositories>
</repository>
</repositories-->
<dependencies>
<!-- We should set correct version of guava for Selenium. Copied from the carina-webdriver -->
<dependency>
Expand All @@ -94,6 +94,13 @@
<version>${cucumber.reporting}</version>
</dependency>

<!-- Issue: #76 -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.12.0</version>
</dependency>

<dependency>
<groupId>com.zebrunner</groupId>
<artifactId>carina-core</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,8 @@ private void generateCucumberReport() {
ReportBuilder reportBuilder = new ReportBuilder(list, configuration);
reportBuilder.generateReports();

if (!Configuration.isNull(Configuration.Parameter.REPORT_URL)) {
String reportUrl = Configuration.get(Configuration.Parameter.REPORT_URL);
if (!Configuration.isNull(Configuration.Parameter.CI_BUILD_URL)) {
String reportUrl = Configuration.get(Configuration.Parameter.CI_BUILD_URL);
if (reportUrl.endsWith(ZAFIRA_REPORT_CI)) {
Artifact.attachReferenceToTestRun(CUCUMBER_REPORT_NAME, reportUrl.replace(ZAFIRA_REPORT_CI, CUCUMBER_REPORT_CI));
} else {
Expand Down

0 comments on commit 5a8e36e

Please sign in to comment.