Fix integration tests.

Author: rmarren1

test/test_integration.py

@@ -12,7 +12,6 @@
 import dash_html_components as html
 import dash_core_components as dcc
 import dash_table_experiments as dt
-from dash.exceptions import PreventUpdate
 from selenium import webdriver
 from selenium.webdriver.common.keys import Keys
 from selenium.common.exceptions import InvalidElementStateException
@@ -225,7 +224,7 @@ def test_gallery(self):
             dcc.Upload(),
 
             html.Label('Horizontal Tabs'),
-            dcc.Tabs(id="tabs", children=[
+            dcc.Tabs(id="horizontal-tabs", children=[
                 dcc.Tab(label='Tab one', className='test', style={'border': '1px solid magenta'}, children=[
                     html.Div(['Test'])
                 ]),
@@ -255,7 +254,7 @@ def test_gallery(self):
             ),
 
             html.Label('Vertical Tabs'),
-            dcc.Tabs(id="tabs1", vertical=True, children=[
+            dcc.Tabs(id="tabs", vertical=True, children=[
                 dcc.Tab(label='Tab one', children=[
                     html.Div(['Test'])
                 ]),
@@ -457,123 +456,6 @@ def render_content(tab):
         time.sleep(2)
         self.assertEqual(tabs_content.text, 'Test content 1')
 
-    def test_tabs_with_children_undefined(self):
-        app = dash.Dash(__name__)
-
-        app.layout = html.Div([
-            html.H1('Dash Tabs component demo'),
-            dcc.Tabs(id="tabs", value='tab-1'),
-            html.Div(id='tabs-content')
-        ])
-
-        self.startServer(app=app)
-
-        self.snapshot('Tabs component with children undefined')
-
-    def test_tabs_render_without_selected(self):
-        app = dash.Dash(__name__)
-
-        data = [
-            {'id': 'one', 'value': 1},
-            {'id': 'two', 'value': 2},
-        ]
-
-
-        menu = html.Div([
-            html.Div('one', id='one'),
-            html.Div('two', id='two')
-        ])
-
-        tabs_one = html.Div([
-            dcc.Tabs([
-                dcc.Tab(dcc.Graph(id='graph-one'), label='tab-one-one'),
-            ])
-        ], id='tabs-one', style={'display': 'none'})
-
-        tabs_two = html.Div([
-            dcc.Tabs([
-                dcc.Tab(dcc.Graph(id='graph-two'), label='tab-two-one'),
-            ])
-        ], id='tabs-two', style={'display': 'none'})
-
-
-        app.layout = html.Div([
-            menu,
-            tabs_one,
-            tabs_two
-        ])
-
-        for i in ('one', 'two'):
-
-            @app.callback(Output('tabs-{}'.format(i), 'style'),
-                        [Input(i, 'n_clicks')])
-            def on_click(n_clicks):
-                if n_clicks is None:
-                    raise PreventUpdate
-
-                if n_clicks % 2 == 1:
-                    return {'display': 'block'}
-                return {'display': 'none'}
-
-
-            @app.callback(Output('graph-{}'.format(i), 'figure'),
-                        [Input(i, 'n_clicks')])
-            def on_click(n_clicks):
-                if n_clicks is None:
-                    raise PreventUpdate
-
-                return {
-                    'data': [
-                        {
-                            'x': [1,2,3,4],
-                            'y': [4,3,2,1]
-                        }
-                    ]
-                }
-        
-        self.startServer(app=app)
-
-        button_one = self.wait_for_element_by_css_selector('#one')
-        button_two = self.wait_for_element_by_css_selector('#two')
-
-        button_one.click()
-
-        self.snapshot("Tabs 1 rendered ")
-
-        button_two.click()
-        time.sleep(1)
-
-        self.snapshot("Tabs 2 rendered ")
-
-    def test_tabs_without_value(self):
-        app = dash.Dash(__name__)
-
-        app.layout = html.Div([
-            html.H1('Dash Tabs component demo'),
-            dcc.Tabs(id="tabs-example", children=[
-                dcc.Tab(label='Tab One', value='tab-1-example'),
-                dcc.Tab(label='Tab Two', value='tab-2-example'),
-            ]),
-            html.Div(id='tabs-content-example')
-        ])
-
-
-        @app.callback(Output('tabs-content-example', 'children'),
-                    [Input('tabs-example', 'value')])
-        def render_content(tab):
-            if tab == 'tab-1-example':
-                return html.H3('Default selected Tab content 1')
-            elif tab == 'tab-2-example':
-                return html.H3('Tab content 2')
-
-        self.startServer(app=app)
-
-        default_tab_content = self.wait_for_element_by_css_selector('#tabs-content-example')
-
-        self.assertEqual(default_tab_content.text, 'Default selected Tab content 1')
-
-        self.snapshot('Tab 1 should be selected by default')
-
     def test_location_link(self):
         app = dash.Dash(__name__)
 
@@ -724,8 +606,6 @@ def display_page(pathname):
 
         self.startServer(app=app)
 
-        time.sleep(2)
-
         #callback is called twice when defined
         self.assertEqual(
             call_count.value,
@@ -750,7 +630,7 @@ def display_page(pathname):
         #test if callback is only fired once (offset of 2)
         self.assertEqual(
             call_count.value,
-            3
+            2 + 1
         )
 
     def test_candlestick(self):
@@ -861,16 +741,17 @@ def _on_confirmed(submit_n_clicks, cancel_n_clicks,
                 if not submit_n_clicks and not cancel_n_clicks:
                     return ''
                 count.value += 1
-                if (submit_timestamp and cancel_timestamp is None) or\
-                        (submit_timestamp and cancel_timestamp):
+                if (
+                    (submit_timestamp and not cancel_timestamp) or
+                    (submit_timestamp > cancel_timestamp)
+                ):
                     return 'confirmed'
                 else:
                     return 'canceled'
 
         self.startServer(app)
         self.snapshot(test_name + ' -> initial')
         button = self.wait_for_element_by_css_selector('#button')
-        print(button)
 
         button.click()
         time.sleep(1)
@@ -960,30 +841,3 @@ def on_click(n_clicks):
         time.sleep(2)
 
         self.driver.switch_to.alert.accept()
-
-    def test_empty_graph(self):
-        app = dash.Dash(__name__)
-
-        app.layout = html.Div([
-            html.Button(id='click', children='Click me'),
-            dcc.Graph(
-                id='graph',
-                figure={
-                    'data': [dict(x=[1, 2, 3], y=[1, 2, 3], type='scatter')]
-                }
-            )
-        ])
-
-        @app.callback(dash.dependencies.Output('graph', 'figure'),
-                      [dash.dependencies.Input('click', 'n_clicks')],
-                      [dash.dependencies.State('graph', 'figure')])
-        def render_content(click, prev_graph):
-            if click:
-                return {}
-            return prev_graph
-
-        self.startServer(app)
-        button = self.wait_for_element_by_css_selector('#click')
-        button.click()
-        time.sleep(2)  # Wait for graph to re-render
-        self.snapshot('render-empty-graph')