Feature: Only one collapsed state (pytest-dev#701)

BeyondEvil · Jul 27, 2023 · 8a4ece4 · 8a4ece4
1 parent d7301b7
commit 8a4ece4
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 36 deletions.
diff --git a/src/layout/css/style.scss b/src/layout/css/style.scss
@@ -182,9 +182,6 @@ div.media {
   flex: 0 0 25px;
   align-items: center;
 }
-.collapsed {
-  display: none;
-}
 
 @mixin rowToggle {
   color: #bbb;
@@ -199,25 +196,25 @@ div.media {
   }
 }
 
-.col-result.collapser {
+.col-result {
   &:hover::after {
     content: ' (hide details)';
   }
 }
-.col-result.expander {
+.col-result.collapsed {
   &:hover::after {
     content: ' (show details)';
   }
 }
 
-#environment-header.collapser h2 {
+#environment-header h2 {
   &:hover::after {
     content: ' (hide details)';
     @include rowToggle;
     font-size: $font-size-text;
   }
 }
-#environment-header.expander h2 {
+#environment-header.collapsed h2 {
   &:hover::after {
     content: ' (show details)';
     @include rowToggle;

diff --git a/src/pytest_html/resources/index.jinja2 b/src/pytest_html/resources/index.jinja2
@@ -15,7 +15,7 @@
     <h1 id="title">{{ title }}</h1>
     <p>Report generated on {{ date }} at {{ time }} by <a href="https://pypi.python.org/pypi/pytest-html">pytest-html</a>
         v{{ version }}</p>
-    <div id="environment-header" class="collapser">
+    <div id="environment-header">
       <h2>Environment</h2>
     </div>
     <table id="environment"></table>

diff --git a/src/pytest_html/resources/style.css b/src/pytest_html/resources/style.css
diff --git a/src/pytest_html/scripts/dom.js b/src/pytest_html/scripts/dom.js
@@ -50,7 +50,6 @@ const dom = {
             t.innerHTML = html
             resultBody.querySelector('.collapsible').appendChild(t.content)
         })
-        resultBody.querySelector('.collapsible > td')?.classList.add(`${collapsed ? 'expander' : 'collapser'}`)
 
         if (log) {
             // Wrap lines starting with "E" with span.error to color those lines red
@@ -61,7 +60,10 @@ const dom = {
         }
 
         if (collapsed) {
+            resultBody.querySelector('.collapsible > td')?.classList.add('collapsed')
             resultBody.querySelector('.extras-row').classList.add('hidden')
+        } else {
+            resultBody.querySelector('.collapsible > td')?.classList.remove('collapsed')
         }
 
         const media = []

diff --git a/src/pytest_html/scripts/main.js b/src/pytest_html/scripts/main.js
@@ -80,8 +80,7 @@ const bindEvents = () => {
     header.addEventListener('click', () => {
         const table = document.getElementById('environment')
         table.classList.toggle('hidden')
-        header.classList.toggle('collapser')
-        header.classList.toggle('expander')
+        header.classList.toggle('collapsed')
     })
 
     findAll('input[name="filter_checkbox"]').forEach((elem) => {

diff --git a/src/pytest_html/scripts/storage.js b/src/pytest_html/scripts/storage.js
@@ -38,25 +38,15 @@ const showCategory = (categoryToShow) => {
         return
     }
     const url = new URL(window.location.href)
-    const currentVisible = new URLSearchParams(url.search).get('visible')?.split(',') || [...possibleFilters]
+    const currentVisible = new URLSearchParams(url.search).get('visible')?.split(',').filter(Boolean) ||
+        [...possibleFilters]
     const settings = [...new Set([categoryToShow, ...currentVisible])]
     const noFilter = possibleFilters.length === settings.length || !settings.length
 
     noFilter ? url.searchParams.delete('visible') : url.searchParams.set('visible', settings.join(','))
     history.pushState({}, null, unescape(url.href))
 }
 
-const setFilter = (currentFilter) => {
-    if (!possibleFilters.includes(currentFilter)) {
-        return
-    }
-    const url = new URL(window.location.href)
-    const settings = [currentFilter, ...new Set(new URLSearchParams(url.search).get('filter').split(','))]
-
-    url.searchParams.set('filter', settings)
-    history.pushState({}, null, unescape(url.href))
-}
-
 const getSort = (initialSort) => {
     const url = new URL(window.location.href)
     let sort = new URLSearchParams(url.search).get('sort')
@@ -103,7 +93,6 @@ const setSortDirection = (ascending) => sessionStorage.setItem('sortAsc', ascend
 
 module.exports = {
     getVisible,
-    setFilter,
     hideCategory,
     showCategory,
     getSort,

diff --git a/testing/test_integration.py b/testing/test_integration.py
@@ -88,7 +88,7 @@ def get_text(page, selector):
 
 
 def is_collapsed(page, test_name):
-    return get_element(page, f".summary tbody[id$='{test_name}'] .expander")
+    return get_element(page, f".summary tbody[id$='{test_name}'] .collapsed")
 
 
 def get_log(page, test_id=None):

diff --git a/testing/unittest.js b/testing/unittest.js
@@ -76,11 +76,8 @@ describe('Filter tests', () => {
         })
     })
     describe('doFilter', () => {
-        let setFilterMock
-        afterEach(() => setFilterMock.restore())
         it('removes all but passed', () => {
             getFilterMock = sinon.stub(storageModule, 'getVisible').returns(['passed'])
-            setFilterMock = sinon.stub(storageModule, 'setFilter')
             managerSpy = sinon.spy(dataModule.manager, 'setRender')
 
             doFilter('passed', true)