Show all scenarios when sequence is requested

trivago · Nov 2, 2023 · b629bd6 · b629bd6
1 parent 1eddaf8
commit b629bd6
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/engine/src/main/resources/template/macros/scenario.ftl b/engine/src/main/resources/template/macros/scenario.ftl
@@ -95,7 +95,7 @@ limitations under the License.
                                         <#if (skippedRequested && element.skipped) || (failedRequested && element.failed) || (passedRequested && element.passed) || allRequested>
                                             <#assign isLastOfMultipleScenarioRuns = element.getIsLastOfMultipleScenarioRuns()>
                                             <#assign isNotLastOfMultipleScenarioRuns = element.getIsNotLastOfMultipleScenarioRuns()>
-                                            <#if !isShowOnlyLastRuns() || (isShowOnlyLastRuns() && !isNotLastOfMultipleScenarioRuns)>
+                                            <#if !isShowOnlyLastRuns() || (isShowOnlyLastRuns() && !isNotLastOfMultipleScenarioRuns) || allRequested>
                                                 <tr class="table-row-${element.status.statusString}">
                                                     <#if allRequested>
                                                         <td class="text-right">${element.scenarioIndex}</td>
@@ -110,14 +110,16 @@ limitations under the License.
                                                         <#if element.firstExceptionClass != "">
                                                             <p class="firstException text-left small text-gray" style="word-break: break-word">${element.firstExceptionClass}</p>
                                                         </#if>
-                                                        <#list element.getChildrenElements() as childElement>
-                                                        <div class="notLastRun collapse">
-                                                                /-- <a href="pages/scenario-detail/scenario_${childElement.scenarioIndex?c}.html" style="word-break: break-all">Previous run - started at: ${childElement.startDateString} - ${childElement.startTimeString} <@common.status status=childElement.status.statusString/></a>
-                                                                <#if childElement.firstExceptionClass != "">
-                                                                    <p class="firstException text-left small text-gray" style="word-break: break-word">${childElement.firstExceptionClass}</p>
-                                                                </#if>
-                                                        </div>
-                                                    </#list>
+                                                        <#if isShowOnlyLastRuns() && isLastOfMultipleScenarioRuns && !allRequested>
+                                                            <#list element.getChildrenElements() as childElement>
+                                                                <div class="notLastRun collapse">
+                                                                        /-- <a href="pages/scenario-detail/scenario_${childElement.scenarioIndex?c}.html" style="word-break: break-all">Previous run - started at: ${childElement.startDateString} - ${childElement.startTimeString} <@common.status status=childElement.status.statusString/></a>
+                                                                        <#if childElement.firstExceptionClass != "">
+                                                                            <p class="firstException text-left small text-gray" style="word-break: break-word">${childElement.firstExceptionClass}</p>
+                                                                        </#if>
+                                                                </div>
+                                                            </#list>
+                                                        </#if>
                                                     </td>
                                                     <td class="text-center small" data-order="${element.startTimestamp}">
                                                         ${element.startDateString}<br>${element.startTimeString}
@@ -132,7 +134,7 @@ limitations under the License.
                                             </#if>
                                         </#if>
                                     </#list>
-                            </#list>
+                                </#list>
                             </tbody>
                         </table>
                     </div>

diff --git a/engine/src/main/resources/template/scenario-summary.ftl b/engine/src/main/resources/template/scenario-summary.ftl
@@ -128,15 +128,15 @@ preheadlineLink=preheadlineLink>
                             skipped</a> <@common.status status="skipped"/>
                     </#if>
                 </li>
-                <#if isShowOnlyLastRuns() && hasNotLastRunScenarios()>
+                <#if isShowOnlyLastRuns() && hasNotLastRunScenarios() && !(scenarioSequence??)>
                     <li class="list-group-item" data-cluecumber-item="scenario-summary">
                         Of which:
                         <br>
                         ${totalNumberOfNotLastScenariosRuns} ${common.pluralizeFn("Scenario", totalNumberOfNotLastScenariosRuns)} were not first runs
                     </li>
                 </#if>
             </ul>
-            <#if isShowOnlyLastRuns() && hasNotLastRunScenarios()>
+            <#if isShowOnlyLastRuns() && hasNotLastRunScenarios() && !(scenarioSequence??)>
                 <button class="btn btn-outline-secondary btn-block collapsed" type="button" data-toggle="collapse"
                         aria-expanded="true" data-cluecumber-item="show-not-last-runs-button"
                         data-target=".notLastRun">not last runs