Remove screenshot links when creating a self contained report

The links are not needed, and they either cause duplication of large data URIs or a need for JavaScript

Author: davehunt

pytest_html/plugin.py

@@ -158,17 +158,17 @@ def append_extra_html(self, extra, extra_index, test_index):
             href = None
             if extra.get('format') == extras.FORMAT_IMAGE:
                 if self.self_contained:
-                    image_src = 'data:image/png;base64,{0}'.format(
+                    src = 'data:image/png;base64,{0}'.format(
                             extra.get('content'))
-                    href = '#'
+                    self.additional_html.append(html.div(
+                        html.img(src=src), class_='image'))
                 else:
                     content = b64decode(extra.get('content'))
-                    href = self.create_asset(content, extra_index,
-                                             test_index, 'png', 'wb')
-                    image_src = href
-                self.additional_html.append(html.div(
-                    html.a(html.img(src=image_src), href=href),
-                    class_='image'))
+                    href = src = self.create_asset(
+                        content, extra_index, test_index, 'png', 'wb')
+                    self.additional_html.append(html.div(
+                        html.a(html.img(src=src), href=href),
+                        class_='image'))
 
             elif extra.get('format') == extras.FORMAT_HTML:
                 self.additional_html.append(html.div(

pytest_html/resources/main.js

@@ -106,32 +106,6 @@ addEventListener("DOMContentLoaded", function() {
 
     toggle_sort_states(find('.initial-sort'));
 
-    find_all('.col-links a.image').forEach(function(elem) {
-        elem.addEventListener("click",
-                              function(event) {
-                                  var node = elem;
-                                  while (node && !node.classList.contains('results-table-row')) {
-                                      node = node.parentNode;
-                                  }
-                                  if (node != null) {
-                                      if (node.nextSibling &&
-                                          node.nextSibling.classList.contains("extra")) {
-                                          var href = find('.image img', node.nextSibling).src;
-                                          window.open(href);
-                                      }
-                                  }
-                                  event.preventDefault();
-                              }, false)
-    });
-
-    find_all('.image a').forEach(function(elem) {
-        elem.addEventListener("click",
-                              function(event) {
-                                  window.open(find('img', elem).getAttribute('src'));
-                                  event.preventDefault();
-                              }, false)
-    });
-
     find_all('.sortable').forEach(function(elem) {
         elem.addEventListener("click",
                               function(event) {

test_pytest_html.py

@@ -320,9 +320,8 @@ def pytest_runtest_makereport(item, call):
         testdir.makepyfile('def test_pass(): pass')
         result, html = run(testdir, 'report.html', '--self-contained-html')
         assert result.ret == 0
-        assert '<a class="image" href="#" target="_blank">Image</a>' in html
         src = 'data:image/png;base64,{0}'.format(content)
-        assert '<a href="#"><img src="{0}"/></a>'.format(src) in html
+        assert '<img src="{0}"/>'.format(src) in html
 
     @pytest.mark.parametrize('file_extension,file_type',
                              [('png', 'image'),