MAGETWO-35487: HTML minification management

okarpenko · okarpenko · commit af7d4931a698 · 2015-03-30T18:07:39.000+03:00
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
@@ -63,7 +63,7 @@ public function persist(FixtureInterface $fixture = null)
         }
 
         $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*<[^<>]*?>\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
@@ -46,7 +46,7 @@ public function persist(FixtureInterface $fixture = null)
         }
 
         $url = 'admin/user/roleGrid/sort/user_id/dir/desc';
-        $regExpPattern = '/col-user_id[^\>]+\>\s*(\d+)\s*<.td>\s*<[^<>]*?>' . $data['username'] . '/siu';
+        $regExpPattern = '/col-user_id[^\>]+\>\s*(\d+)\s*<.td>\s*<[^<>]*?>\s*' . $data['username'] . '/siu';
         $extractor = new Extractor($url, $regExpPattern);
 
         return ['user_id' => $extractor->getData()[1]];

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ public function persist(FixtureInterface $fixture = null)`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`$url = 'admin/user_role/roleGrid/sort/role_id/dir/desc/';`
`66`		`- $regExpPattern = '/col\-role_id[^\>]+\>\s(\d+)\s<.td>\s<[^<>]?>' . $data['rolename'] . '/siu';`
	`66`	`+ $regExpPattern = '/col\-role_id[^\>]+\>\s(\d+)\s<.td>\s<[^<>]?>\s*' . $data['rolename'] . '/siu';`
`67`	`67`
`68`	`68`	`$extractor = new Extractor($url, $regExpPattern);`
`69`	`69`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public function persist(FixtureInterface $fixture = null)`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`$url = 'admin/user/roleGrid/sort/user_id/dir/desc';`
`49`		`- $regExpPattern = '/col-user_id[^\>]+\>\s(\d+)\s<.td>\s<[^<>]?>' . $data['username'] . '/siu';`
	`49`	`+ $regExpPattern = '/col-user_id[^\>]+\>\s(\d+)\s<.td>\s<[^<>]?>\s*' . $data['username'] . '/siu';`
`50`	`50`	`$extractor = new Extractor($url, $regExpPattern);`
`51`	`51`
`52`	`52`	`return ['user_id' => $extractor->getData()[1]];`