# HG changeset patch # User Yves-Marie Haussonne # Date 1399542225 -7200 # Node ID fcf5309284dfc708ea32fa29e31e70ac929fb001 # Parent c8b44a569549a034bf02496f81ddc8c65e1e1850 Correct test of text to take into account the text tag order+ augment test timeout diff -r c8b44a569549 -r fcf5309284df test-suite/tests/012_comt-admin-text-list.js --- a/test-suite/tests/012_comt-admin-text-list.js Thu May 08 11:40:58 2014 +0200 +++ b/test-suite/tests/012_comt-admin-text-list.js Thu May 08 11:43:45 2014 +0200 @@ -57,9 +57,9 @@ for (var i=4; i--;) { test_text ('a.main_object_title:eq('+i+')', C.TEXTS[2]['#id_title']); - test_match ('.tag_list:eq('+i+')', /tags: test_text Text Troisième /); - test_text ('.tag_list:eq('+i+') a:eq(0)[href="?tag_selected=test_text"]', 'test_text'); - test_text ('.tag_list:eq('+i+') a:eq(1)[href="?tag_selected=Text+Troisi%C3%A8me"]','Text Troisième'); + test_match ('.tag_list:eq('+i+')', /tags:(?:\sText Troisième|\stest_text){2}\s/); + test_text ('.tag_list:eq('+i+') a[href="?tag_selected=test_text"]', 'test_text'); + test_text ('.tag_list:eq('+i+') a[href="?tag_selected=Text+Troisi%C3%A8me"]','Text Troisième'); test_text ('#text .hidden-text-actions:eq('+i+') a:eq(0)[href^="/text/"][href$="/view/"]', 'View'); test_text ('#text .hidden-text-actions:eq('+i+') a:eq(1)[href^="/text/"][href$="/edit/"]', 'Edit'); test_text ('#text .hidden-text-actions:eq('+i+') a:eq(2)[href="#"][id*="text-delete-"]', 'Delete'); diff -r c8b44a569549 -r fcf5309284df test-suite/tests/013_comt-admin-user-list.js --- a/test-suite/tests/013_comt-admin-user-list.js Thu May 08 11:40:58 2014 +0200 +++ b/test-suite/tests/013_comt-admin-user-list.js Thu May 08 11:43:45 2014 +0200 @@ -89,6 +89,7 @@ suite_check_user_nb (2); suite ('Add users in bulk', function () { + this.timeout(100000); test_page_loading ('/user/mass-add/', 'Add users in bulk\n - '+C['#id_workspace_name']); test ('fill emails', dsl(function (){ elt ('#id_email').val ('uc2@t.co,uc3@t.co,uc4@t.co,uc5@t.co,uc6@t.co,uc7@t.co');