From 8e9dcd9bc5c74579be9099c62a4b07e62ed035d5 Mon Sep 17 00:00:00 2001
From: okarpenko <okarpenko@ebay.com>
Date: Mon, 30 Mar 2015 17:50:00 +0300
Subject: [PATCH] MAGETWO-35487: HTML minification management
---
.../tests/app/Magento/User/Test/Handler/Role/Curl.php | 2 +-
.../tests/app/Magento/User/Test/Handler/User/Curl.php | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Handler/Role/Curl.php b/dev/tests/functional/tests/app/Magento/User/Test/Handler/Role/Curl.php
index 3f482454ac0..0ee323d5598 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Handler/Role/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Handler/Role/Curl.php
@@ -63,7 +63,7 @@ class Curl extends AbstractCurl implements RoleInterface
}
$url = 'admin/user_role/roleGrid/sort/role_id/dir/desc/';
- $regExpPattern = '/col\-role_id[^\>]*\>\s*(\d+)\s*<.td>\s*<[^<>]*?>' . $data['rolename'] . '/siu';
+ $regExpPattern = '/col\-role_id[^\>]+\>\s*(\d+)\s*<.td>\s*<[^<>]*?>' . $data['rolename'] . '/siu';
$extractor = new Extractor($url, $regExpPattern);
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Handler/User/Curl.php b/dev/tests/functional/tests/app/Magento/User/Test/Handler/User/Curl.php
index a1b5ea977ca..64a9e31528e 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Handler/User/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Handler/User/Curl.php
@@ -46,7 +46,7 @@ class Curl extends AbstractCurl implements UserInterface
}
$url = 'admin/user/roleGrid/sort/user_id/dir/desc';
- $regExpPattern = '/col-user_id[\s\W]*(\d+)\s*<.td>\s*<[^<>]*?>' . $data['username'] . '/siu';
+ $regExpPattern = '/col-user_id[^\>]+\>\s*(\d+)\s*<.td>\s*<[^<>]*?>' . $data['username'] . '/siu';
$extractor = new Extractor($url, $regExpPattern);
return ['user_id' => $extractor->getData()[1]];
--
GitLab