-
Notifications
You must be signed in to change notification settings - Fork 79
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Remove unnecessary phrases data model (#288)
Co-authored-by: Andrei Kliuchnikau <akliuchn@gmail.com>
- Loading branch information
Showing
6 changed files
with
79 additions
and
122 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
43 changes: 0 additions & 43 deletions
43
...tifications-api/src/main/java/guru/qa/allure/notifications/template/data/PhrasesData.java
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
38 changes: 19 additions & 19 deletions
38
allure-notifications-api/src/main/resources/templates/markdown.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,33 +1,33 @@ | ||
| <#compress> | ||
| *${results}:* | ||
| *${environment}:* ${env} | ||
| *${comment}:* ${comm} | ||
| *${duration}:* ${time} | ||
| *${totalScenarios}:* ${total} | ||
| <#if passed != 0 > *${totalPassed}:* ${passed} (${passedPercentage} %)</#if> | ||
| <#if failed != 0 > *${totalFailed}:* ${failed} (${failedPercentage} %)</#if> | ||
| <#if broken != 0 > *${totalBroken}:* ${broken} </#if> | ||
| <#if unknown != 0 >*${totalUnknown}:* ${unknown} </#if> | ||
| <#if skipped != 0 >*${totalSkipped}:* ${skipped} </#if> | ||
| *${phrases.results}:* | ||
| *${phrases.environment}:* ${env} | ||
| *${phrases.comment}:* ${comm} | ||
| *${phrases.scenario.duration}:* ${time} | ||
| *${phrases.scenario.totalScenarios}:* ${total} | ||
| <#if passed != 0 > *${phrases.scenario.totalPassed}:* ${passed} (${passedPercentage} %)</#if> | ||
| <#if failed != 0 > *${phrases.scenario.totalFailed}:* ${failed} (${failedPercentage} %)</#if> | ||
| <#if broken != 0 > *${phrases.scenario.totalBroken}:* ${broken} </#if> | ||
| <#if unknown != 0 >*${phrases.scenario.totalUnknown}:* ${unknown} </#if> | ||
| <#if skipped != 0 >*${phrases.scenario.totalSkipped}:* ${skipped} </#if> | ||
|
|
||
| <#if suitesSummaryJson??> | ||
| <#assign suitesData = suitesSummaryJson?eval_json> | ||
| *${numberOfSuites}:* ${suitesData.total} | ||
| *${phrases.numberOfSuites}:* ${suitesData.total} | ||
| <#list suitesData.items as suite> | ||
| <#assign suitePassed = suite.statistic.passed> | ||
| <#assign suiteFailed = suite.statistic.failed> | ||
| <#assign suiteBroken = suite.statistic.broken> | ||
| <#assign suiteUnknown = suite.statistic.unknown> | ||
| <#assign suiteSkipped = suite.statistic.skipped> | ||
|
|
||
| *${suiteName}:* ${suite.name} | ||
| > *${totalScenarios}:* ${suite.statistic.total} | ||
| <#if suitePassed != 0 >> *${totalPassed}:* ${suitePassed}</#if> | ||
| <#if suiteFailed != 0 >> *${totalFailed}:* ${suiteFailed}</#if> | ||
| <#if suiteBroken != 0 >> *${totalBroken}:* ${suiteBroken}</#if> | ||
| <#if suiteUnknown != 0 >> *${totalUnknown}:* ${suiteUnknown}</#if> | ||
| <#if suiteSkipped != 0 >> *${totalSkipped}:* ${suiteSkipped}</#if> | ||
| *${phrases.suiteName}:* ${suite.name} | ||
| > *${phrases.scenario.totalScenarios}:* ${suite.statistic.total} | ||
| <#if suitePassed != 0 >> *${phrases.scenario.totalPassed}:* ${suitePassed}</#if> | ||
| <#if suiteFailed != 0 >> *${phrases.scenario.totalFailed}:* ${suiteFailed}</#if> | ||
| <#if suiteBroken != 0 >> *${phrases.scenario.totalBroken}:* ${suiteBroken}</#if> | ||
| <#if suiteUnknown != 0 >> *${phrases.scenario.totalUnknown}:* ${suiteUnknown}</#if> | ||
| <#if suiteSkipped != 0 >> *${phrases.scenario.totalSkipped}:* ${suiteSkipped}</#if> | ||
| </#list> | ||
| </#if> | ||
| <#if reportLink??>*${reportAvailableAtLink}:* ${reportLink}</#if> | ||
| <#if reportLink??>*${phrases.reportAvailableAtLink}:* ${reportLink}</#if> | ||
| </#compress> |
38 changes: 19 additions & 19 deletions
38
allure-notifications-api/src/main/resources/templates/rocket.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,33 +1,33 @@ | ||
| <#compress> | ||
| **${results}:** | ||
| **-${environment}:** ${env} | ||
| **-${comment}:** ${comm} | ||
| **-${duration}:** **${time}** | ||
| **-${totalScenarios}:** ${total} | ||
| <#if passed != 0 > **-${totalPassed}:** ${passed} **(${passedPercentage} %)**</#if> | ||
| <#if failed != 0 > **-${totalFailed}:** ${failed} **(${failedPercentage} %)** </#if> | ||
| <#if broken != 0 > **-${totalBroken}:** ${broken} </#if> | ||
| <#if unknown != 0 > **-${totalUnknown}:** ${unknown} </#if> | ||
| <#if skipped != 0 > **-${totalSkipped}:** ${skipped} </#if> | ||
| **${phrases.results}:** | ||
| **-${phrases.environment}:** ${env} | ||
| **-${phrases.comment}:** ${comm} | ||
| **-${phrases.scenario.duration}:** **${time}** | ||
| **-${phrases.scenario.totalScenarios}:** ${total} | ||
| <#if passed != 0 > **-${phrases.scenario.totalPassed}:** ${passed} **(${passedPercentage} %)**</#if> | ||
| <#if failed != 0 > **-${phrases.scenario.totalFailed}:** ${failed} **(${failedPercentage} %)** </#if> | ||
| <#if broken != 0 > **-${phrases.scenario.totalBroken}:** ${broken} </#if> | ||
| <#if unknown != 0 > **-${phrases.scenario.totalUnknown}:** ${unknown} </#if> | ||
| <#if skipped != 0 > **-${phrases.scenario.totalSkipped}:** ${skipped} </#if> | ||
|
|
||
| <#if suitesSummaryJson??> | ||
| <#assign suitesData = suitesSummaryJson?eval_json> | ||
| **-${numberOfSuites}:** **${suitesData.total}** | ||
| **-${phrases.numberOfSuites}:** **${suitesData.total}** | ||
| <#list suitesData.items as suite> | ||
| <#assign suitePassed = suite.statistic.passed> | ||
| <#assign suiteFailed = suite.statistic.failed> | ||
| <#assign suiteBroken = suite.statistic.broken> | ||
| <#assign suiteUnknown = suite.statistic.unknown> | ||
| <#assign suiteSkipped = suite.statistic.skipped> | ||
|
|
||
| **-${suiteName}:** **${suite.name}** | ||
| **-${totalScenarios}:** **${suite.statistic.total}** | ||
| <#if suitePassed != 0 > **-${totalPassed}:** ${suitePassed}</#if> | ||
| <#if suiteFailed != 0 > **-${totalFailed}:** ${suiteFailed}</#if> | ||
| <#if suiteBroken != 0 > **-${totalBroken}:** ${suiteBroken}</#if> | ||
| <#if suiteUnknown != 0 > **-${totalUnknown}:** ${suiteUnknown}</#if> | ||
| <#if suiteSkipped != 0 > **-${totalSkipped}:** ${suiteSkipped}</#if> | ||
| **-${phrases.suiteName}:** **${suite.name}** | ||
| **-${phrases.scenario.totalScenarios}:** **${suite.statistic.total}** | ||
| <#if suitePassed != 0 > **-${phrases.scenario.totalPassed}:** ${suitePassed}</#if> | ||
| <#if suiteFailed != 0 > **-${phrases.scenario.totalFailed}:** ${suiteFailed}</#if> | ||
| <#if suiteBroken != 0 > **-${phrases.scenario.totalBroken}:** ${suiteBroken}</#if> | ||
| <#if suiteUnknown != 0 > **-${phrases.scenario.totalUnknown}:** ${suiteUnknown}</#if> | ||
| <#if suiteSkipped != 0 > **-${phrases.scenario.totalSkipped}:** ${suiteSkipped}</#if> | ||
| </#list> | ||
| </#if> | ||
| <#if reportLink??>**${reportAvailableAtLink}:** ${reportLink}</#if> | ||
| <#if reportLink??>**${phrases.reportAvailableAtLink}:** ${reportLink}</#if> | ||
| </#compress> |
38 changes: 19 additions & 19 deletions
38
allure-notifications-api/src/main/resources/templates/telegram.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,33 +1,33 @@ | ||
| <#compress> | ||
| <b>${results}:</b> | ||
| <b>${environment}: </b>${env} | ||
| <b>${comment}: </b>${comm} | ||
| <b>${duration}: </b>${time} | ||
| <b>${totalScenarios}: </b>${total} | ||
| <#if passed != 0 ><b>${totalPassed}: </b>${passed} (${passedPercentage} %)</#if> | ||
| <#if failed != 0 ><b>${totalFailed}: </b>${failed} (${failedPercentage} %)</#if> | ||
| <#if broken != 0 ><b>${totalBroken}: </b>${broken}</#if> | ||
| <#if unknown != 0 ><b>${totalUnknown}: </b>${unknown}</#if> | ||
| <#if skipped != 0 ><b>${totalSkipped}: </b>${skipped}</#if> | ||
| <b>${phrases.results}:</b> | ||
| <b>${phrases.environment}: </b>${env} | ||
| <b>${phrases.comment}: </b>${comm} | ||
| <b>${phrases.scenario.duration}: </b>${time} | ||
| <b>${phrases.scenario.totalScenarios}: </b>${total} | ||
| <#if passed != 0 ><b>${phrases.scenario.totalPassed}: </b>${passed} (${passedPercentage} %)</#if> | ||
| <#if failed != 0 ><b>${phrases.scenario.totalFailed}: </b>${failed} (${failedPercentage} %)</#if> | ||
| <#if broken != 0 ><b>${phrases.scenario.totalBroken}: </b>${broken}</#if> | ||
| <#if unknown != 0 ><b>${phrases.scenario.totalUnknown}: </b>${unknown}</#if> | ||
| <#if skipped != 0 ><b>${phrases.scenario.totalSkipped}: </b>${skipped}</#if> | ||
|
|
||
| <#if suitesSummaryJson??> | ||
| <#assign suitesData = suitesSummaryJson?eval_json> | ||
| <b>${numberOfSuites}: </b>${suitesData.total} | ||
| <b>${phrases.numberOfSuites}: </b>${suitesData.total} | ||
| <#list suitesData.items as suite> | ||
| <#assign suitePassed = suite.statistic.passed> | ||
| <#assign suiteFailed = suite.statistic.failed> | ||
| <#assign suiteBroken = suite.statistic.broken> | ||
| <#assign suiteUnknown = suite.statistic.unknown> | ||
| <#assign suiteSkipped = suite.statistic.skipped> | ||
|
|
||
| <b>${suiteName}: </b>${suite.name} | ||
| <code>${totalScenarios}: ${suite.statistic.total}</code> | ||
| <#if suitePassed != 0 ><code>${totalPassed}: ${suitePassed}</code></#if> | ||
| <#if suiteFailed != 0 ><code>${totalFailed}: ${suiteFailed}</code></#if> | ||
| <#if suiteBroken != 0 ><code>${totalBroken}: ${suiteBroken}</code></#if> | ||
| <#if suiteUnknown != 0 ><code>${totalUnknown}: ${suiteUnknown}</code></#if> | ||
| <#if suiteSkipped != 0 ><code>${totalSkipped}: ${suiteSkipped}</code></#if> | ||
| <b>${phrases.suiteName}: </b>${suite.name} | ||
| <code>${phrases.scenario.totalScenarios}: ${suite.statistic.total}</code> | ||
| <#if suitePassed != 0 ><code>${phrases.scenario.totalPassed}: ${suitePassed}</code></#if> | ||
| <#if suiteFailed != 0 ><code>${phrases.scenario.totalFailed}: ${suiteFailed}</code></#if> | ||
| <#if suiteBroken != 0 ><code>${phrases.scenario.totalBroken}: ${suiteBroken}</code></#if> | ||
| <#if suiteUnknown != 0 ><code>${phrases.scenario.totalUnknown}: ${suiteUnknown}</code></#if> | ||
| <#if suiteSkipped != 0 ><code>${phrases.scenario.totalSkipped}: ${suiteSkipped}</code></#if> | ||
| </#list> | ||
| </#if> | ||
| <#if reportLink??><b>${reportAvailableAtLink}:</b> <a href="${reportLink}">${reportLink}</a></#if> | ||
| <#if reportLink??><b>${phrases.reportAvailableAtLink}:</b> <a href="${reportLink}">${reportLink}</a></#if> | ||
| </#compress> |