Skip to content

Commit 0e6fa9a

Browse files
committed
Fix Issue #2
1 parent b90730d commit 0e6fa9a

File tree

3 files changed

+100
-31
lines changed

3 files changed

+100
-31
lines changed

reporter/assets/css/scenario_index.css

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -459,3 +459,23 @@ background-color: #E74C3C;
459459
padding: 50px 0;
460460
text-align: center;
461461
}
462+
463+
.step_title {
464+
margin-bottom: 10px;
465+
white-space:nowrap;
466+
overflow-x: hidden;
467+
text-overflow: ellipsis;
468+
}
469+
470+
.step_title_icon {
471+
margin-right: 5px;
472+
}
473+
474+
.not_available {
475+
text-align: center;
476+
width: 100%;
477+
}
478+
479+
.step_image {
480+
cursor: pointer;
481+
}

reporter/assets/js/sankey.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,13 @@
110110
return 10;
111111
})
112112
.style("fill", e)
113+
.style("cursor", function(t) {
114+
if(t.image) {
115+
return "pointer";
116+
} else {
117+
return "default";
118+
}
119+
})
113120
.on("mouseover", function(t) {
114121
mouseover(t, i);
115122
}).on("mouseout", function(t) {

reporter/scenario_report.html.erb

Lines changed: 73 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -125,9 +125,42 @@
125125
</div>
126126
</div>
127127
</div>
128-
</div>
128+
</div> <!-- Closes scenario row -->
129+
130+
<div class="row">
131+
<div class="col-md-12 col-sm-12 col-xs-12">
132+
<div class="x_panel" style="height: auto;">
133+
<div class="x_title">
134+
<h2>Screenshots</h2>
135+
<div class="clearfix"></div>
136+
</div>
137+
<div class="x_content">
138+
<div class="container">
139+
<div class="row">
140+
<% f["steps"].each do |s| %>
141+
<div class="col-md-2">
142+
<div class="step_title">
143+
<i class="fa fa-arrow-right step_title_icon"></i>
144+
<%= s["keyword"] %> <%= s["name"] %>
145+
</div>
146+
<% if(s["after"] && s["after"].count > 0 && s["after"].first["embeddings"] && s["after"].first["embeddings"].count > 0) %>
147+
<% step_image = s["after"].first["embeddings"].first["data"] %>
148+
<img src='<%= "data:image/png;base64,#{step_image}" %>' alt="" class="img-responsive step_image" onclick='<%= "openImageNewTab(\"#{step_image}\")" %>'>
149+
<% else %>
150+
<div class="not_available">
151+
NO IMAGE AVAILABLE
152+
</div>
153+
<% end %>
154+
</div>
155+
<% end %>
156+
</div>
157+
</div>
158+
</div>
159+
</div>
160+
</div>
161+
</div> <!-- Closes screenshots row -->
162+
<% end %>
129163
</div>
130-
<% end %>
131164

132165
<script src="../../assets/js/jquery-3.2.1.min.js" ></script>
133166
<script src="../../assets/js/bootstrap.min.js"></script>
@@ -136,39 +169,48 @@
136169
<script src="../../assets/js/dataTables.responsive.min.js"></script>
137170
<script src="../../assets/js/Chart.min.js"></script>
138171
<script>
139-
$(document).ready(function () {
140-
passed_scenarios = parseInt("<%= passed_scenarios(@feature).count %>")
141-
failed_scenarios = parseInt("<%= failed_scenarios(@feature).count %>")
172+
function openImageNewTab(imageData) {
173+
var im = new Image();
174+
im.src = "data:image/png;base64," + imageData
175+
var w = window.open("",'_blank');
176+
w.document.write(im.outerHTML);
177+
w.document.close();
178+
}
142179

143-
scenarios_data = [passed_scenarios,failed_scenarios];
144-
var scenarioOptions = {
145-
legend: false,
146-
responsive: false
147-
};
180+
$(document).ready(function () {
148181

149-
new Chart(document.getElementById("scenario-chart"), {
150-
type: 'doughnut',
151-
tooltipFillColor: "rgba(51, 51, 51, 0.55)",
152-
data: {
153-
labels: [
154-
"Passed",
155-
"Failed"
156-
],
157-
datasets: [{
158-
data: scenarios_data,
159-
backgroundColor: [
160-
"#26B99A",
161-
"#E74C3C"
162-
]
163-
}]
164-
},
165-
options: scenarioOptions
166-
});
182+
passed_scenarios = parseInt("<%= passed_scenarios(@feature).count %>")
183+
failed_scenarios = parseInt("<%= failed_scenarios(@feature).count %>")
184+
185+
scenarios_data = [passed_scenarios,failed_scenarios];
186+
var scenarioOptions = {
187+
legend: false,
188+
responsive: false
189+
};
190+
191+
new Chart(document.getElementById("scenario-chart"), {
192+
type: 'doughnut',
193+
tooltipFillColor: "rgba(51, 51, 51, 0.55)",
194+
data: {
195+
labels: [
196+
"Passed",
197+
"Failed"
198+
],
199+
datasets: [{
200+
data: scenarios_data,
201+
backgroundColor: [
202+
"#26B99A",
203+
"#E74C3C"
204+
]
205+
}]
206+
},
207+
options: scenarioOptions
208+
});
167209

168-
$('body').tooltip({
169-
selector: '[data-toggle="tooltip"]'
210+
$('body').tooltip({
211+
selector: '[data-toggle="tooltip"]'
212+
});
170213
});
171-
});
172214
</script>
173215
</body>
174216
</html>

0 commit comments

Comments
 (0)