projects
/
yaffs-website
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pull merge.
[yaffs-website]
/
web
/
core
/
modules
/
comment
/
tests
/
src
/
Functional
/
CommentNonNodeTest.php
diff --git
a/web/core/modules/comment/tests/src/Functional/CommentNonNodeTest.php
b/web/core/modules/comment/tests/src/Functional/CommentNonNodeTest.php
index 7580bb20307ae3a25607cfaa4a4664a5632940fa..ae94da1444e403574ecec5370e90c1ac195ad7aa 100644
(file)
--- a/
web/core/modules/comment/tests/src/Functional/CommentNonNodeTest.php
+++ b/
web/core/modules/comment/tests/src/Functional/CommentNonNodeTest.php
@@
-10,9
+10,9
@@
use Drupal\comment\Tests\CommentTestTrait;
use Drupal\entity_test\Entity\EntityTest;
use Drupal\field\Entity\FieldConfig;
use Drupal\field\Entity\FieldStorageConfig;
use Drupal\entity_test\Entity\EntityTest;
use Drupal\field\Entity\FieldConfig;
use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\field_ui\Tests\FieldUiTestTrait;
use Drupal\Tests\BrowserTestBase;
use Drupal\Core\Entity\EntityInterface;
use Drupal\Tests\BrowserTestBase;
use Drupal\Core\Entity\EntityInterface;
+use Drupal\Tests\field_ui\Traits\FieldUiTestTrait;
use Drupal\user\RoleInterface;
/**
use Drupal\user\RoleInterface;
/**
@@
-190,7
+190,7
@@
class CommentNonNodeTest extends BrowserTestBase {
$regex .= $comment->comment_body->value . '(.*?)';
$regex .= '/s';
$regex .= $comment->comment_body->value . '(.*?)';
$regex .= '/s';
- return (boolean) preg_match($regex, $this->get
Raw
Content());
+ return (boolean) preg_match($regex, $this->get
Session()->getPage()->get
Content());
}
else {
return FALSE;
}
else {
return FALSE;
@@
-204,7
+204,7
@@
class CommentNonNodeTest extends BrowserTestBase {
* Contact info is available.
*/
public function commentContactInfoAvailable() {
* Contact info is available.
*/
public function commentContactInfoAvailable() {
- return preg_match('/(input).*?(name="name").*?(input).*?(name="mail").*?(input).*?(name="homepage")/s', $this->get
Raw
Content());
+ return preg_match('/(input).*?(name="name").*?(input).*?(name="mail").*?(input).*?(name="homepage")/s', $this->get
Session()->getPage()->get
Content());
}
/**
}
/**
@@
-243,7
+243,7
@@
class CommentNonNodeTest extends BrowserTestBase {
*/
public function getUnapprovedComment($subject) {
$this->drupalGet('admin/content/comment/approval');
*/
public function getUnapprovedComment($subject) {
$this->drupalGet('admin/content/comment/approval');
- preg_match('/href="(.*?)#comment-([^"]+)"(.*?)>(' . $subject . ')/', $this->get
Raw
Content(), $match);
+ preg_match('/href="(.*?)#comment-([^"]+)"(.*?)>(' . $subject . ')/', $this->get
Session()->getPage()->get
Content(), $match);
return $match[2];
}
return $match[2];
}
@@
-253,7
+253,7
@@
class CommentNonNodeTest extends BrowserTestBase {
*/
public function testCommentFunctionality() {
$limited_user = $this->drupalCreateUser([
*/
public function testCommentFunctionality() {
$limited_user = $this->drupalCreateUser([
- 'administer entity_test fields'
+ 'administer entity_test fields'
,
]);
$this->drupalLogin($limited_user);
// Test that default field exists.
]);
$this->drupalLogin($limited_user);
// Test that default field exists.