Skip to content

Commit 2fd951c

Browse files
waralexwaralex
committed
Merge branch 'dev'
2 parents 05ac8fd + 7df955d commit 2fd951c

File tree

11 files changed

+80
-80
lines changed

11 files changed

+80
-80
lines changed

‎.circleci/config.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
- run:
4949
name: 🦔 percy finalize
5050
command: npx percy finalize --all
51-
when: always
51+
when: on_fail
5252

5353
workflows:
5454
version: 2

‎Project.toml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,16 @@ UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
2121

2222
[compat]
2323
CodecZlib = "0.6, 0.7"
24-
DashBase = "0.1.0"
24+
DashBase = "0.1"
2525
DashCoreComponents = "1.10.2"
2626
DashHtmlComponents = "1.0.3"
2727
DashTable = "4.9.0"
28-
DataStructures = "0.17.5, 0.18"
28+
DataStructures = "0.17, 0.18"
2929
HTTP = "0.8.10"
30-
JSON = "0.21.0"
31-
JSON2 = "0.3.1"
32-
MD5 = "0.2.1"
33-
PlotlyBase = "0.3.0, 0.4"
30+
JSON = "0.21"
31+
JSON2 = "0.3"
32+
MD5 = "0.2"
33+
PlotlyBase = "0.3, 0.4"
3434
julia = "1.2"
3535

3636
[extras]

‎test/integration/base/test_render.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,28 +26,28 @@ def test_jltr001r_undo_redo(dashjl):
2626
fp = jl_test_file_path("jltr001r_undo_redo.jl")
2727
dashjl.start_server(fp)
2828
dashjl.wait_for_element_by_css_selector(
29-
"#a", timeout=4
29+
"#a", timeout=10
3030
)
3131
input1 = dashjl.find_element("#a")
3232
input1.send_keys("xyz")
3333
dashjl.wait_for_text_to_equal(
34-
"#b", "xyz", timeout=2
34+
"#b", "xyz", timeout=10
3535
)
3636
click_undo(dashjl)
3737
dashjl.wait_for_text_to_equal(
38-
"#b", "xy", timeout=2
38+
"#b", "xy", timeout=10
3939
)
4040
click_undo(dashjl)
4141
dashjl.wait_for_text_to_equal(
42-
"#b", "x", timeout=2
42+
"#b", "x", timeout=10
4343
)
4444
click_redo(dashjl)
4545
dashjl.wait_for_text_to_equal(
46-
"#b", "xy", timeout=2
46+
"#b", "xy", timeout=10
4747
)
4848
dashjl.percy_snapshot(name="undo-redo")
4949
click_undo(dashjl)
5050
click_undo(dashjl)
5151
dashjl.wait_for_text_to_equal(
52-
"#b", "", timeout=2
52+
"#b", "", timeout=10
5353
)

‎test/integration/callbacks/test_basic_callback.py‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -12,29 +12,29 @@ def test_jlcbsc001_simple_callback(dashjl):
1212
dashjl.start_server(fp)
1313

1414
dashjl.wait_for_element_by_css_selector(
15-
"#input", timeout=4
15+
"#input", timeout=10
1616
)
1717

1818
dashjl.wait_for_text_to_equal(
19-
"#output", "initial value", timeout=3
19+
"#output", "initial value", timeout=10
2020
)
2121
input_ = dashjl.find_element("#input")
2222
dashjl.clear_input(input_)
2323
input_.send_keys("hello world")
2424

2525
dashjl.wait_for_text_to_equal(
26-
"#output", "hello world", timeout=3
26+
"#output", "hello world", timeout=10
2727
)
2828

2929
def test_jlcbsc002_callbacks_generating_children(dashjl):
3030
fp = jl_test_file_path("jlcbsc002_callbacks_generating_children.jl")
3131
dashjl.start_server(fp)
3232
dashjl.wait_for_element_by_css_selector(
33-
"#input", timeout=3
33+
"#input", timeout=10
3434
)
3535

3636
dashjl.wait_for_text_to_equal(
37-
"#sub-output-1", "sub input initial value", timeout=3
37+
"#sub-output-1", "sub input initial value", timeout=10
3838
)
3939

