Skip to content

Commit 2b6097d

Browse files
committed
fix tests
1 parent dab9106 commit 2b6097d

File tree

6 files changed

+29
-3
lines changed

6 files changed

+29
-3
lines changed

src/cone/app/tests/test_browser_actions.py

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,7 @@ def test_LinkAction(self):
182182
data-placement="top"
183183
ajax:bind="click"
184184
ajax:target="http://example.com/"
185+
ajax:overlay-css="modal-xl"
185186
></a>
186187
""", rendered)
187188

@@ -335,6 +336,7 @@ def test_ActionUp(self):
335336
ajax:bind="click"
336337
ajax:target="http://example.com/root?contenttile=listing"
337338
ajax:event="contextchanged:#layout"
339+
ajax:overlay-css="modal-xl"
338340
ajax:path="href"
339341
><span class="bi-arrow-up"></span
340342
>&nbsp;<span>One level up</span></a>...
@@ -349,6 +351,7 @@ def test_ActionUp(self):
349351
ajax:bind="click"
350352
ajax:target="http://example.com/root?contenttile=otherparentcontent"
351353
ajax:event="contextchanged:#layout"
354+
ajax:overlay-css="modal-xl"
352355
ajax:path="href"
353356
><span class="bi-arrow-up"></span
354357
>&nbsp;<span>One level up</span></a>...
@@ -365,6 +368,7 @@ def test_ActionUp(self):
365368
ajax:bind="click"
366369
ajax:target="http://example.com/root?contenttile=listing"
367370
ajax:event="contextchanged:#layout"
371+
ajax:overlay-css="modal-xl"
368372
ajax:path="href"
369373
><span class="bi-arrow-up"></span
370374
>&nbsp;<span>One level up</span></a>...
@@ -393,6 +397,7 @@ def test_ActionView(self):
393397
ajax:bind="click"
394398
ajax:target="http://example.com/root/model"
395399
ajax:action="content:#content:inner"
400+
ajax:overlay-css="modal-xl"
396401
ajax:path="href"
397402
><span class="bi-eye-fill"></span
398403
>&nbsp;<span>View</span></a>...
@@ -407,6 +412,7 @@ def test_ActionView(self):
407412
ajax:bind="click"
408413
ajax:target="http://example.com/root/model"
409414
ajax:action="view:#content:inner"
415+
ajax:overlay-css="modal-xl"
410416
ajax:path="href"
411417
><span class="bi-eye-fill"></span
412418
>&nbsp;<span>View</span></a>...
@@ -437,6 +443,7 @@ def test_ViewLink(self):
437443
ajax:bind="click"
438444
ajax:target="http://example.com/root/model"
439445
ajax:action="content:#content:inner"
446+
ajax:overlay-css="modal-xl"
440447
ajax:path="href"
441448
>&nbsp;<span>model</span></a>...
442449
""", rendered)
@@ -461,6 +468,7 @@ def test_ActionList(self):
461468
ajax:bind="click"
462469
ajax:target="http://example.com/root/model"
463470
ajax:action="listing:#content:inner"
471+
ajax:overlay-css="modal-xl"
464472
ajax:path="href"
465473
><span class="bi-list-task"></span
466474
>&nbsp;<span>Listing</span></a>...
@@ -496,6 +504,7 @@ def test_ActionSharing(self):
496504
ajax:bind="click"
497505
ajax:target="http://example.com/root/sharingmodel"
498506
ajax:action="sharing:#content:inner"
507+
ajax:overlay-css="modal-xl"
499508
ajax:path="href"
500509
><span class="bi-share-fill"></span
501510
>&nbsp;<span>Sharing</span></a>...
@@ -610,6 +619,7 @@ def test_ActionEdit(self):
610619
ajax:bind="click"
611620
ajax:target="http://example.com/root/model"
612621
ajax:action="edit:#content:inner"
622+
ajax:overlay-css="modal-xl"
613623
ajax:path="href"
614624
><span class="bi-pencil"></span
615625
>&nbsp;<span>Edit</span></a>...
@@ -641,6 +651,7 @@ def test_ActionDelete(self):
641651
ajax:target="http://example.com/root/model"
642652
ajax:action="delete:NONE:NONE"
643653
ajax:confirm="Do you really want to delete this Item?"
654+
ajax:overlay-css="modal-xl"
644655
><span class="bi-trash3"></span
645656
>&nbsp;<span>Delete</span></a>...
646657
""", rendered)
@@ -673,6 +684,7 @@ def test_ActionDeleteChildren(self):
673684
ajax:target="http://example.com/root/model"
674685
ajax:action="delete_children:NONE:NONE"
675686
ajax:confirm="Do you really want to delete selected Items?"
687+
ajax:overlay-css="modal-xl"
676688
><span class="bi-trash3"></span
677689
>&nbsp;<span>Delete selected children</span></a>...
678690
""", rendered)
@@ -687,6 +699,7 @@ def test_ActionDeleteChildren(self):
687699
ajax:target="http://example.com/root/model"
688700
ajax:action="delete_children:NONE:NONE"
689701
ajax:confirm="Do you really want to delete selected Items?"
702+
ajax:overlay-css="modal-xl"
690703
><span class="bi-trash3"></span
691704
>&nbsp;<span>Delete selected children</span></a>...
692705
""", rendered)
@@ -714,6 +727,7 @@ def test_ActionCut(self):
714727
id="toolbaraction-cut"
715728
href="#"
716729
ajax:target="http://example.com/copysupport"
730+
ajax:overlay-css="modal-xl"
717731
><span class="bi-scissors"></span
718732
>&nbsp;<span>Cut</span></a>...
719733
""", rendered)
@@ -741,6 +755,7 @@ def test_ActionCopy(self):
741755
id="toolbaraction-copy"
742756
href="#"
743757
ajax:target="http://example.com/copysupport"
758+
ajax:overlay-css="modal-xl"
744759
><span class="bi-copy"></span
745760
>&nbsp;<span>Copy</span></a>...
746761
""", rendered)
@@ -769,6 +784,7 @@ def test_ActionPaste(self):
769784
href="#"
770785
class="disabled"
771786
ajax:target="http://example.com/copysupport"
787+
ajax:overlay-css="modal-xl"
772788
><span class="bi-clipboard"></span
773789
>&nbsp;<span>Paste</span></a>...
774790
""", rendered)
@@ -780,6 +796,7 @@ def test_ActionPaste(self):
780796
id="toolbaraction-paste"
781797
href="#"
782798
ajax:target="http://example.com/copysupport"
799+
ajax:overlay-css="modal-xl"
783800
><span class="bi-clipboard"></span
784801
>&nbsp;<span>Paste</span></a>...
785802
""", rendered)
@@ -792,6 +809,7 @@ def test_ActionPaste(self):
792809
id="toolbaraction-paste"
793810
href="#"
794811
ajax:target="http://example.com/copysupport"
812+
ajax:overlay-css="modal-xl"
795813
><span class="bi-clipboard"></span
796814
>&nbsp;<span>Paste</span></a>...
797815
""", rendered)

