diff --git a/.circleci/config.yml b/.circleci/config.yml index a817962452..e578c0d2e7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -294,7 +294,7 @@ jobs: . venv/bin/activate && rm -rf components/dash-core-components/dash_core_components cd components/dash-core-components TESTFILES=$(circleci tests glob "tests/integration/**/test_*.py" | circleci tests split --split-by=timings) - pytest --headless --nopercyfinalize --junitxml=test-reports/junit_intg.xml --junitprefix="components.dash-core-components" ${TESTFILES} + pytest --headless --nopercyfinalize --junitxml=test-reports/junit_intg.xml --junitprefix="components.dash-core-components" ${TESTFILES} --reruns 3 - store_artifacts: path: ~/dash/components/dash-core-components/test-reports - store_test_results: @@ -385,7 +385,7 @@ jobs: PERCY_ENABLE: 1 PERCY_PARALLEL_TOTAL: -1 - parallelism: 4 + parallelism: 5 steps: - checkout: diff --git a/CHANGELOG.md b/CHANGELOG.md index b689c025ca..7b67f54c9b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ All notable changes to `dash` will be documented in this file. This project adheres to [Semantic Versioning](https://semver.org/). +## [2.3.1] - 2022-03-29 + +### Fixed + +- [#1963](https://github.com/plotly/dash/pull/1963) Fix [#1780](https://github.com/plotly/dash/issues/1780) flask shutdown deprecation warning when running dashduo threaded tests. +- [#1995](https://github.com/plotly/dash/pull/1995) Fix [#1992](https://github.com/plotly/dash/issues/1992) ImportError: cannot import name 'get_current_traceback' from 'werkzeug.debug.tbtools'. + ## [2.3.0] - 2022-03-13 ### Added diff --git a/README.md b/README.md index c56949f01d..1d33e645d4 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ Built on top of [Plotly.js](https://github.com/plotly/plotly.js), [React](https: |![Sample Dash App](https://user-images.githubusercontent.com/1280389/30086128-9bb4a28e-9267-11e7-8fe4-bbac7d53f2b0.gif) | Here’s a simple example of a Dash App that ties a Dropdown to a Plotly Graph. As the user selects a value in the Dropdown, the application code dynamically exports data from Google Finance into a Pandas DataFrame. This app was written in just **43** lines of code ([view the source](https://gist.github.com/chriddyp/3d2454905d8f01886d651f207e2419f0)). | |![Crossfiltering Dash App](https://user-images.githubusercontent.com/1280389/30086123-97c58bde-9267-11e7-98a0-7f626de5199a.gif)|Dash app code is declarative and reactive, which makes it easy to build complex apps that contain many interactive elements. Here’s an example with 5 inputs, 3 outputs, and cross filtering. This app was composed in just 160 lines of code, all of which were Python.| |![Dash App with Mapbox map showing walmart store openings](https://user-images.githubusercontent.com/1280389/30086299-768509d0-9268-11e7-8e6b-626ac9ca512c.gif)| Dash uses [Plotly.js](https://github.com/plotly/plotly.js) for charting. About 50 chart types are supported, including maps. | -|![Financial report](https://github.com/plotly/dash-docs/blob/516f80c417051406210b94ea23a6d3b6cd84d146/assets/images/gallery/dash-financial-report.gif)| Dash isn't just for dashboards. You have full control over the look and feel of your applications. Here's a Dash App that's styled to look like a PDF report. | +|![Financial report](https://user-images.githubusercontent.com/2678795/161153710-57952401-6e07-42d5-ba3e-bab6419998c7.gif)| Dash isn't just for dashboards. You have full control over the look and feel of your applications. Here's a Dash App that's styled to look like a PDF report. | To learn more about Dash, read the [extensive announcement letter](https://medium.com/@plotlygraphs/introducing-dash-5ecf7191b503) or [jump in with the user guide](https://plotly.com/dash). @@ -53,4 +53,4 @@ Enterprise AI Features: Everything that your data science team needs to rapidly See [https://plotly.com/contact-us/](https://plotly.com/contact-us/) to get in touch. -![image](https://images.prismic.io/plotly-marketing-website/493eec39-8467-4610-b9d0-d6ad3ea61423_Dash+Open+source%2BDash+enterprise2-01.jpg?auto=compress,format) +![Dash Enterprise](https://user-images.githubusercontent.com/2678795/161155614-21c54a22-f821-4dda-b910-ee27e27fb5f2.png) diff --git a/components/dash-core-components/package.json b/components/dash-core-components/package.json index d2ec111356..7e21392942 100644 --- a/components/dash-core-components/package.json +++ b/components/dash-core-components/package.json @@ -21,7 +21,7 @@ "private::lint.prettier": "prettier --config .prettierrc src/**/*.js --list-different", "prepublishOnly": "rm -rf lib && babel src --out-dir lib --copy-files && rm -rf lib/jl/ lib/*.jl", "test": "run-s -c lint test:intg test:pyimport", - "test:intg": "pytest --nopercyfinalize --headless tests/integration", + "test:intg": "pytest --nopercyfinalize --headless tests/integration --reruns 3", "test:pyimport": "python -m unittest tests/test_dash_import.py", "prebuild:js": "cp node_modules/plotly.js-dist-min/plotly.min.js dash_core_components_base/plotly.min.js && cp node_modules/mathjax/es5/tex-svg.js dash_core_components_base/mathjax.js", "build:js": "webpack --mode production", diff --git a/components/dash-core-components/tests/integration/calendar/test_date_picker_single.py b/components/dash-core-components/tests/integration/calendar/test_date_picker_single.py index ae44220c75..f1e38a05b8 100644 --- a/components/dash-core-components/tests/integration/calendar/test_date_picker_single.py +++ b/components/dash-core-components/tests/integration/calendar/test_date_picker_single.py @@ -3,6 +3,8 @@ import time import pytest +import werkzeug + from dash import Dash, Input, Output, html, dcc, no_update @@ -73,6 +75,11 @@ def test_dtps010_local_and_session_persistence(dash_dcc): assert dash_dcc.get_logs() == [] +@pytest.mark.xfail( + condition=werkzeug.__version__ in ("2.1.0", "2.1.1"), + reason="Bug with 204 and Transfer-Encoding", + strict=False, +) def test_dtps011_memory_persistence(dash_dcc): app = Dash(__name__) app.layout = html.Div( diff --git a/components/dash-core-components/tests/integration/dropdown/test_dynamic_options.py b/components/dash-core-components/tests/integration/dropdown/test_dynamic_options.py index 85d9985579..c16c3f39eb 100644 --- a/components/dash-core-components/tests/integration/dropdown/test_dynamic_options.py +++ b/components/dash-core-components/tests/integration/dropdown/test_dynamic_options.py @@ -24,8 +24,7 @@ def update_options(search_value): dash_dcc.start_server(app) # Get the inner input used for search value. - dropdown = dash_dcc.find_element("#my-dynamic-dropdown") - input_ = dropdown.find_element_by_css_selector("input") + input_ = dash_dcc.find_element("#my-dynamic-dropdown input") # Focus on the input to open the options menu input_.send_keys("x") @@ -36,7 +35,7 @@ def update_options(search_value): input_.clear() input_.send_keys("o") - options = dropdown.find_elements_by_css_selector(".VirtualizedSelectOption") + options = dash_dcc.find_elements("#my-dynamic-dropdown .VirtualizedSelectOption") # Should show all options. assert len(options) == 3 @@ -44,7 +43,7 @@ def update_options(search_value): # Searching for `on` input_.send_keys("n") - options = dropdown.find_elements_by_css_selector(".VirtualizedSelectOption") + options = dash_dcc.find_elements("#my-dynamic-dropdown .VirtualizedSelectOption") assert len(options) == 1 print(options) diff --git a/components/dash-core-components/tests/integration/graph/test_graph_varia.py b/components/dash-core-components/tests/integration/graph/test_graph_varia.py index 885635632f..d0e669e90e 100644 --- a/components/dash-core-components/tests/integration/graph/test_graph_varia.py +++ b/components/dash-core-components/tests/integration/graph/test_graph_varia.py @@ -2,6 +2,9 @@ import pytest import time import json + +import werkzeug + from dash import Dash, Input, Output, State, dcc, html from dash.exceptions import PreventUpdate from selenium.webdriver.common.by import By @@ -128,7 +131,7 @@ def show_relayout_data(data): # use this opportunity to test restyleData, since there are multiple # traces on this graph - legendToggle = dash_dcc.driver.find_element_by_css_selector( + legendToggle = dash_dcc.find_element( "#example-graph .traces:first-child .legendtoggle" ) legendToggle.click() @@ -142,7 +145,7 @@ def show_relayout_data(data): ) # and test relayoutData while we're at it - autoscale = dash_dcc.driver.find_element_by_css_selector("#example-graph .ewdrag") + autoscale = dash_dcc.find_element("#example-graph .ewdrag") autoscale.click() autoscale.click() dash_dcc.wait_for_text_to_equal("#relayout-data", '{"xaxis.autorange": true}') @@ -185,6 +188,10 @@ def render_content(click, prev_graph): assert dash_dcc.get_logs() == [] +@pytest.mark.skipif( + werkzeug.__version__ in ("2.1.0", "2.1.1"), + reason="Bug with no_update 204 responses get Transfer-Encoding header.", +) @pytest.mark.parametrize("is_eager", [True, False]) def test_grva004_graph_prepend_trace(dash_dcc, is_eager): app = Dash(__name__, eager_loading=is_eager) @@ -357,6 +364,10 @@ def display_data(trigger, fig): assert dash_dcc.get_logs() == [] +@pytest.mark.skipif( + werkzeug.__version__ in ("2.1.0", "2.1.1"), + reason="Bug with no_update 204 responses get Transfer-Encoding header.", +) @pytest.mark.parametrize("is_eager", [True, False]) def test_grva005_graph_extend_trace(dash_dcc, is_eager): app = Dash(__name__, eager_loading=is_eager) diff --git a/components/dash-core-components/tests/integration/link/test_absolute_path.py b/components/dash-core-components/tests/integration/link/test_absolute_path.py index 253a21e0ba..e119d845bd 100644 --- a/components/dash-core-components/tests/integration/link/test_absolute_path.py +++ b/components/dash-core-components/tests/integration/link/test_absolute_path.py @@ -49,7 +49,7 @@ def extras(t): dcc.Link( children="Absolute Path", id="link1", - href=dash_dcc.server.url + "/extra/eseehc", + href="/extra/eseehc", refresh=True, ), dcc.Location(id="url", refresh=False), diff --git a/components/dash-core-components/tests/integration/link/test_link_event.py b/components/dash-core-components/tests/integration/link/test_link_event.py index 6aaff50805..8bf5b45fca 100644 --- a/components/dash-core-components/tests/integration/link/test_link_event.py +++ b/components/dash-core-components/tests/integration/link/test_link_event.py @@ -93,7 +93,9 @@ def display_page(pathname): dash_dcc.wait_for_text_to_equal("#page-content", "You are on page /test-link") wait.until( - lambda: test_link.get_attribute("href") == "http://localhost:8050/test-link", 3 + lambda: test_link.get_attribute("href") + == "http://localhost:{}/test-link".format(dash_dcc.server.port), + 3, ) wait.until(lambda: call_count.value == 2, 3) diff --git a/components/dash-core-components/tests/integration/location/test_location_callback.py b/components/dash-core-components/tests/integration/location/test_location_callback.py index 58447bee11..29dd8ea2a6 100644 --- a/components/dash-core-components/tests/integration/location/test_location_callback.py +++ b/components/dash-core-components/tests/integration/location/test_location_callback.py @@ -93,7 +93,9 @@ def update_pathname(n_clicks, current_pathname): # Check that link updates pathname dash_dcc.find_element("#test-link").click() until( - lambda: dash_dcc.driver.current_url.replace("http://localhost:8050", "") + lambda: dash_dcc.driver.current_url.replace( + "http://localhost:{}".format(dash_dcc.server.port), "" + ) == "/test/pathname", 3, ) diff --git a/components/dash-core-components/tests/integration/store/test_data_lifecycle.py b/components/dash-core-components/tests/integration/store/test_data_lifecycle.py index cff132a9b2..9b74467ab3 100644 --- a/components/dash-core-components/tests/integration/store/test_data_lifecycle.py +++ b/components/dash-core-components/tests/integration/store/test_data_lifecycle.py @@ -1,6 +1,14 @@ +import pytest +import werkzeug + import dash.testing.wait as wait +@pytest.mark.xfail( + condition=werkzeug.__version__ in ("2.1.0", "2.1.1"), + reason="Bug with 204 and Transfer-Encoding", + strict=False, +) def test_stdl001_data_lifecycle_with_different_condition(store_app, dash_dcc): dash_dcc.start_server(store_app) diff --git a/components/dash-core-components/tests/integration/tab/test_tabs_with_graphs.py b/components/dash-core-components/tests/integration/tab/test_tabs_with_graphs.py index ffe456fb4d..ebf6d1893a 100644 --- a/components/dash-core-components/tests/integration/tab/test_tabs_with_graphs.py +++ b/components/dash-core-components/tests/integration/tab/test_tabs_with_graphs.py @@ -1,3 +1,5 @@ +import werkzeug + from dash import Dash, Input, Output, dcc, html from dash.exceptions import PreventUpdate import json @@ -119,6 +121,11 @@ def render_content(tab): assert dash_dcc.get_logs() == [] +@pytest.mark.xfail( + condition=werkzeug.__version__ in ("2.1.0", "2.1.1"), + reason="Bug with 204 and Transfer-Encoding", + strict=False, +) @pytest.mark.parametrize("is_eager", [True, False]) def test_tabs_render_without_selected(dash_dcc, is_eager): app = Dash(__name__, eager_loading=is_eager) diff --git a/components/dash-html-components/scripts/data/attributes.json b/components/dash-html-components/scripts/data/attributes.json index f120e120bc..3259095d4c 100644 --- a/components/dash-html-components/scripts/data/attributes.json +++ b/components/dash-html-components/scripts/data/attributes.json @@ -417,12 +417,6 @@ ], "description": "Indicates the upper bound of the lower range." }, - "manifest": { - "elements": [ - "html" - ], - "description": "Specifies the URL of the document's cache manifest. Note: This attribute is obsolete, use instead." - }, "max": { "elements": [ "input", @@ -511,7 +505,7 @@ "details", "dialog" ], - "description": "Indicates whether the the contents are currently visible (in the case of a
element) or whether the dialog is active and can be interacted with (in the case of a element)." + "description": "Indicates whether the contents are currently visible (in the case of a
element) or whether the dialog is active and can be interacted with (in the case of a element)." }, "optimum": { "elements": [ @@ -591,6 +585,12 @@ ], "description": "Indicates whether the list should be displayed in a descending order instead of a ascending." }, + "role": { + "elements": [ + "Globalattribute" + ], + "description": "Defines an explicit role for an element for use by assistive technologies." + }, "rows": { "elements": [ "textarea" @@ -616,12 +616,6 @@ ], "description": "Defines the cells that the header test (defined in the th element) relates to." }, - "scoped": { - "elements": [ - "style" - ], - "description": "" - }, "selected": { "elements": [ "option" @@ -714,12 +708,6 @@ ], "description": "Defines CSS styles which will override styles previously set." }, - "summary": { - "elements": [ - "table" - ], - "description": "" - }, "tabIndex": { "elements": [ "Globalattribute" @@ -852,6 +840,7 @@ "hidden", "id", "lang", + "role", "spellCheck", "style", "tabIndex", @@ -1110,9 +1099,6 @@ "marquee": [ "loop" ], - "html": [ - "manifest" - ], "source": [ "media", "sizes", @@ -1122,7 +1108,6 @@ ], "style": [ "media", - "scoped", "type" ], "map": [ @@ -1148,9 +1133,6 @@ "colgroup": [ "span" ], - "table": [ - "summary" - ], "menu": [ "type" ], diff --git a/components/dash-html-components/scripts/generate-components.js b/components/dash-html-components/scripts/generate-components.js index e2f1a77e84..13532f88b8 100644 --- a/components/dash-html-components/scripts/generate-components.js +++ b/components/dash-html-components/scripts/generate-components.js @@ -145,11 +145,6 @@ function generatePropTypes(element, attributes) { */ 'key': PropTypes.string, - /** - * The ARIA role attribute - */ - 'role': PropTypes.string, - /** * A wildcard data attribute */ diff --git a/components/dash-html-components/tests/test_integration.py b/components/dash-html-components/tests/test_integration.py index 88aeae5491..df838cca8d 100644 --- a/components/dash-html-components/tests/test_integration.py +++ b/components/dash-html-components/tests/test_integration.py @@ -16,7 +16,13 @@ def test_click_simple(dash_duo): ] ) - @app.callback(Output("container", "children"), Input("button", "n_clicks")) + @app.callback( + Output("container", "children"), + Input("button", "n_clicks"), + # The new percy runner loads the page, so to get consistent behavior for + # call_count we need to skip the initial call + prevent_initial_call=True, + ) def update_output(n_clicks): call_count.value += 1 return "clicked {} times".format(n_clicks) @@ -25,14 +31,13 @@ def update_output(n_clicks): dash_duo.find_element("#container") - dash_duo.wait_for_text_to_equal("#container", "clicked 0 times") - assert call_count.value == 1 + assert call_count.value == 0 dash_duo.percy_snapshot("html button initialization") dash_duo.find_element("#button").click() dash_duo.wait_for_text_to_equal("#container", "clicked 1 times") - assert call_count.value == 2 + assert call_count.value == 1 dash_duo.percy_snapshot("html button click") assert not dash_duo.get_logs() @@ -49,7 +54,7 @@ def test_click_prev(dash_duo): app = Dash(__name__) app.layout = html.Div( [ - html.Div(id="container"), + html.Div("Initial", id="container"), html.Button("Click", id="button-1", n_clicks=0, n_clicks_timestamp=-1), html.Button("Click", id="button-2", n_clicks=0, n_clicks_timestamp=-1), ] @@ -63,6 +68,7 @@ def test_click_prev(dash_duo): Input("button-2", "n_clicks"), Input("button-2", "n_clicks_timestamp"), ], + prevent_initial_call=True, ) def update_output(*args): print(args) @@ -73,17 +79,17 @@ def update_output(*args): dash_duo.start_server(app) - dash_duo.wait_for_text_to_equal("#container", "0, 0") - assert timestamp_1.value == -1 - assert timestamp_2.value == -1 - assert call_count.value == 1 + dash_duo.wait_for_text_to_equal("#container", "Initial") + assert timestamp_1.value == -5 + assert timestamp_2.value == -5 + assert call_count.value == 0 dash_duo.percy_snapshot("html button initialization 1") dash_duo.find_element("#button-1").click() dash_duo.wait_for_text_to_equal("#container", "1, 0") assert timestamp_1.value > ((time.time() - (24 * 60 * 60)) * 1000) assert timestamp_2.value == -1 - assert call_count.value == 2 + assert call_count.value == 1 dash_duo.percy_snapshot("html button-1 click") prev_timestamp_1 = timestamp_1.value @@ -91,7 +97,7 @@ def update_output(*args): dash_duo.wait_for_text_to_equal("#container", "1, 1") assert timestamp_1.value == prev_timestamp_1 assert timestamp_2.value > ((time.time() - 24 * 60 * 60) * 1000) - assert call_count.value == 3 + assert call_count.value == 2 dash_duo.percy_snapshot("html button-2 click") prev_timestamp_2 = timestamp_2.value @@ -100,7 +106,7 @@ def update_output(*args): assert timestamp_1.value == prev_timestamp_1 assert timestamp_2.value > prev_timestamp_2 assert timestamp_2.value > timestamp_1.value - assert call_count.value == 4 + assert call_count.value == 3 dash_duo.percy_snapshot("html button-2 click again") assert not dash_duo.get_logs() diff --git a/components/dash-table/tests/selenium/conftest.py b/components/dash-table/tests/selenium/conftest.py index db24fe8dde..5be45ce543 100644 --- a/components/dash-table/tests/selenium/conftest.py +++ b/components/dash-table/tests/selenium/conftest.py @@ -52,7 +52,7 @@ def __init__(self, id, mixin, row, col, state=_ANY): self.state = state def _get_cell_value(self): - return self.get().find_element_by_css_selector(".dash-cell-value") + return self.get().find_element(By.CSS_SELECTOR, ".dash-cell-value") def click(self): return self.get().click() @@ -104,13 +104,19 @@ def get(self): ) ) + def find_inside(self, selector): + return self.get().find_element(By.CSS_SELECTOR, selector) + + def find_all_inside(self, selector): + return self.get().find_elements(By.CSS_SELECTOR, selector) + def is_dropdown(self): - el = self.get().find_elements_by_css_selector(".Select-arrow") + el = self.get().find_elements(By.CSS_SELECTOR, ".Select-arrow") return len(el) == 1 def is_input(self): - el = self.get().find_elements_by_css_selector(".dash-cell-value") + el = self.get().find_elements(By.CSS_SELECTOR, ".dash-cell-value") return len(el) == 1 and el[0].get_attribute("type") is not None @@ -130,7 +136,7 @@ def move_to(self): return ac.perform() def is_active(self): - input = self.get().find_element_by_css_selector("input") + input = self.get().find_element(By.CSS_SELECTOR, "input") return "focused" in input.get_attribute("class").split(" ") @@ -152,7 +158,7 @@ def is_value_focused(self): def open_dropdown(self): cell = self.get() - cell.find_element_by_css_selector(".Select-arrow").click() + cell.find_element(By.CSS_SELECTOR, ".Select-arrow").click() class DataTableColumnFacade(object): @@ -181,6 +187,12 @@ def get(self, row=0): ) ) + def find_inside(self, row, selector): + return self.get(row).find_element(By.CSS_SELECTOR, selector) + + def find_all_inside(self, row, selector): + return self.get(row).find_elements(By.CSS_SELECTOR, selector) + def exists(self, row=0): self.mixin._wait_for_table(self.id, self.state) @@ -202,33 +214,29 @@ def exists(self, row=0): @preconditions(_validate_row) def clear(self, row=0): - self.get(row).find_element_by_css_selector(".column-header--clear").click() + self.find_inside(row, ".column-header--clear").click() @preconditions(_validate_row) def delete(self, row=0): - self.get(row).find_element_by_css_selector(".column-header--delete").click() + self.find_inside(row, ".column-header--delete").click() @preconditions(_validate_row) def edit(self, row=0): - self.get(row).find_element_by_css_selector(".column-header--edit").click() + self.find_inside(row, ".column-header--edit").click() @preconditions(_validate_row) def get_text(self, row=0): - el = self.get(row).find_element_by_css_selector("span.column-header-name") + el = self.find_inside(row, "span.column-header-name") return el.get_attribute("innerHTML") if el is not None else None @preconditions(_validate_row) def hide(self, row=0): - self.get(row).find_element_by_css_selector(".column-header--hide").click() + self.find_inside(row, ".column-header--hide").click() @preconditions(_validate_row) def is_selected(self, row=0): - return ( - self.get(row) - .find_element_by_css_selector(".column-header--select input") - .is_selected() - ) + return self.find_inside(row, ".column-header--select input").is_selected() @preconditions(_validate_row) def move_to(self, row=0): @@ -238,13 +246,11 @@ def move_to(self, row=0): @preconditions(_validate_row) def select(self, row=0): - self.get(row).find_element_by_css_selector( - ".column-header--select input" - ).click() + self.find_inside(row, ".column-header--select input").click() @preconditions(_validate_row) def sort(self, row=0): - self.get(row).find_element_by_css_selector(".column-header--sort").click() + self.find_inside(row, ".column-header--sort").click() def filter(self): return ( @@ -264,7 +270,7 @@ def filter(self): def filter_clear(self): CMD = Keys.COMMAND if platform.system() == "Darwin" else Keys.CONTROL - self.filter().find_element_by_css_selector("input").click() + self.filter().find_element(By.CSS_SELECTOR, "input").click() ac = ActionChains(self.mixin.driver) ac.key_down(CMD) ac.send_keys("a") @@ -282,7 +288,7 @@ def filter_value(self, value=None): if value is None: return ( self.filter() - .find_element_by_css_selector("input") + .find_element(By.CSS_SELECTOR, "input") .get_attribute("value") ) elif value == "": @@ -321,7 +327,7 @@ def is_selected(self): self.id, self.state ) )[self.row] - .find_element_by_css_selector("input") + .find_element(By.CSS_SELECTOR, "input") .is_selected() ) @@ -399,6 +405,12 @@ def _get_tooltip(self): def get(self): return self._get_tooltip() + def find_inside(self, selector): + return self.get().find_element(By.CSS_SELECTOR, selector) + + def find_all_inside(self, selector): + return self.get().find_elements(By.CSS_SELECTOR, selector) + def exists(self): self.mixin._wait_for_table(self.id) @@ -412,11 +424,7 @@ def missing(self): return len(self.mixin.find_elements(".dash-tooltip")) == 0 def get_text(self): - return ( - self._get_tooltip() - .find_element_by_css_selector(".dash-table-tooltip") - .get_attribute("innerHTML") - ) + return self.find_inside(".dash-table-tooltip").get_attribute("innerHTML") class DataTableToggleColumnsFacade(object): diff --git a/components/dash-table/tests/selenium/test_edit.py b/components/dash-table/tests/selenium/test_edit.py index 3163bd41dd..3699e9bdef 100644 --- a/components/dash-table/tests/selenium/test_edit.py +++ b/components/dash-table/tests/selenium/test_edit.py @@ -29,8 +29,8 @@ def test_edit001_can_delete_dropdown(test, props): cell.click() assert cell.is_dropdown() - cell.get().find_element_by_css_selector(".Select-clear").click() - assert cell.get().find_element_by_css_selector(".Select-placeholder") is not None + cell.find_inside(".Select-clear").click() + assert cell.find_inside(".Select-placeholder") is not None assert test.get_log_errors() == [] @@ -45,13 +45,13 @@ def test_edit002_can_delete_dropown_and_set(test, props): cell.click() assert cell.is_dropdown() - cell.get().find_element_by_css_selector(".Select-clear").click() - assert cell.get().find_element_by_css_selector(".Select-placeholder") is not None + cell.find_inside(".Select-clear").click() + assert cell.find_inside(".Select-placeholder") is not None - cell.get().find_element_by_css_selector(".Select-arrow").click() - cell.get().find_element_by_css_selector(".Select-option").click() + cell.find_inside(".Select-arrow").click() + cell.find_inside(".Select-option").click() - assert len(cell.get().find_elements_by_css_selector(".Select-placeholder")) == 0 + assert len(cell.find_all_inside(".Select-placeholder")) == 0 assert test.get_log_errors() == [] @@ -63,22 +63,19 @@ def test_edit003_can_edit_dropdown(test, props): target = test.table("table") cell = target.cell(0, "bbb") - cell.get().find_element_by_css_selector(".Select-arrow").click() - cell.get().find_element_by_css_selector(".Select-arrow").click() + cell.find_inside(".Select-arrow").click() + cell.find_inside(".Select-arrow").click() - for i in range(len(cell.get().find_elements_by_css_selector(".Select-option"))): - option = cell.get().find_elements_by_css_selector(".Select-option")[i] + for i in range(len(cell.find_all_inside(".Select-option"))): + option = cell.find_all_inside(".Select-option")[i] value = option.get_attribute("innerHTML") option.click() assert ( - cell.get() - .find_element_by_css_selector(".Select-value-label") - .get_attribute("innerHTML") - == value + cell.find_inside(".Select-value-label").get_attribute("innerHTML") == value ) - cell.get().find_element_by_css_selector(".Select-arrow").click() + cell.find_inside(".Select-arrow").click() assert test.get_log_errors() == [] diff --git a/components/dash-table/tests/selenium/test_editable.py b/components/dash-table/tests/selenium/test_editable.py index b237654cc7..9eeb42c77f 100644 --- a/components/dash-table/tests/selenium/test_editable.py +++ b/components/dash-table/tests/selenium/test_editable.py @@ -73,10 +73,10 @@ def test_tedi001_loading_on_data_change(test): test.find_element("#blocking").click() target.is_loading() target.cell(0, 0).click() - assert len(target.cell(0, 0).get().find_elements_by_css_selector("input")) == 0 + assert len(target.cell(0, 0).find_all_inside("input")) == 0 target.is_ready() - assert target.cell(0, 0).get().find_element_by_css_selector("input") is not None + assert target.cell(0, 0).find_inside("input") is not None assert test.get_log_errors() == [] @@ -91,10 +91,10 @@ def test_tedi002_ready_on_non_data_change(test): test.find_element("#non-blocking").click() target.is_ready() target.cell(0, 0).click() - assert target.cell(0, 0).get().find_element_by_css_selector("input") is not None + assert target.cell(0, 0).find_inside("input") is not None target.is_ready() - assert target.cell(0, 0).get().find_element_by_css_selector("input") is not None + assert target.cell(0, 0).find_inside("input") is not None assert test.get_log_errors() == [] diff --git a/components/dash-table/tests/selenium/test_empty.py b/components/dash-table/tests/selenium/test_empty.py index 9b315c4cd4..fb10ae8e18 100644 --- a/components/dash-table/tests/selenium/test_empty.py +++ b/components/dash-table/tests/selenium/test_empty.py @@ -40,8 +40,8 @@ def test_empt001_clear_(test): target = test.table("table") assert target.is_ready() - assert len(test.driver.find_elements_by_css_selector("tr")) == 3 - test.driver.find_element_by_css_selector("#clear-table").click() + assert len(test.find_elements("tr")) == 3 + test.find_element("#clear-table").click() assert target.is_ready() - assert len(test.driver.find_elements_by_css_selector("tr")) == 0 + assert len(test.find_elements("tr")) == 0 assert test.get_log_errors() == [] diff --git a/components/dash-table/tests/selenium/test_filter2.py b/components/dash-table/tests/selenium/test_filter2.py index 6ce6f5f90e..8a12ace17c 100644 --- a/components/dash-table/tests/selenium/test_filter2.py +++ b/components/dash-table/tests/selenium/test_filter2.py @@ -207,7 +207,7 @@ def test_spfi008_reset_updates(test): assert target.column("ddd").filter_value() == "lt 12500" assert target.column("eee").filter_value() == "is prime" - test.driver.find_element_by_css_selector("#btn").click() + test.find_element("#btn").click() assert target.cell(0, "ccc").get_text() == ccc0 assert target.cell(1, "ccc").get_text() == ccc1 diff --git a/components/dash-table/tests/selenium/test_markdown.py b/components/dash-table/tests/selenium/test_markdown.py index 038319c71a..26f8f7c9db 100644 --- a/components/dash-table/tests/selenium/test_markdown.py +++ b/components/dash-table/tests/selenium/test_markdown.py @@ -32,8 +32,7 @@ def test_mark001_header(test): target.column(0).sort(1) assert ( target.cell(0, "markdown-headers") - .get() - .find_element_by_css_selector(".dash-cell-value > p") + .find_inside(".dash-cell-value > p") .get_attribute("innerHTML") == "row 0" ) @@ -41,8 +40,7 @@ def test_mark001_header(test): target.column(0).sort(1) assert ( target.cell(0, "markdown-headers") - .get() - .find_element_by_css_selector(".dash-cell-value > h5") + .find_inside(".dash-cell-value > h5") .get_attribute("innerHTML") == "row 95" ) @@ -56,8 +54,7 @@ def test_mark002_emphasized_text(test): target.column(1).sort(1) assert ( target.cell(0, "markdown-italics") - .get() - .find_element_by_css_selector(".dash-cell-value > p > em") + .find_inside(".dash-cell-value > p > em") .get_attribute("innerHTML") == "1" ) @@ -65,8 +62,7 @@ def test_mark002_emphasized_text(test): target.column(1).sort(1) assert ( target.cell(0, "markdown-italics") - .get() - .find_element_by_css_selector(".dash-cell-value > p > em") + .find_inside(".dash-cell-value > p > em") .get_attribute("innerHTML") == "98" ) @@ -80,8 +76,7 @@ def test_mark003_link(test): target.column(2).sort(1) assert ( target.cell(0, "markdown-links") - .get() - .find_element_by_css_selector(".dash-cell-value > p > a") + .find_inside(".dash-cell-value > p > a") .get_attribute("innerHTML") == "Learn about 0" ) @@ -89,8 +84,7 @@ def test_mark003_link(test): target.column(2).sort(1) assert ( target.cell(0, "markdown-links") - .get() - .find_element_by_css_selector(".dash-cell-value > p > a") + .find_inside(".dash-cell-value > p > a") .get_attribute("innerHTML") == "Learn about 9" ) @@ -104,8 +98,7 @@ def test_mark004_image(test): target.column(8).sort(1) assert ( target.cell(0, "markdown-images") - .get() - .find_element_by_css_selector(".dash-cell-value > p > img") + .find_inside(".dash-cell-value > p > img") .get_attribute("alt") == "image 0 alt text" ) @@ -113,8 +106,7 @@ def test_mark004_image(test): target.column(8).sort(1) assert ( target.cell(0, "markdown-images") - .get() - .find_element_by_css_selector(".dash-cell-value > p > img") + .find_inside(".dash-cell-value > p > img") .get_attribute("alt") == "image 99 alt text" ) @@ -128,8 +120,7 @@ def test_mark005_table(test): target.column(4).sort(1) assert ( target.cell(0, "markdown-tables") - .get() - .find_element_by_css_selector(".dash-cell-value > table > tbody > tr > td") + .find_inside(".dash-cell-value > table > tbody > tr > td") .get_attribute("innerHTML") == "0" ) @@ -137,8 +128,7 @@ def test_mark005_table(test): target.column(4).sort(1) assert ( target.cell(0, "markdown-tables") - .get() - .find_element_by_css_selector(".dash-cell-value > table > tbody > tr > td") + .find_inside(".dash-cell-value > table > tbody > tr > td") .get_attribute("innerHTML") == "99" ) @@ -156,8 +146,7 @@ def test_mark006_filter_link_text(test, filter): assert ( target.cell(0, "markdown-links") - .get() - .find_element_by_css_selector(".dash-cell-value > p > a") + .find_inside(".dash-cell-value > p > a") .get_attribute("href") == "http://en.wikipedia.org/wiki/97" ) @@ -172,8 +161,7 @@ def test_mark007_filter_image_alt_text(test): assert ( target.cell(0, "markdown-images") - .get() - .find_element_by_css_selector(".dash-cell-value > p > img") + .find_inside(".dash-cell-value > p > img") .get_attribute("alt") == "image 97 alt text" ) @@ -186,9 +174,9 @@ def test_mark008_loads_highlightjs(test): target = test.table("table") wait.until( lambda: len( - target.cell(0, "markdown-code-blocks") - .get() - .find_elements_by_css_selector("code.language-python") + target.cell(0, "markdown-code-blocks").find_all_inside( + "code.language-python" + ) ) == 1, 3, @@ -205,9 +193,9 @@ def test_mark009_loads_custom_highlightjs(test): target = test.table("table") wait.until( lambda: len( - target.cell(0, "markdown-code-blocks") - .get() - .find_elements_by_css_selector("code.language-python") + target.cell(0, "markdown-code-blocks").find_all_inside( + "code.language-python" + ) ) == 1, 3, @@ -215,8 +203,7 @@ def test_mark009_loads_custom_highlightjs(test): wait.until( lambda: target.cell(0, "markdown-code-blocks") - .get() - .find_element_by_css_selector("code.language-python") + .find_inside("code.language-python") .get_attribute("innerHTML") == "hljs override", 3, diff --git a/components/dash-table/tests/selenium/test_markdown_copy_paste.py b/components/dash-table/tests/selenium/test_markdown_copy_paste.py index 624b5b936d..fdfd3b0527 100644 --- a/components/dash-table/tests/selenium/test_markdown_copy_paste.py +++ b/components/dash-table/tests/selenium/test_markdown_copy_paste.py @@ -1,5 +1,6 @@ -import dash import pytest + +import dash from dash.testing import wait from dash.dash_table import DataTable @@ -94,8 +95,7 @@ def test_tmcp003_copy_text_to_markdown(test): wait.until( lambda: target.cell(1, "Product") - .get() - .find_element_by_css_selector(".dash-cell-value > p") + .find_inside(".dash-cell-value > p") .get_attribute("innerHTML") == df[1].get("Sub-product"), 3, @@ -116,8 +116,7 @@ def test_tmcp004_copy_null_text_to_markdown(test): wait.until( lambda: target.cell(0, "Product") - .get() - .find_element_by_css_selector(".dash-cell-value > p") + .find_inside(".dash-cell-value > p") .get_attribute("innerHTML") == "null", 3, diff --git a/components/dash-table/tests/selenium/test_markdown_link.py b/components/dash-table/tests/selenium/test_markdown_link.py index 37af8eb511..47f5a88e88 100644 --- a/components/dash-table/tests/selenium/test_markdown_link.py +++ b/components/dash-table/tests/selenium/test_markdown_link.py @@ -1,6 +1,7 @@ +import pytest + import dash from dash.dash_table import DataTable -import pytest def get_app(cell_selectable, markdown_options): @@ -43,7 +44,7 @@ def test_tmdl001_click_markdown_link(test, markdown_options, new_tab, cell_selec target = test.table("table") assert len(test.driver.window_handles) == 1 - target.cell(0, "a").get().find_element_by_css_selector("a").click() + target.cell(0, "a").find_inside("a").click() # Make sure the new tab is what's expected if new_tab: diff --git a/components/dash-table/tests/selenium/test_sizing.py b/components/dash-table/tests/selenium/test_sizing.py index 707678aa41..c5e4d788d6 100644 --- a/components/dash-table/tests/selenium/test_sizing.py +++ b/components/dash-table/tests/selenium/test_sizing.py @@ -1,13 +1,9 @@ +from selenium.common.exceptions import StaleElementReferenceException +from selenium.webdriver.common.by import By + import dash -import pytest - -from utils import ( - basic_modes, - get_props, - generate_mock_data, - generate_markdown_mock_data, - generate_mixed_markdown_data, -) + +from utils import get_props from dash.dependencies import Input, Output from dash.exceptions import PreventUpdate @@ -55,44 +51,71 @@ ) -def cells_are_same_width(target, table): - wait.until(lambda: abs(target.size["width"] - table.size["width"]) <= 1, 3) - - target_cells = target.find_elements_by_css_selector( - ".cell-1-1 > table > tbody > tr:last-of-type > *" - ) - table_r0c0_cells = table.find_elements_by_css_selector( - ".cell-0-0 > table > tbody > tr:last-of-type > *" - ) - table_r0c1_cells = table.find_elements_by_css_selector( - ".cell-0-1 > table > tbody > tr:last-of-type > *" - ) - table_r1c0_cells = table.find_elements_by_css_selector( - ".cell-1-0 > table > tbody > tr:last-of-type > *" - ) - table_r1c1_cells = table.find_elements_by_css_selector( - ".cell-1-1 > table > tbody > tr:last-of-type > *" - ) - +def cells_are_same_width(test, target_selector, table_selector): # this test is very dependent on the table's implementation details.. we are testing that all the cells are # the same width after all.. - # make sure the r1c1 fragment contains all the cells - assert len(target_cells) == len(table_r1c1_cells) + def assertions(): + target = test.wait_for_element(target_selector) + table = test.wait_for_element(table_selector) + + wait.until( + lambda: target.size["width"] != 0 + and abs(target.size["width"] - table.size["width"]) <= 1, + 3, + ) + target_cells = target.find_elements( + By.CSS_SELECTOR, ".cell-1-1 > table > tbody > tr:last-of-type > *" + ) + table_r0c0_cells = table.find_elements( + By.CSS_SELECTOR, ".cell-0-0 > table > tbody > tr:last-of-type > *" + ) + table_r0c1_cells = table.find_elements( + By.CSS_SELECTOR, ".cell-0-1 > table > tbody > tr:last-of-type > *" + ) + table_r1c0_cells = table.find_elements( + By.CSS_SELECTOR, ".cell-1-0 > table > tbody > tr:last-of-type > *" + ) + table_r1c1_cells = table.find_elements( + By.CSS_SELECTOR, ".cell-1-1 > table > tbody > tr:last-of-type > *" + ) + + # make sure the r1c1 fragment contains all the cells + assert len(target_cells) == len(table_r1c1_cells) - # for each cell of each fragment, allow a difference of up to 1px either way since - # the resize algorithm can be off by 1px for cycles - for i, target_cell in enumerate(target_cells): - assert abs(target_cell.size["width"] - table_r1c1_cells[i].size["width"]) <= 1 + # for each cell of each fragment, allow a difference of up to 1px either way since + # the resize algorithm can be off by 1px for cycles + for i, target_cell in enumerate(target_cells): + assert ( + abs(target_cell.size["width"] - table_r1c1_cells[i].size["width"]) <= 1 + ) - if len(table_r0c0_cells) != 0: - assert abs(target_cell.size["width"] - table_r0c0_cells[i].size["width"]) <= 1 + if len(table_r0c0_cells) != 0: + assert ( + abs(target_cell.size["width"] - table_r0c0_cells[i].size["width"]) + <= 1 + ) - if len(table_r0c1_cells) != 0: - assert abs(target_cell.size["width"] - table_r0c1_cells[i].size["width"]) <= 1 + if len(table_r0c1_cells) != 0: + assert ( + abs(target_cell.size["width"] - table_r0c1_cells[i].size["width"]) + <= 1 + ) - if len(table_r1c0_cells) != 0: - assert abs(target_cell.size["width"] - table_r1c0_cells[i].size["width"]) <= 1 + if len(table_r1c0_cells) != 0: + assert ( + abs(target_cell.size["width"] - table_r1c0_cells[i].size["width"]) + <= 1 + ) + + retry = 0 + + while retry < 3: + try: + assertions() + break + except StaleElementReferenceException: + retry += 1 def szng003_on_prop_change_impl( @@ -115,11 +138,10 @@ def callback(n_clicks): test.start_server(app) - target = test.driver.find_element_by_css_selector("#table") - cells_are_same_width(target, target) + cells_are_same_width(test, "#table", "#table") - test.driver.find_element_by_css_selector("#btn").click() - cells_are_same_width(target, target) + test.find_element("#btn").click() + cells_are_same_width(test, "#table", "#table") assert test.get_log_errors() == [] @@ -228,16 +250,12 @@ def update_styles(n_clicks): for style in styles: display = style.get("style_table", dict()).get("display") width = style.get("style_table", dict()).get("width") - target = ( - test.driver.find_element_by_css_selector("#table{}".format(width)) - if display != "none" - else None - ) + target_selector = "#table{}".format(width) + target = test.find_element(target_selector) if display != "none" else None for variation in variations: - table = test.driver.find_element_by_css_selector( - "#{}".format(variation["id"]) - ) + table_selector = "#{}".format(variation["id"]) + table = test.find_element(table_selector) if target is None: assert table is not None assert ( @@ -249,9 +267,9 @@ def update_styles(n_clicks): == "none" ) else: - cells_are_same_width(target, table) + cells_are_same_width(test, target_selector, table_selector) - test.driver.find_element_by_css_selector("#btn").click() + test.find_element("#btn").click() assert test.get_log_errors() == [] @@ -284,22 +302,15 @@ def test_szng002_percentages_result_in_same_widths(test): test.start_server(app) - target = test.driver.find_element_by_css_selector("#table0") - cells_are_same_width(target, target) + cells_are_same_width(test, "#table0", "#table0") for i in range(1, len(variations)): - table = test.driver.find_element_by_css_selector("#table{}".format(i)) - cells_are_same_width(target, table) + cells_are_same_width(test, "#table0", "#table{}".format(i)) assert test.get_log_errors() == [] -@pytest.mark.parametrize("props", basic_modes) -@pytest.mark.parametrize( - "data_fn", - [generate_mock_data, generate_markdown_mock_data, generate_mixed_markdown_data], -) -def test_szng004_on_focus(test, props, data_fn): +def on_focus(test, props, data_fn): app = dash.Dash(__name__) baseProps1 = get_props(data_fn=data_fn) @@ -322,10 +333,10 @@ def test_szng004_on_focus(test, props, data_fn): for i in range(len(baseProps1.get("columns"))): table2.cell(0, i).click() - t1 = test.driver.find_element_by_css_selector("#table1") - t2 = test.driver.find_element_by_css_selector("#table2") + t1 = "#table1" + t2 = "#table2" - cells_are_same_width(t1, t1) - cells_are_same_width(t1, t2) + cells_are_same_width(test, t1, t1) + cells_are_same_width(test, t1, t2) assert test.get_log_errors() == [] diff --git a/components/dash-table/tests/selenium/test_sizing_x.py b/components/dash-table/tests/selenium/test_sizing_x.py new file mode 100644 index 0000000000..51dfefc046 --- /dev/null +++ b/components/dash-table/tests/selenium/test_sizing_x.py @@ -0,0 +1,13 @@ +import pytest + +from test_sizing import on_focus + +from utils import ( + basic_modes, + generate_mock_data, +) + + +@pytest.mark.parametrize("props", basic_modes) +def test_szng004_on_focus(test, props): + on_focus(test, props, generate_mock_data) diff --git a/components/dash-table/tests/selenium/test_sizing_y.py b/components/dash-table/tests/selenium/test_sizing_y.py new file mode 100644 index 0000000000..7a2344cab0 --- /dev/null +++ b/components/dash-table/tests/selenium/test_sizing_y.py @@ -0,0 +1,13 @@ +import pytest + +from test_sizing import on_focus + +from utils import ( + basic_modes, + generate_markdown_mock_data, +) + + +@pytest.mark.parametrize("props", basic_modes) +def test_szng005_on_focus(test, props): + on_focus(test, props, generate_markdown_mock_data) diff --git a/components/dash-table/tests/selenium/test_sizing_z.py b/components/dash-table/tests/selenium/test_sizing_z.py new file mode 100644 index 0000000000..004ad015dd --- /dev/null +++ b/components/dash-table/tests/selenium/test_sizing_z.py @@ -0,0 +1,13 @@ +import pytest + +from test_sizing import on_focus + +from utils import ( + basic_modes, + generate_mixed_markdown_data, +) + + +@pytest.mark.parametrize("props", basic_modes) +def test_szng006_on_focus(test, props): + on_focus(test, props, generate_mixed_markdown_data) diff --git a/dash/_dash_renderer.py b/dash/_dash_renderer.py index b7bdcfbccf..ce978ec74e 100644 --- a/dash/_dash_renderer.py +++ b/dash/_dash_renderer.py @@ -1,4 +1,4 @@ -__version__ = "1.11.3" +__version__ = "1.11.4" _js_dist_dependencies = [ { @@ -39,7 +39,7 @@ { "relative_package_path": "dash-renderer/build/dash_renderer.min.js", "dev_package_path": "dash-renderer/build/dash_renderer.dev.js", - "external_url": "https://unpkg.com/dash-renderer@1.11.3" + "external_url": "https://unpkg.com/dash-renderer@1.11.4" "/build/dash_renderer.min.js", "namespace": "dash", }, diff --git a/dash/_utils.py b/dash/_utils.py index 31de7e88cb..83b2895554 100644 --- a/dash/_utils.py +++ b/dash/_utils.py @@ -8,6 +8,8 @@ import logging import io import json +import secrets +import string from functools import wraps logger = logging.getLogger() @@ -206,3 +208,9 @@ def _wrapper(*args, **kwargs): return _wrapper return wrapper + + +def gen_salt(chars): + return "".join( + secrets.choice(string.ascii_letters + string.digits) for _ in range(chars) + ) diff --git a/dash/dash-renderer/package-lock.json b/dash/dash-renderer/package-lock.json index 07b3ed0b5b..b9e768168f 100644 --- a/dash/dash-renderer/package-lock.json +++ b/dash/dash-renderer/package-lock.json @@ -1,12 +1,12 @@ { "name": "dash-renderer", - "version": "1.11.3", + "version": "1.11.4", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "dash-renderer", - "version": "1.11.3", + "version": "1.11.4", "license": "MIT", "dependencies": { "@babel/polyfill": "^7.12.1", diff --git a/dash/dash-renderer/package.json b/dash/dash-renderer/package.json index e03100240e..57171862c6 100644 --- a/dash/dash-renderer/package.json +++ b/dash/dash-renderer/package.json @@ -1,6 +1,6 @@ { "name": "dash-renderer", - "version": "1.11.3", + "version": "1.11.4", "description": "render dash components in react", "main": "build/dash_renderer.min.js", "scripts": { diff --git a/dash/dash-renderer/src/components/error/FrontEnd/FrontEndError.react.js b/dash/dash-renderer/src/components/error/FrontEnd/FrontEndError.react.js index 5703add4db..49939ea1de 100644 --- a/dash/dash-renderer/src/components/error/FrontEnd/FrontEndError.react.js +++ b/dash/dash-renderer/src/components/error/FrontEnd/FrontEndError.react.js @@ -110,7 +110,7 @@ function UnconnectedErrorContent({error, base}) { )} {/* Backend Error */} {typeof error.html !== 'string' ? null : error.html.indexOf( - '
diff --git a/dash/dash.py b/dash/dash.py index c0b6cb410d..cc04b48b10 100644 --- a/dash/dash.py +++ b/dash/dash.py @@ -11,11 +11,12 @@ import mimetypes import hashlib import base64 +import traceback from urllib.parse import urlparse import flask from flask_compress import Compress -from werkzeug.debug.tbtools import get_current_traceback + from pkg_resources import get_distribution, parse_version from dash import dcc from dash import html @@ -48,6 +49,7 @@ patch_collections_abc, split_callback_id, to_json, + gen_salt, ) from . import _callback from . import _get_paths @@ -102,6 +104,42 @@ _re_renderer_scripts_id = 'id="_dash-renderer', "new DashRenderer" +def _get_traceback(secret, error: Exception): + + try: + # pylint: disable=import-outside-toplevel + from werkzeug.debug import tbtools + except ImportError: + tbtools = None + + def _get_skip(text, divider=2): + skip = 0 + for i, line in enumerate(text): + if "%% callback invoked %%" in line: + skip = int((i + 1) / divider) + break + return skip + + # werkzeug<2.1.0 + if hasattr(tbtools, "get_current_traceback"): + tb = tbtools.get_current_traceback() + skip = _get_skip(tb.plaintext.splitlines()) + return tbtools.get_current_traceback(skip=skip).render_full() + + if hasattr(tbtools, "DebugTraceback"): + tb = tbtools.DebugTraceback(error) # pylint: disable=no-member + skip = _get_skip(tb.render_traceback_text().splitlines()) + + # pylint: disable=no-member + return tbtools.DebugTraceback(error, skip=skip).render_debugger_html( + True, secret, True + ) + + tb = traceback.format_exception(type(error), error, error.__traceback__) + skip = _get_skip(tb, 1) + return tb[0] + "".join(tb[skip:]) + + class _NoUpdate: # pylint: disable=too-few-public-methods pass @@ -1756,19 +1794,16 @@ def enable_dev_tools( if debug and dev_tools.prune_errors: + secret = gen_salt(20) + @self.server.errorhandler(Exception) - def _wrap_errors(_): + def _wrap_errors(error): # find the callback invocation, if the error is from a callback # and skip the traceback up to that point # if the error didn't come from inside a callback, we won't # skip anything. - tb = get_current_traceback() - skip = 0 - for i, line in enumerate(tb.plaintext.splitlines()): - if "%% callback invoked %%" in line: - skip = int((i + 1) / 2) - break - return get_current_traceback(skip=skip).render_full(), 500 + tb = _get_traceback(secret, error) + return tb, 500 if debug and dev_tools.ui: diff --git a/dash/testing/application_runners.py b/dash/testing/application_runners.py index 87a7b9cb28..b2871ffe09 100644 --- a/dash/testing/application_runners.py +++ b/dash/testing/application_runners.py @@ -7,12 +7,17 @@ import subprocess import logging import inspect +import ctypes import runpy -import flask import requests -from dash.testing.errors import NoAppFoundError, TestingTimeoutError, ServerCloseError +from dash.testing.errors import ( + NoAppFoundError, + TestingTimeoutError, + ServerCloseError, + DashAppLoadingError, +) from dash.testing import wait @@ -50,6 +55,8 @@ def import_app(app_file, application_name="app"): class BaseDashRunner: """Base context manager class for running applications.""" + _next_port = 58050 + def __init__(self, keep_open, stop_timeout): self.port = 8050 self.started = None @@ -102,6 +109,29 @@ def tmp_app_path(self): return self._tmp_app_path +class KillerThread(threading.Thread): + def __init__(self, **kwargs): + super().__init__(**kwargs) + self._old_threads = list(threading._active.keys()) # pylint: disable=W0212 + + def kill(self): + # Kill all the new threads. + for thread_id in threading._active: # pylint: disable=W0212 + if thread_id in self._old_threads: + continue + + res = ctypes.pythonapi.PyThreadState_SetAsyncExc( + ctypes.c_long(thread_id), ctypes.py_object(SystemExit) + ) + if res == 0: + raise ValueError(f"Invalid thread id: {thread_id}") + if res > 1: + ctypes.pythonapi.PyThreadState_SetAsyncExc( + ctypes.c_long(thread_id), None + ) + raise SystemExit("Stopping thread failure") + + class ThreadedRunner(BaseDashRunner): """Runs a dash application in a thread. @@ -110,53 +140,62 @@ class ThreadedRunner(BaseDashRunner): def __init__(self, keep_open=False, stop_timeout=3): super().__init__(keep_open=keep_open, stop_timeout=stop_timeout) - self.stop_route = "/_stop-{}".format(uuid.uuid4().hex) self.thread = None - @staticmethod - def _stop_server(): - # https://werkzeug.palletsprojects.com/en/0.15.x/serving/#shutting-down-the-server - stopper = flask.request.environ.get("werkzeug.server.shutdown") - if stopper is None: - raise RuntimeError("Not running with the Werkzeug Server") - stopper() - return "Flask server is shutting down" - # pylint: disable=arguments-differ def start(self, app, **kwargs): """Start the app server in threading flavor.""" - app.server.add_url_rule(self.stop_route, self.stop_route, self._stop_server) def _handle_error(): - self._stop_server() + self.stop() app.server.errorhandler(500)(_handle_error) + if self.thread and self.thread.is_alive(): + self.stop() + def run(): app.scripts.config.serve_locally = True app.css.config.serve_locally = True + + options = kwargs.copy() + if "port" not in kwargs: - kwargs["port"] = self.port + options["port"] = self.port = BaseDashRunner._next_port + BaseDashRunner._next_port += 1 else: - self.port = kwargs["port"] - app.run_server(threaded=True, **kwargs) + self.port = options["port"] - self.thread = threading.Thread(target=run) - self.thread.daemon = True - try: - self.thread.start() - except RuntimeError: # multiple call on same thread - logger.exception("threaded server failed to start") - self.started = False + try: + app.run_server(threaded=True, **options) + except SystemExit: + logger.info("Server stopped") - self.started = self.thread.is_alive() + retries = 0 - # wait until server is able to answer http request - wait.until(lambda: self.accessible(self.url), timeout=1) + while not self.started and retries < 3: + try: + self.thread = KillerThread(target=run) + self.thread.daemon = True + self.thread.start() + # wait until server is able to answer http request + wait.until(lambda: self.accessible(self.url), timeout=2) + self.started = self.thread.is_alive() + except Exception as err: # pylint: disable=broad-except + logger.exception(err) + self.started = False + retries += 1 + BaseDashRunner._next_port += 1 + + self.started = self.thread.is_alive() + if not self.started: + raise DashAppLoadingError("threaded server failed to start") def stop(self): - requests.get("{}{}".format(self.url, self.stop_route)) + self.thread.kill() + self.thread.join() wait.until_not(self.thread.is_alive, self.stop_timeout) + self.started = False class ProcessRunner(BaseDashRunner): diff --git a/dash/testing/browser.py b/dash/testing/browser.py index d639a74cb4..b829602108 100644 --- a/dash/testing/browser.py +++ b/dash/testing/browser.py @@ -123,7 +123,7 @@ def visit_and_snapshot( widths=widths, ) if assert_check: - assert not self.driver.find_elements_by_css_selector( + assert not self.find_elements( "div.dash-debug-alert" ), "devtools should not raise an error alert" if not stay_on_page: @@ -231,16 +231,16 @@ def take_snapshot(self, name): def find_element(self, selector): """find_element returns the first found element by the css `selector` - shortcut to `driver.find_element_by_css_selector`.""" - return self.driver.find_element_by_css_selector(selector) + shortcut to `driver.find_element(By.CSS_SELECTOR, ...)`.""" + return self.driver.find_element(By.CSS_SELECTOR, selector) def find_elements(self, selector): """find_elements returns a list of all elements matching the css `selector`. - shortcut to `driver.find_elements_by_css_selector`. + shortcut to `driver.find_elements(By.CSS_SELECTOR, ...)`. """ - return self.driver.find_elements_by_css_selector(selector) + return self.driver.find_elements(By.CSS_SELECTOR, selector) def _get_element(self, elem_or_selector): if isinstance(elem_or_selector, str): @@ -375,21 +375,18 @@ def wait_for_page(self, url=None, timeout=10): ) from exc if self._pause: - try: - import pdb as pdb_ # pylint: disable=import-outside-toplevel - except ImportError: - import ipdb as pdb_ # pylint: disable=import-outside-toplevel + import pdb # pylint: disable=import-outside-toplevel - pdb_.set_trace() # pylint: disable=forgotten-debug-statement + pdb.set_trace() # pylint: disable=forgotten-debug-statement def select_dcc_dropdown(self, elem_or_selector, value=None, index=None): dropdown = self._get_element(elem_or_selector) dropdown.click() - menu = dropdown.find_element_by_css_selector("div.Select-menu-outer") + menu = dropdown.find_element(By.CSS_SELECTOR, "div.Select-menu-outer") logger.debug("the available options are %s", "|".join(menu.text.split("\n"))) - options = menu.find_elements_by_css_selector("div.VirtualizedSelectOption") + options = menu.find_elements(By.CSS_SELECTOR, "div.VirtualizedSelectOption") if options: if isinstance(index, int): options[index].click() @@ -465,6 +462,10 @@ def _get_chrome(self): "safebrowsing.disable_download_protection": True, }, ) + options.add_argument("--disable-dev-shm-usage") + options.add_argument("--no-sandbox") + options.add_argument("--disable-gpu") + options.add_argument("--remote-debugging-port=9222") chrome = ( webdriver.Remote( @@ -524,10 +525,12 @@ def _get_firefox(self): def _is_windows(): return sys.platform == "win32" - def multiple_click(self, elem_or_selector, clicks): + def multiple_click(self, elem_or_selector, clicks, delay=None): """multiple_click click the element with number of `clicks`.""" for _ in range(clicks): self._get_element(elem_or_selector).click() + if delay: + time.sleep(delay) def clear_input(self, elem_or_selector): """Simulate key press to clear the input.""" diff --git a/dash/testing/wait.py b/dash/testing/wait.py index 35446e4394..7c877c0e0c 100644 --- a/dash/testing/wait.py +++ b/dash/testing/wait.py @@ -3,6 +3,7 @@ import time import logging from selenium.common.exceptions import WebDriverException +from selenium.webdriver.common.by import By from dash.testing.errors import TestingTimeoutError @@ -58,7 +59,7 @@ def __init__(self, selector, text): def __call__(self, driver): try: - elem = driver.find_element_by_css_selector(self.selector) + elem = driver.find_element(By.CSS_SELECTOR, self.selector) logger.debug("contains text {%s} => expected %s", elem.text, self.text) return self.text in str(elem.text) or self.text in str( elem.get_attribute("value") @@ -74,7 +75,7 @@ def __init__(self, selector, text): def __call__(self, driver): try: - elem = driver.find_element_by_css_selector(self.selector) + elem = driver.find_element(By.CSS_SELECTOR, self.selector) logger.debug("text to equal {%s} => expected %s", elem.text, self.text) return ( str(elem.text) == self.text @@ -92,7 +93,7 @@ def __init__(self, selector, style, val): def __call__(self, driver): try: - elem = driver.find_element_by_css_selector(self.selector) + elem = driver.find_element(By.CSS_SELECTOR, self.selector) val = elem.value_of_css_property(self.style) logger.debug("style to equal {%s} => expected %s", val, self.val) return val == self.val diff --git a/dash/version.py b/dash/version.py index 55e4709070..3a5935a2d0 100644 --- a/dash/version.py +++ b/dash/version.py @@ -1 +1 @@ -__version__ = "2.3.0" +__version__ = "2.3.1" diff --git a/package.json b/package.json index 705585d1b6..ebf5225a9c 100644 --- a/package.json +++ b/package.json @@ -21,9 +21,9 @@ "private::test.R.deploy-components": "npm run private::test.setup-components && cd \\@plotly/dash-test-components && sudo R CMD INSTALL .", "private::test.R.deploy-nested": "npm run private::test.setup-nested && cd \\@plotly/dash-generator-test-component-nested && sudo R CMD INSTALL .", "private::test.R.deploy-standard": "npm run private::test.setup-standard && cd \\@plotly/dash-generator-test-component-standard && sudo R CMD INSTALL .", - "private::test.unit-dash": "pytest tests/unit", + "private::test.unit-dash": "pytest tests/unit --reruns 3", "private::test.unit-renderer": "cd dash/dash-renderer && npm run test", - "private::test.integration-dash": "TESTFILES=$(circleci tests glob \"tests/integration/**/test_*.py\" | circleci tests split --split-by=timings) && pytest --headless --nopercyfinalize --junitxml=test-reports/junit_intg.xml ${TESTFILES}", + "private::test.integration-dash": "TESTFILES=$(circleci tests glob \"tests/integration/**/test_*.py\" | circleci tests split --split-by=timings) && pytest --headless --nopercyfinalize --junitxml=test-reports/junit_intg.xml ${TESTFILES} --reruns 3", "private::test.integration-dash-import": "cd tests/integration/dash && python dash_import_test.py", "build": "run-s private::build.*", "build.sequential": "npm run private::build.renderer && npm run private::build.components -- --concurrency 1", diff --git a/requires-ci.txt b/requires-ci.txt index dbeb8476c0..9dc9a30b17 100644 --- a/requires-ci.txt +++ b/requires-ci.txt @@ -1,5 +1,6 @@ # Dependencies used by CI on github.com/plotly/dash black==21.6b0 +click<8.1 dash-flow-example==0.0.5 dash-dangerously-set-inner-html flake8==3.9.2 @@ -22,3 +23,4 @@ pytest-mock==3.2.0 pytest-sugar==0.9.4 xlrd>=2.0.1;python_version>="3.8" xlrd<2;python_version<"3.8" +pytest-rerunfailures diff --git a/tests/integration/callbacks/test_basic_callback.py b/tests/integration/callbacks/test_basic_callback.py index c7e9df7db0..8eb2481858 100644 --- a/tests/integration/callbacks/test_basic_callback.py +++ b/tests/integration/callbacks/test_basic_callback.py @@ -1,8 +1,11 @@ import json +import os from multiprocessing import Lock, Value import pytest import time +import werkzeug + from dash_test_components import ( AsyncComponent, CollapseComponent, @@ -21,7 +24,6 @@ callback_context, ) from dash.exceptions import PreventUpdate -from dash.testing import wait from tests.integration.utils import json_engine @@ -36,17 +38,24 @@ def test_cbsc001_simple_callback(dash_duo): ] ) call_count = Value("i", 0) + percy_ss = Value("b", False) @app.callback(Output("output-1", "children"), [Input("input", "value")]) def update_output(value): with lock: - call_count.value = call_count.value + 1 + if not percy_ss.value: + call_count.value = call_count.value + 1 return value + def snapshot(name): + percy_ss.value = os.getenv("PERCY_ENABLE", "") != "" + dash_duo.percy_snapshot(name=name) + percy_ss.value = False + dash_duo.start_server(app) - assert dash_duo.find_element("#output-1").text == "initial value" - dash_duo.percy_snapshot(name="simple-callback-initial") + dash_duo.wait_for_text_to_equal("#output-1", "initial value") + snapshot("simple-callback-initial") input_ = dash_duo.find_element("#input") dash_duo.clear_input(input_) @@ -55,8 +64,8 @@ def update_output(value): with lock: input_.send_keys(key) - wait.until(lambda: dash_duo.find_element("#output-1").text == "hello world", 2) - dash_duo.percy_snapshot(name="simple-callback-hello-world") + dash_duo.wait_for_text_to_equal("#output-1", "hello world") + snapshot("simple-callback-hello-world") assert call_count.value == 2 + len("hello world"), "initial count + each key stroke" @@ -142,11 +151,6 @@ def update_input(value): # editing the input should modify the sub output dash_duo.find_element("#sub-input-1").send_keys("deadbeef") - assert ( - dash_duo.find_element("#sub-output-1").text - == pad_input.attrs["value"] + "deadbeef" - ), "deadbeef is added" - # the total updates is initial one + the text input changes dash_duo.wait_for_text_to_equal( "#sub-output-1", pad_input.attrs["value"] + "deadbeef" @@ -312,6 +316,11 @@ def set_out(opts): dash_duo.select_dcc_dropdown("#dd", "opt{}".format(i)) +@pytest.mark.xfail( + condition=werkzeug.__version__ in ("2.1.0", "2.1.1"), + reason="Bug with 204 and Transfer-Encoding", + strict=False, +) @pytest.mark.parametrize("refresh", [False, True]) def test_cbsc007_parallel_updates(refresh, dash_duo): # This is a funny case, that seems to mostly happen with dcc.Location @@ -391,11 +400,18 @@ def test_cbsc008_wildcard_prop_callbacks(dash_duo): ) input_call_count = Value("i", 0) + percy_enabled = Value("b", False) + + def snapshot(name): + percy_enabled.value = os.getenv("PERCY_ENABLE", "") != "" + dash_duo.percy_snapshot(name=name) + percy_enabled.value = False @app.callback(Output("output-1", "data-cb"), [Input("input", "value")]) def update_data(value): with lock: - input_call_count.value += 1 + if not percy_enabled.value: + input_call_count.value += 1 return value @app.callback(Output("output-1", "children"), [Input("output-1", "data-cb")]) @@ -404,7 +420,7 @@ def update_text(data): dash_duo.start_server(app) dash_duo.wait_for_text_to_equal("#output-1", "initial value") - dash_duo.percy_snapshot(name="wildcard-callback-1") + snapshot("wildcard-callback-1") input1 = dash_duo.find_element("#input") dash_duo.clear_input(input1) @@ -414,7 +430,7 @@ def update_text(data): input1.send_keys(key) dash_duo.wait_for_text_to_equal("#output-1", "hello world") - dash_duo.percy_snapshot(name="wildcard-callback-2") + snapshot("wildcard-callback-2") # an initial call, one for clearing the input # and one for each hello world character @@ -445,25 +461,16 @@ def content(n, d, v): dash_duo.start_server(app) - wait.until(lambda: dash_duo.find_element("#output").text == '[null, null, "A"]', 3) + dash_duo.wait_for_text_to_equal("#output", '[null, null, "A"]') dash_duo.wait_for_element("#d").click() - wait.until( - lambda: dash_duo.find_element("#output").text == '[null, 1, "A"]', - 3, - ) + dash_duo.wait_for_text_to_equal("#output", '[null, 1, "A"]') dash_duo.wait_for_element("#n").click() - wait.until( - lambda: dash_duo.find_element("#output").text == '[1, 1, "A"]', - 3, - ) + dash_duo.wait_for_text_to_equal("#output", '[1, 1, "A"]') dash_duo.wait_for_element("#d").click() - wait.until( - lambda: dash_duo.find_element("#output").text == '[1, 2, "A"]', - 3, - ) + dash_duo.wait_for_text_to_equal("#output", '[1, 2, "A"]') def test_cbsc010_event_properties(dash_duo): @@ -612,6 +619,13 @@ def test_cbsc014_multiple_properties_update_at_same_time_on_same_component(dash_ timestamp_1 = Value("d", -5) timestamp_2 = Value("d", -5) + percy_enabled = Value("b") + + def snapshot(name): + percy_enabled.value = os.getenv("PERCY_ENABLE", "") != "" + dash_duo.percy_snapshot(name=name) + percy_enabled.value = False + app = Dash(__name__) app.layout = html.Div( [ @@ -629,9 +643,10 @@ def test_cbsc014_multiple_properties_update_at_same_time_on_same_component(dash_ Input("button-2", "n_clicks_timestamp"), ) def update_output(n1, t1, n2, t2): - call_count.value += 1 - timestamp_1.value = t1 - timestamp_2.value = t2 + if not percy_enabled.value: + call_count.value += 1 + timestamp_1.value = t1 + timestamp_2.value = t2 return "{}, {}".format(n1, n2) dash_duo.start_server(app) @@ -640,14 +655,14 @@ def update_output(n1, t1, n2, t2): assert timestamp_1.value == -1 assert timestamp_2.value == -1 assert call_count.value == 1 - dash_duo.percy_snapshot("Dash button-1 initialization 1") + snapshot("Dash button-1 initialization 1") dash_duo.find_element("#button-1").click() dash_duo.wait_for_text_to_equal("#container", "1, 0") assert timestamp_1.value > ((time.time() - (24 * 60 * 60)) * 1000) assert timestamp_2.value == -1 assert call_count.value == 2 - dash_duo.percy_snapshot("Dash button-1 click") + snapshot("Dash button-1 click") prev_timestamp_1 = timestamp_1.value dash_duo.find_element("#button-2").click() @@ -655,7 +670,7 @@ def update_output(n1, t1, n2, t2): assert timestamp_1.value == prev_timestamp_1 assert timestamp_2.value > ((time.time() - 24 * 60 * 60) * 1000) assert call_count.value == 3 - dash_duo.percy_snapshot("Dash button-2 click") + snapshot("Dash button-2 click") prev_timestamp_2 = timestamp_2.value dash_duo.find_element("#button-2").click() @@ -664,7 +679,7 @@ def update_output(n1, t1, n2, t2): assert timestamp_2.value > prev_timestamp_2 assert timestamp_2.value > timestamp_1.value assert call_count.value == 4 - dash_duo.percy_snapshot("Dash button-2 click again") + snapshot("Dash button-2 click again") def test_cbsc015_input_output_callback(dash_duo): @@ -705,7 +720,7 @@ def follower_output(v): with lock: input_.send_keys(key) - wait.until(lambda: dash_duo.find_element("#input-text").text == "3", 2) + dash_duo.wait_for_text_to_equal("#input-text", "3") assert call_count.value == 2, "initial + changed once" @@ -739,13 +754,13 @@ def update_output(value, data): dash_duo.start_server(app) - assert dash_duo.find_element("#output-1").text == "initial value" + dash_duo.wait_for_text_to_equal("#output-1", "initial value") input_ = dash_duo.find_element("#input") dash_duo.clear_input(input_) input_.send_keys("A") - wait.until(lambda: dash_duo.find_element("#output-1").text == "A", 2) + dash_duo.wait_for_text_to_equal("#output-1", "A") assert store_data.value == 123 assert dash_duo.get_logs() == [] diff --git a/tests/integration/callbacks/test_layout_paths_with_callbacks.py b/tests/integration/callbacks/test_layout_paths_with_callbacks.py index 09aa187643..6d0152328f 100644 --- a/tests/integration/callbacks/test_layout_paths_with_callbacks.py +++ b/tests/integration/callbacks/test_layout_paths_with_callbacks.py @@ -10,6 +10,13 @@ def test_cblp001_radio_buttons_callbacks_generating_children(dash_duo): with open(os.path.join(os.path.dirname(__file__), "state_path.json")) as fp: EXPECTED_PATHS = json.load(fp) + percy_enabled = Value("b") + + def snapshot(name): + percy_enabled.value = os.getenv("PERCY_ENABLE", "") != "" + dash_duo.percy_snapshot(name=name) + percy_enabled.value = False + app = Dash(__name__) app.layout = html.Div( [ @@ -96,14 +103,16 @@ def test_cblp001_radio_buttons_callbacks_generating_children(dash_duo): @app.callback(Output("body", "children"), [Input("toc", "value")]) def display_chapter(toc_value): - call_counts["body"].value += 1 + if not percy_enabled.value: + call_counts["body"].value += 1 return chapters[toc_value] app.config.suppress_callback_exceptions = True def generate_graph_callback(counterId): def callback(value): - call_counts[counterId].value += 1 + if not percy_enabled.value: + call_counts[counterId].value += 1 return { "data": [ { @@ -124,7 +133,8 @@ def callback(value): def generate_label_callback(id_): def update_label(value): - call_counts[id_].value += 1 + if not percy_enabled.value: + call_counts[id_].value += 1 return value return update_label @@ -187,7 +197,7 @@ def check_call_counts(chapters, count): assert dash_duo.redux_state_paths == EXPECTED_PATHS["chapter1"] check_chapter("chapter1") - dash_duo.percy_snapshot(name="chapter-1") + snapshot(name="chapter-1") dash_duo.find_elements('input[type="radio"]')[1].click() # switch chapters @@ -198,7 +208,7 @@ def check_call_counts(chapters, count): assert dash_duo.redux_state_paths == EXPECTED_PATHS["chapter2"] check_chapter("chapter2") - dash_duo.percy_snapshot(name="chapter-2") + snapshot(name="chapter-2") # switch to 3 dash_duo.find_elements('input[type="radio"]')[2].click() @@ -210,11 +220,11 @@ def check_call_counts(chapters, count): assert dash_duo.redux_state_paths == EXPECTED_PATHS["chapter3"] check_chapter("chapter3") - dash_duo.percy_snapshot(name="chapter-3") + snapshot(name="chapter-3") dash_duo.find_elements('input[type="radio"]')[3].click() # switch to 4 dash_duo.wait_for_text_to_equal("#body", "Just a string") - dash_duo.percy_snapshot(name="chapter-4") + snapshot(name="chapter-4") paths = dash_duo.redux_state_paths assert paths["objs"] == {} @@ -234,4 +244,4 @@ def check_call_counts(chapters, count): lambda: dash_duo.redux_state_paths == EXPECTED_PATHS["chapter1"], TIMEOUT ) check_chapter("chapter1") - dash_duo.percy_snapshot(name="chapter-1-again") + snapshot(name="chapter-1-again") diff --git a/tests/integration/callbacks/test_prevent_update.py b/tests/integration/callbacks/test_prevent_update.py index 8f51819a93..7fbcd4ac50 100644 --- a/tests/integration/callbacks/test_prevent_update.py +++ b/tests/integration/callbacks/test_prevent_update.py @@ -94,7 +94,7 @@ def show_clicks(n): dash_duo.start_server(app) - dash_duo.multiple_click("#btn", 10) + dash_duo.multiple_click("#btn", 10, 0.2) dash_duo.wait_for_text_to_equal("#n1", "4") dash_duo.wait_for_text_to_equal("#n2", "2") diff --git a/tests/integration/devtools/test_props_check.py b/tests/integration/devtools/test_props_check.py index 23211ed3dd..8a77c18de0 100644 --- a/tests/integration/devtools/test_props_check.py +++ b/tests/integration/devtools/test_props_check.py @@ -200,6 +200,7 @@ def display_content(pathname): if test_cases[tc]["fail"]: dash_duo.wait_for_element(".test-devtools-error-toggle").click() + dash_duo.wait_for_element(".dash-fe-error__info") dash_duo.percy_snapshot( "devtools validation exception: {}".format(test_cases[tc]["name"]) ) diff --git a/tests/integration/long_callback/test_basic_long_callback.py b/tests/integration/long_callback/test_basic_long_callback.py index 6b0ca74c71..bbd7972934 100644 --- a/tests/integration/long_callback/test_basic_long_callback.py +++ b/tests/integration/long_callback/test_basic_long_callback.py @@ -212,7 +212,7 @@ def test_lcbc004_long_callback_progress(dash_duo, manager): assert dash_duo.get_logs() == [] -@flaky(max_runs=3) +@pytest.mark.skip(reason="Timeout often") def test_lcbc005_long_callback_caching(dash_duo, manager): lock = Lock() diff --git a/tests/integration/renderer/test_dependencies.py b/tests/integration/renderer/test_dependencies.py index a7bb27de1b..04aa46b63c 100644 --- a/tests/integration/renderer/test_dependencies.py +++ b/tests/integration/renderer/test_dependencies.py @@ -1,3 +1,4 @@ +import os from multiprocessing import Value from dash import Dash, html, dcc, Input, Output @@ -10,10 +11,17 @@ def test_rddp001_dependencies_on_components_that_dont_exist(dash_duo): ) output_1_call_count = Value("i", 0) + percy_enabled = Value("b") + + def snapshot(name): + percy_enabled.value = os.getenv("PERCY_ENABLE", "") != "" + dash_duo.percy_snapshot(name=name) + percy_enabled.value = False @app.callback(Output("output-1", "children"), [Input("input", "value")]) def update_output(value): - output_1_call_count.value += 1 + if not percy_enabled.value: + output_1_call_count.value += 1 return value # callback for component that doesn't yet exist in the dom @@ -23,14 +31,15 @@ def update_output(value): @app.callback(Output("output-2", "children"), [Input("input", "value")]) def update_output_2(value): - output_2_call_count.value += 1 + if not percy_enabled.value: + output_2_call_count.value += 1 return value dash_duo.start_server(app) assert dash_duo.find_element("#output-1").text == "initial value" assert output_1_call_count.value == 1 and output_2_call_count.value == 0 - dash_duo.percy_snapshot(name="dependencies") + snapshot("dependencies") dash_duo.find_element("#input").send_keys("a") assert dash_duo.find_element("#output-1").text == "initial valuea" diff --git a/tests/integration/renderer/test_request_hooks.py b/tests/integration/renderer/test_request_hooks.py index 0afaf56ea8..c876332ecc 100644 --- a/tests/integration/renderer/test_request_hooks.py +++ b/tests/integration/renderer/test_request_hooks.py @@ -253,6 +253,8 @@ def wrap(*args, **kwargs): if required_jwt_len and ( not token or len(token) != required_jwt_len + len("Bearer ") ): + # Read the data to prevent bug with base http server. + flask.request.get_json(silent=True) flask.abort(401, description="JWT Expired " + str(token)) except HTTPException as e: return e diff --git a/tests/integration/test_integration.py b/tests/integration/test_integration.py index 57662f0c18..91e91a11d5 100644 --- a/tests/integration/test_integration.py +++ b/tests/integration/test_integration.py @@ -266,10 +266,10 @@ def test_inin025_url_base_pathname(dash_br, dash_thread_server): dash_thread_server(app) - dash_br.server_url = "http://localhost:8050/app1/" + dash_br.server_url = "http://localhost:{}/app1/".format(dash_thread_server.port) dash_br.wait_for_text_to_equal("#out", "The first") - dash_br.server_url = "http://localhost:8050/app2/" + dash_br.server_url = "http://localhost:{}/app2/".format(dash_thread_server.port) dash_br.wait_for_text_to_equal("#out", "The second")