diff --git a/ietf/static/js/ietf.js b/ietf/static/js/ietf.js index 769a75efe..d8fde985f 100644 --- a/ietf/static/js/ietf.js +++ b/ietf/static/js/ietf.js @@ -123,7 +123,7 @@ $(document) .offset() .top > $(window) .height()) { - console.log("Enabling nav."); + // console.log("Enabling nav."); var n = 0; var last_level; var nav; diff --git a/ietf/static/js/ipr-edit.js b/ietf/static/js/ipr-edit.js index 7bf1e5c9d..fe67d22be 100644 --- a/ietf/static/js/ipr-edit.js +++ b/ietf/static/js/ipr-edit.js @@ -27,10 +27,6 @@ $(document) totalField.val(total); template.before(el); - // el.find(".select2-field") - // .each(function () { - // setupSelect2Field($(this)); - // }); }); function updateRevisions() { @@ -65,6 +61,8 @@ $(document) }); // add a little bit of delay to let the select2 box have time to do its magic + // FIXME: this should be done after a select2 event fires! + // See https://select2.org/programmatic-control/events setTimeout(function () { form.find(".draft-row") .each(updateRevisions); diff --git a/ietf/static/js/list.js b/ietf/static/js/list.js index 8374befd8..3114054e6 100644 --- a/ietf/static/js/list.js +++ b/ietf/static/js/list.js @@ -41,7 +41,7 @@ $(document) if ($(table) .hasClass("tablesorter-done")) { - console.log("tablesorter already initialized; list.js probably loaded twice."); + // console.log("tablesorter already initialized; list.js probably loaded twice."); return; } @@ -59,7 +59,7 @@ $(document) .toArray(); if (fields.length == 0 || !fields.filter(field => field != "")) { - console.log("No table fields defined, disabling search/sort."); + // console.log("No table fields defined, disabling search/sort."); return; } @@ -76,7 +76,7 @@ $(document) if ($(header_row) .text() .trim() == "") { - console.log("No headers fields visible, hiding header row."); + // console.log("No headers fields visible, hiding header row."); header_row.addClass("visually-hidden"); } @@ -148,7 +148,7 @@ $(document) .length; if (tbody_rows == 0) { - console.log("Skipping empty tbody"); + // console.log("Skipping empty tbody"); return; } else if (tbody_rows <= items_per_page) { pagination = false; @@ -168,7 +168,7 @@ $(document) var hook = `tablewrapper-${n}`; if (pagination) { - console.log("Enabling pager."); + // console.log("Enabling pager."); $(pager) .removeClass("visually-hidden"); pagination = { diff --git a/ietf/utils/jstest.py b/ietf/utils/jstest.py index ec3c49e80..e7b03b91d 100644 --- a/ietf/utils/jstest.py +++ b/ietf/utils/jstest.py @@ -68,26 +68,27 @@ class IetfSeleniumTestCase(IetfLiveServerTestCase): self.driver.set_window_size(1024,768) def tearDown(self): + msg = "" for type in ["browser", "driver"]: log = self.driver.get_log(type) if not log: continue for entry in log: - msg = entry["message"] + line = entry["message"] # suppress a bunch of benign/expected messages if ( - re.search(r"JQMIGRATE: Migrate is installed", msg) - or re.search(r"No headers fields visible, hiding", msg) - or re.search(r"No color for \w+: using default", msg) - or re.search(r"Invalid 'X-Frame-Options'", msg) - or re.search(r"Could not find parent", msg) - or re.search(r"Enabling nav", msg) - or re.search(r"/materials/.*mars.*status of 404", msg) + re.search(r"JQMIGRATE: Migrate is installed", line) + or re.search(r"No color for (farfut|acronym\d+):", line) + or re.search(r"Could not find parent \d+", line) + or re.search(r"/materials/.*mars.*status of 404", line) ): continue - self.test.assertEqual("", msg) + msg += f"{entry['level']}: {line}\n" + super(IetfSeleniumTestCase, self).tearDown() self.driver.close() + self.maxDiff = None + self.assertEqual("", msg) def absreverse(self,*args,**kwargs): return '%s%s'%(self.live_server_url, urlreverse(*args, **kwargs))