4040
pad_input, pad_div = dashjl.dash_innerhtml_dom.select_one(
@@ -54,14 +54,14 @@ def test_jlcbsc002_callbacks_generating_children(dashjl):
5454
dashjl.find_element("#sub-input-1").send_keys("deadbeef")
5555

5656
dashjl.wait_for_text_to_equal(
57-
"#sub-output-1", pad_input.attrs["value"] + "deadbeef", timeout=3
57+
"#sub-output-1", pad_input.attrs["value"] + "deadbeef", timeout=10
5858
)
5959

6060

6161
def test_jlcbsc003_callback_with_unloaded_async_component(dashjl):
6262
fp = jl_test_file_path("jlcbsc003_callback_with_unloaded_async_component.jl")
6363
dashjl.start_server(fp)
64-
dashjl.wait_for_text_to_equal("#output", "Hello", timeout=3)
64+
dashjl.wait_for_text_to_equal("#output", "Hello", timeout=10)
6565
dashjl.find_element("#btn").click()
6666
dashjl.wait_for_text_to_equal("#output", "Bye")
6767

@@ -81,10 +81,10 @@ def test_jlcbsc005_children_types(dashjl):
8181
"a string\nand a div"
8282
]
8383

84-
dashjl.wait_for_text_to_equal("#out", "init", timeout=3)
84+
dashjl.wait_for_text_to_equal("#out", "init", timeout=10)
8585
for text in outputs:
8686
dashjl.find_element("#btn").click()
87-
dashjl.wait_for_text_to_equal("#out", text, timeout=3)
87+
dashjl.wait_for_text_to_equal("#out", text, timeout=10)
8888

8989
def test_jlcbsc006_multiple_outputs(dashjl):
9090
fp = jl_test_file_path("jlcbsc006_multiple_outputs.jl")
@@ -95,138 +95,138 @@ def test_jlcbsc006_multiple_outputs(dashjl):
9595
)
9696

9797
dashjl.wait_for_text_to_equal(
98-
"#output1", "initial value first", timeout=3
98+
"#output1", "initial value first", timeout=10
9999
)
100100
dashjl.wait_for_text_to_equal(
101-
"#output2", "initial value second", timeout=3
101+
"#output2", "initial value second", timeout=10
102102
)
103103
input_ = dashjl.find_element("#input")
104104
dashjl.clear_input(input_)
105105
input_.send_keys("hello world")
106106

107107
dashjl.wait_for_text_to_equal(
108-
"#output1", "hello world first", timeout=3
108+
"#output1", "hello world first", timeout=10
109109
)
110110

111111
dashjl.wait_for_text_to_equal(
112-
"#output2", "hello world second", timeout=3
112+
"#output2", "hello world second", timeout=10
113113
)
114114

115115
def test_jlcbsc007_prevent_update(dashjl):
116116
fp = jl_test_file_path("jlcbsc007_prevent_update.jl")
117117
dashjl.start_server(fp)
118118

119119
dashjl.wait_for_element_by_css_selector(
120-
"#input", timeout=4
120+
"#input", timeout=10
121121
)
122122
dashjl.find_element("#input").click()
123123
dashjl.find_elements("div.VirtualizedSelectOption")[0].click()
124124

125125
dashjl.wait_for_text_to_equal(
126-
"#output", "regular", timeout=3
126+
"#output", "regular", timeout=10
127127
)
128128
dashjl.wait_for_text_to_equal(
129-
"#regular_output", "regular", timeout=3
129+
"#regular_output", "regular", timeout=10
130130
)
131131

132132
dashjl.find_element("#input").click()
133133
dashjl.find_elements("div.VirtualizedSelectOption")[1].click()
134134

135135
dashjl.wait_for_text_to_equal(
136-
"#regular_output", "prevent", timeout=3
136+
"#regular_output", "prevent", timeout=10
137137
)
138138
dashjl.wait_for_text_to_equal(
139-
"#output", "regular", timeout=3
139+
"#output", "regular", timeout=10
140140
)
141141

142142
dashjl.find_element("#input").click()
143143
dashjl.find_elements("div.VirtualizedSelectOption")[2].click()
144144

145145
dashjl.wait_for_text_to_equal(
146-
"#regular_output", "no_update", timeout=3
146+
"#regular_output", "no_update", timeout=10
147147
)
148148
dashjl.wait_for_text_to_equal(
149-
"#output", "regular", timeout=3
149+
"#output", "regular", timeout=10
150150
)
151151

152152
def test_jlcbsc008_prevent_update(dashjl):
153153
fp = jl_test_file_path("jlcbsc008_prevent_update_multiple.jl")
154154
dashjl.start_server(fp)
155155

156156
dashjl.wait_for_element_by_css_selector(
157-
"#input", timeout=4
157+
"#input", timeout=10
158158
)
159159
dashjl.find_element("#input").click()
160160
dashjl.find_elements("div.VirtualizedSelectOption")[0].click() #regular
161161