src/cone/app/tests/test_browser_ajax.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,7 @@ def test_AjaxMessage(self):
159159
)
160160

161161
self.assertEqual(message.as_json(), {
162+
'css': '',
162163
'type': 'message',
163164
'payload': payload,
164165
'flavor': flavor,
@@ -386,7 +387,8 @@ def test_AjaxFormContinue(self):
386387
'type': 'message',
387388
'payload': 'Some info message',
388389
'flavor': 'info',
389-
'selector': 'None'
390+
'selector': 'None',
391+
'css': ''
390392
}, {
391393
'type': 'overlay',
392394
'action': 'someaction',

src/cone/app/tests/test_browser_batch.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -719,7 +719,7 @@ def filtered_items(self):
719719
'cone.app.browser:templates/batched_items_footer.pt'
720720
)
721721
self.checkOutput("""
722-
...<div class="batched_items_footer">...
722+
...<div class="batched_items_footer...
723723
""", batched_items.rendered_footer)
724724

725725
# Slice ID
@@ -886,7 +886,7 @@ def filtered_items(self):
886886
# Test ``display_footer``
887887
self.assertTrue(batched_items.display_header)
888888

889-
expected = '<div class="batched_items_footer">'
889+
expected = '<div class="batched_items_footer'
890890
rendered = batched_items(model=model, request=self.layer.new_request())
891891
self.assertTrue(rendered.find(expected) > -1)
892892

src/cone/app/tests/test_browser_referencebrowser.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -818,6 +818,7 @@ def test_ReferenceAction(self):
818818
data-toggle="tooltip"
819819
data-placement="top"
820820
ajax:bind="click"
821+
ajax:overlay-css="modal-xl"
821822
></a>...
822823
""", action.render())
823824

@@ -1068,6 +1069,7 @@ def test_reference_listing(self):
10681069
data-toggle="tooltip"
10691070
data-placement="top"
10701071
ajax:bind="click"
1072+
ajax:overlay-css="modal-xl"
10711073
><span class="bi-plus-circle"></span></a>...
10721074
""", res)
10731075

src/cone/app/tests/test_browser_sharing.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,7 @@ def test_add_role(self):
208208
res = ajax_tile(invalid_node, request)
209209
self.assertEqual(res, {
210210
'continuation': [{
211+
'css': None,
211212
'flavor': 'error',
212213
'type': 'message',
213214
'payload': u"Can not add role 'manager' for principal 'viewer'",
@@ -275,6 +276,7 @@ def test_remove_role(self):
275276
res = ajax_tile(child, request)
276277
self.assertEqual(res, {
277278
'continuation': [{
279+
'css': None,
278280
'flavor': 'error',
279281
'type': 'message',
280282
'payload': u"Can not remove role 'inexistent' for principal 'viewer'",
@@ -296,6 +298,7 @@ def test_remove_role(self):
296298
res = ajax_tile(child, request)
297299
self.assertEqual(res, {
298300
'continuation': [{
301+
'css': None,
299302
'flavor': 'error',
300303
'type': 'message',
301304
'payload': u"Can not remove role 'manager' for principal 'foo'",

src/cone/app/tests/test_browser_table.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,7 @@ def sorted_rows(self, start, end, sort, order):
221221
ajax:bind="click"
222222
ajax:target="http://example.com/"
223223
ajax:action="content:#content:inner"
224+
ajax:overlay-css="modal-xl"
224225
ajax:path="href"
225226
>&nbsp;<span>Foo</span></a>...
226227
""", rendered)

0 commit comments

Comments
 (0)