Skip to content

Commit 288de41

Browse files
committed
closes #34
1 parent 57dfb31 commit 288de41

File tree

7 files changed

+135
-87
lines changed

7 files changed

+135
-87
lines changed

ExtentReports/Reporter/ExtentHtmlReporter.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,10 @@ private void AddTemplates()
6666
"Partials.Navbar",
6767
"Partials.RecurseNodes",
6868
"Partials.Scripts",
69-
"Partials.Sidenav"
69+
"Partials.Sidenav",
70+
"Partials.SparkBDD",
71+
"Partials.SparkStandard",
72+
"Partials.SparkStepDetails",
7073
};
7174

7275
TemplateLoadService.LoadTemplate<IHtmlMarker>(templates);

ExtentReports/Views/Html/Index.cshtml

Lines changed: 2 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -148,93 +148,11 @@
148148
</div>
149149
@if (!isbdd)
150150
{
151-
if (test.HasLog)
152-
{
153-
<div class="detail-body mt-4">
154-
@Include("Log", test)
155-
</div>
156-
}
157-
if (test.HasScreenCapture)
158-
{
159-
<div class="detail-foot">
160-
<ul class="attachments">
161-
@foreach (var sc in test.ScreenCaptureContext.All())
162-
{
163-
<li>
164-
<a href="@sc.ScreenCapturePath" data-featherlight="image">
165-
<div class="file-icon">
166-
<i class="fa fa-file-image-o"></i>
167-
</div>
168-
<div class="file-info">
169-
@if (sc.IsBase64)
170-
{
171-
<span class="file-name">base64</span>
172-
<span class="file-size">0Kb</span>
173-
} else {
174-
<span class="file-name">@sc.Name</span>
175-
<span class="file-size"> @(sc.FileSize)Kb</span>
176-
}
177-
</div>
178-
</a>
179-
</li>
180-
}
181-
</ul>
182-
</div>
183-
}
184-
if (test.HasChildren)
185-
{
186-
<div class="mt-4">
187-
@Include("RecurseNodes", test)
188-
</div>
189-
}
151+
@Include("SparkStandard", test)
190152
}
191153
else
192154
{
193-
if (test.HasChildren)
194-
{
195-
<div class="accordion mt-4">
196-
@foreach (var node in test.NodeContext.All())
197-
{
198-
<div class="card">
199-
<div class="card-header" role="tab">
200-
<h5 class="card-title pl-3">
201-
<div class="node">@node.Name</div>
202-
<div class="status-avatar float-left @node.Status.ToString().ToLower()-bg">
203-
<i class="fa [email protected](node.Status) text-white"></i>
204-
</div>
205-
</h5>
206-
</div>
207-
@if (node.HasChildren)
208-
{
209-
<div class="collapse">
210-
<div class="card-body">
211-
@foreach (var child in node.NodeContext.All())
212-
{
213-
<div class="">
214-
<div class="node">@child.BehaviorDrivenTypeName: @child.Name</div>
215-
<div class="status-avatar float-left @child.Status.ToString().ToLower()-bg">
216-
<i class="fa [email protected](child.Status) text-white"></i>
217-
</div>
218-
@if (!string.IsNullOrEmpty(child.Description))
219-
{
220-
<div class="node-description">@child.Description</div>
221-
}
222-
@if (child.HasLog)
223-
{
224-
foreach (var log in child.LogContext.All())
225-
{
226-
<div class="node-description">@log.Details</div>
227-
}
228-
}
229-
</div>
230-
}
231-
</div>
232-
</div>
233-
}
234-
</div>
235-
}
236-
</div>
237-
}
155+
@Include("SparkBDD", test)
238156
}
239157
</div>
240158
</li>

