Skip to content

Commit 46c4eee

Browse files
committed
hacky solution for #2290
1 parent acca863 commit 46c4eee

File tree

6 files changed

+35
-3
lines changed

6 files changed

+35
-3
lines changed

karate-core/src/main/java/com/intuit/karate/core/ScenarioRuntime.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ public ScenarioRuntime(FeatureRuntime featureRuntime, Scenario scenario) {
9292
}
9393
result = new ScenarioResult(scenario);
9494
if (featureRuntime.setupResult != null) {
95+
// TODO improve this and simplify report rendering code in report/karate-feature.html
9596
StepResult sr = result.addFakeStepResult("@setup", null);
9697
List<FeatureResult> list = new ArrayList(1);
9798
FeatureResult fr = new FeatureResult(featureRuntime.featureCall.feature);

karate-core/src/main/java/com/intuit/karate/report/karate-feature.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
<span>ms:</span>&nbsp;<span th:text="Math.round(scenario.durationMillis)"></span>
6161
</div>
6262
</div>
63-
<div th:if="scenario.stepResults.length > 0 && scenario.stepResults[0].step.background" class="step-row">
63+
<div th:if="(scenario.stepResults.length > 0 && scenario.stepResults[0].step.background) || (scenario.stepResults.length > 1 && scenario.stepResults[1].step.background)" class="step-row">
6464
<div class="step-container" th:id="scenario.refId + 'bg'">
6565
<div class="step-ref bg-step">&gt;&gt;</div>
6666
<div class="step-cell passed">Background:</div>

karate-core/src/main/java/com/intuit/karate/report/karate-report.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ window.onload = function () {
1010
if (!parentIds[parent.id]) return
1111
const link = document.createElement('a')
1212
link.dataset.stepId = parent.id
13-
link.href = 'javascript:void()'
13+
link.href = 'javascript:void(0)'
1414
parent.parentNode.insertBefore(link, parent)
1515
link.appendChild(parent)
1616
})

karate-core/src/test/java/com/intuit/karate/report/test.feature

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,4 +46,14 @@ Examples:
4646

4747
Scenario: calling feature in loop
4848
* def data = [{ name: 'one' }, { name: 'two' }]
49-
* call read('called-loop.feature') data
49+
* call read('called-loop.feature') data
50+
51+
@setup
52+
Scenario:
53+
* def data = [{a: 1}, {a: 2}]
54+
55+
Scenario Outline:
56+
* print __row
57+
58+
Examples:
59+
| karate.setup().data |

karate-demo/src/test/java/demo/DemoRunner.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,10 @@ void testEncodingParallel() {
3232
DemoTestParallel.generateReport(results.getReportDir());
3333
assertTrue(results.getFailCount() == 0, results.getErrorMessages());
3434
}
35+
36+
@Karate.Test
37+
Karate testOutline() {
38+
return Karate.run("classpath:demo/outline/setup-outline.feature");
39+
}
3540

3641
}
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
Feature:
2+
3+
Background:
4+
* print 'in background'
5+
6+
@setup
7+
Scenario:
8+
* def data = [{a: 1}, {a: 2}]
9+
10+
Scenario Outline:
11+
* print __row
12+
13+
Examples:
14+
| karate.setup().data |
15+
16+

0 commit comments

Comments
 (0)