162162
dashjl.wait_for_text_to_equal(
163-
"#regular_output", "regular", timeout=3
163+
"#regular_output", "regular", timeout=10
164164
)
165165

166166
dashjl.wait_for_text_to_equal(
167-
"#output1", "regular", timeout=3
167+
"#output1", "regular", timeout=10
168168
)
169169
dashjl.wait_for_text_to_equal(
170-
"#output2", "regular", timeout=3
170+
"#output2", "regular", timeout=10
171171
)
172172

173173
dashjl.find_element("#input").click()
174174
dashjl.find_elements("div.VirtualizedSelectOption")[1].click() #PreventUpdate
175175

176176
dashjl.wait_for_text_to_equal(
177-
"#regular_output", "prevent", timeout=3
177+
"#regular_output", "prevent", timeout=10
178178
)
179179

180180
dashjl.wait_for_text_to_equal(
181-
"#output1", "regular", timeout=2
181+
"#output1", "regular", timeout=10
182182
)
183183
dashjl.wait_for_text_to_equal(
184-
"#output2", "regular", timeout=2
184+
"#output2", "regular", timeout=10
185185
)
186186

187187
dashjl.find_element("#input").click()
188188
dashjl.find_elements("div.VirtualizedSelectOption")[2].click() #no_update1
189189

190190
dashjl.wait_for_text_to_equal(
191-
"#regular_output", "no_update1", timeout=2
191+
"#regular_output", "no_update1", timeout=10
192192
)
193193

194194
dashjl.wait_for_text_to_equal(
195-
"#output1", "regular", timeout=2
195+
"#output1", "regular", timeout=10
196196
)
197197
dashjl.wait_for_text_to_equal(
198-
"#output2", "no_update1", timeout=2
198+
"#output2", "no_update1", timeout=10
199199
)
200200

201201
dashjl.find_element("#input").click()
202202
dashjl.find_elements("div.VirtualizedSelectOption")[3].click() #no_update2
203203

204204
dashjl.wait_for_text_to_equal(
205-
"#regular_output", "no_update2", timeout=3
205+
"#regular_output", "no_update2", timeout=10
206206
)
207207

208208
dashjl.wait_for_text_to_equal(
209-
"#output1", "no_update2", timeout=2
209+
"#output1", "no_update2", timeout=10
210210
)
211211
dashjl.wait_for_text_to_equal(
212-
"#output2", "no_update1", timeout=2
212+
"#output2", "no_update1", timeout=10
213213
)
214214

215215
def test_jlcbsc009_single_element_array_output(dashjl):
216216
fp = jl_test_file_path("jlcbsc009_single_element_array_output.jl")
217217
dashjl.start_server(fp)
218218

219219
dashjl.wait_for_element_by_css_selector(
220-
"#input", timeout=3
220+
"#input", timeout=10
221221
)
222222

223223
dashjl.wait_for_text_to_equal(
224-
"#output", "initial value", timeout=2
224+
"#output", "initial value", timeout=10
225225
)
226226
input_ = dashjl.find_element("#input")
227227
dashjl.clear_input(input_)
228228
input_.send_keys("hello world")
229229

230230
dashjl.wait_for_text_to_equal(
231-
"#output", "hello world", timeout=1
231+
"#output", "hello world", timeout=10
232232
)

‎test/integration/callbacks/test_callback_context.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ def test_jlcbcx001_modified_response(dashjl):
1212
fp = jl_test_file_path("jlcbcx001_modified_response.jl")
1313
dashjl.start_server(fp)
1414

15-
dashjl.wait_for_text_to_equal("#output", "ab - output", timeout=4)
15+
dashjl.wait_for_text_to_equal("#output", "ab - output", timeout=10)
1616
input1 = dashjl.find_element("#input")
1717

1818
input1.send_keys("cd")
@@ -28,7 +28,7 @@ def test_jlcbcx002_triggered(dashjl):
2828
fp = jl_test_file_path("jlcbcx002_triggered.jl")
2929
dashjl.start_server(fp)
3030
btns = ["btn-{}".format(x) for x in range(1, 6)]
31-
dashjl.wait_for_element_by_css_selector("#output", timeout=3)
31+
dashjl.wait_for_element_by_css_selector("#output", timeout=10)
3232
for i in range(1, 5):
3333
for btn in btns:
3434
dashjl.find_element("#" + btn).click()

0 commit comments

Comments
 (0)