[Rt-commit] rt branch, 4.6/fontawesome-icons, updated. rt-4.4.4-455-g71c02a6b1

[Blaine Motsinger]

The branch, 4.6/fontawesome-icons has been updated
       via  71c02a6b18c30fc7b88fae023af47982bb7462b9 (commit)
       via  f2ee99dba6aaecf11d4e7a592716a6694b6dff50 (commit)
      from  910f3399d2353d03c5a85f22828b6082f4b556de (commit)

Summary of changes:
 t/security/CVE-2012-4732-csrf-blacklist.t | 4 ++--
 t/web/requestor_groups_edit_link.t        | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

- Log -----------------------------------------------------------------
commit f2ee99dba6aaecf11d4e7a592716a6694b6dff50
Author: Blaine Motsinger <blaine at bestpractical.com>
Date:   Mon Oct 28 17:04:08 2019 -0500

    Update test for removing bookmark imgs

diff --git a/t/security/CVE-2012-4732-csrf-blacklist.t b/t/security/CVE-2012-4732-csrf-blacklist.t
index 43652e4d8..96a7987d5 100644
--- a/t/security/CVE-2012-4732-csrf-blacklist.t
+++ b/t/security/CVE-2012-4732-csrf-blacklist.t
@@ -18,7 +18,7 @@ ok $m->login, 'logged in';
 $m->add_header(Referer => $baseurl);
 $m->get_ok($test_page);
 $m->content_lacks("Possible cross-site request forgery");
-$m->content_contains("star-full.png");
+$m->content_contains("fas fa-bookmark bookmark-selected");
 
 # come from an external source
 $m->add_header(Referer => 'http://example.com');
@@ -36,6 +36,6 @@ $m->title_is('Possible cross-site request forgery');
 $m->follow_link(text_regex => qr{resume your request});
 $m->content_lacks("Possible cross-site request forgery");
 like($m->response->request->uri, qr{^http://[^/]+\Q$test_path\E\?CSRF_Token=\w+$});
-$m->content_contains("star-empty.png");
+$m->content_contains("far fa-bookmark");
 
 done_testing;

commit 71c02a6b18c30fc7b88fae023af47982bb7462b9
Author: Blaine Motsinger <blaine at bestpractical.com>
Date:   Mon Oct 28 18:12:20 2019 -0500

    Fix test to find link via regex instead of text
    
    Since updating to fontawesome icons this test was finding more
    links via Text Edit than just the groups edit link.  This update
    makes the test more specifically check for the link URL so it no
    longer finds more than one.

diff --git a/t/web/requestor_groups_edit_link.t b/t/web/requestor_groups_edit_link.t
index cf67311eb..e778483c5 100644
--- a/t/web/requestor_groups_edit_link.t
+++ b/t/web/requestor_groups_edit_link.t
@@ -30,13 +30,14 @@ my ($id) = $ticket->Create(
 );
 ok( $id, 'created ticket' );
 
+my $url_regex = qr{\/Admin\/Users\/Memberships\.html};
 
 ok( $m->login( user_a => 'password' ), 'logged in as user_a' );
 
 $m->goto_ticket($id);
 
 ok(
-    !$m->find_link( text => 'Edit' ), 'no Edit link without AdminUsers permission'
+    !$m->find_link( url_regex => $url_regex ), 'no Edit link without AdminUsers permission'
 );
 
 ok(
@@ -50,6 +51,6 @@ ok(
 );
 
 $m->goto_ticket($id);
-$m->follow_link_ok( { text => 'Edit' }, 'follow the Edit link' );
+$m->follow_link_ok( { url_regex => $url_regex }, 'follow the Edit link' );
 is( $m->uri, $url . "/Admin/Users/Memberships.html?id=" . $user_a->id, 'url is right' );
 

-----------------------------------------------------------------------