ExtentReports/Views/Html/Partials/Head.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<title>@Model.MasterConfig.GetValue("documentTitle")</title>
55
<link rel="apple-touch-icon" href="https://cdn.rawgit.com/extent-framework/extent-github-cdn/d74480e/commons/img/logo.png">
66
<link rel="shortcut icon" href="https://cdn.rawgit.com/extent-framework/extent-github-cdn/d74480e/commons/img/logo.png">
7-
<link href="https://cdn.rawgit.com/extent-framework/extent-github-cdn/a42e32f/spark/css/style.css" rel="stylesheet" />
7+
<link href="https://cdn.rawgit.com/extent-framework/extent-github-cdn/cd00a5e/spark/css/style.css" rel="stylesheet" />
88
<link href="https://stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet">
99
<style>@Model.MasterConfig.GetValue("css") @Model.MasterConfig.GetValue("styles")</style>
1010
</head>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<script type='text/javascript'>
22
@Model.MasterConfig.GetValue("js")
33
</script>
4-
<script src="https://cdn.rawgit.com/extent-framework/extent-github-cdn/a42e32f/spark/js/script.js"></script>
4+
<script src="https://cdn.rawgit.com/extent-framework/extent-github-cdn/f97b667/spark/js/script.js"></script>
Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
@using AventStack.ExtentReports.ViewDefs
2+
3+
@if (Model.HasChildren)
4+
{
5+
<div class="accordion mt-4">
6+
@foreach (var node in Model.NodeContext.All())
7+
{
8+
<div class="card">
9+
<div class="card-header" role="tab">
10+
<h5 class="card-title pl-3">
11+
<div class="node">@node.Name</div>
12+
<div class="status-avatar float-left @node.Status.ToString().ToLower()-bg">
13+
<i class="fa [email protected](node.Status) text-white"></i>
14+
</div>
15+
</h5>
16+
</div>
17+
@if (node.HasChildren)
18+
{
19+
if (node.BehaviorDrivenTypeName.Equals("Scenario Outline"))
20+
{
21+
<div class="collapse scenario_outline">
22+
@foreach (var child in node.NodeContext.All())
23+
{
24+
<div class="card-body l1">
25+
<div class="card-header" role="tab">
26+
<h5 class="card-title outline-child">
27+
<div class="node">@child.Name</div>
28+
<div class="status-avatar float-left @child.Status.ToString().ToLower()-bg">
29+
<i class="fa [email protected](child.Status) text-white"></i>
30+
</div>
31+
</h5>
32+
</div>
33+
<div class="card-body collapse mt-3">
34+
@foreach (var step in child.NodeContext.All())
35+
{
36+
<div class="d-flex align-items-center justify-content-start @step.BehaviorDrivenTypeName.Replace(" ","").ToLower()" title="@step.Description">
37+
<span class="alert-icon @step.Status.ToString().ToLower()-bg">
38+
<i class="fa [email protected](step.Status) text-white"></i>
39+
</span>
40+
<span>@step.Name</span>
41+
</div>
42+
@Include("SparkStepDetails", step)
43+
}
44+
</div>
45+
</div>
46+
}
47+
</div>
48+
}
49+
else
50+
{
51+
<div class="collapse">
52+
<div class="card-body">
53+
@foreach (var child in node.NodeContext.All())
54+
{
55+
<div class="d-flex align-items-center justify-content-start @child.BehaviorDrivenTypeName.Replace(" ","").ToLower()" title="@child.Description">
56+
<span class="alert-icon @child.Status.ToString().ToLower()-bg">
57+
<i class="fa [email protected](child.Status) text-white"></i>
58+
</span>
59+
<span>@child.Name</span>
60+
</div>
61+
@Include("SparkStepDetails", child)
62+
}
63+
</div>
64+
</div>
65+
}
66+
}
67+
</div>
68+
}
69+
</div>
70+
}
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
@if (Model.HasLog)
2+
{
3+
<div class="detail-body mt-4">
4+
@Include("Log", Model)
5+
</div>
6+
}
7+
@if (Model.HasScreenCapture)
8+
{
9+
<div class="detail-foot">
10+
<ul class="attachments">
11+
@foreach (var sc in Model.ScreenCaptureContext.All())
12+
{
13+
<li>
14+
<a href="@sc.ScreenCapturePath" data-featherlight="image">
15+
<div class="file-icon">
16+
<i class="fa fa-file-image-o"></i>
17+
</div>
18+
<div class="file-info">
19+
@if (sc.IsBase64)
20+
{
21+
<span class="file-name">base64</span>
22+
<span class="file-size">0Kb</span>
23+
} else {
24+
<span class="file-name">@sc.Name</span>
25+
<span class="file-size"> @(sc.FileSize)Kb</span>
26+
}
27+
</div>
28+
</a>
29+
</li>
30+
}
31+
</ul>
32+
</div>
33+
}
34+
@if (Model.HasChildren)
35+
{
36+
<div class="mt-4">
37+
@Include("RecurseNodes", Model)
38+
</div>
39+
}
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
@if (Model.HasLog)
2+
{
3+
foreach (var log in Model.LogContext.All())
4+
{
5+
if (log.HasException)
6+
{
7+
<textarea disabled class="code-block">@log.ExceptionInfo.Exception.StackTrace</textarea>
8+
}
9+
else
10+
{
11+
<div class="details">@Raw(log.Details)</div>
12+
}
13+
if (log.HasScreenCapture)
14+
{
15+
<span class="badge badge-primary">@Raw(log.ScreenCaptureContext.FirstOrDefault().Source)</span>
16+
}
17+
}
18+
}

0 commit comments

Comments
 (0)