X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs-website;a=blobdiff_plain;f=web%2Fmodules%2Fcontrib%2Fmetatag%2Fsrc%2FTests%2FMetatagFieldTestBase.php;h=a334bbd54059411f13afc788ef65956ca86fdabd;hp=d42c1567e3c455daadce82ef5f0f307ff2892837;hb=eba34333e3c89f208d2f72fa91351ad019a71583;hpb=a2bd1bf0c2c1f1a17d188f4dc0726a45494cefae

diff --git a/web/modules/contrib/metatag/src/Tests/MetatagFieldTestBase.php b/web/modules/contrib/metatag/src/Tests/MetatagFieldTestBase.php
index d42c1567e..a334bbd54 100644
--- a/web/modules/contrib/metatag/src/Tests/MetatagFieldTestBase.php
+++ b/web/modules/contrib/metatag/src/Tests/MetatagFieldTestBase.php
@@ -133,6 +133,8 @@ abstract class MetatagFieldTestBase extends WebTestBase {
     // create a user with these permissions.
     $all_perms = array_merge($this->base_perms, $this->entity_perms);
     $this->adminUser = $this->drupalCreateUser($all_perms);
+    $this->drupalGet('/user/login');
+    $this->assertResponse(200);
     $this->drupalLogin($this->adminUser);
   }
 
@@ -314,9 +316,9 @@ abstract class MetatagFieldTestBase extends WebTestBase {
 
     // Create a new entity object.
     $this->drupalPostForm(NULL, $edit, t($this->entity_save_button_label));
-    $entities = entity_load_multiple_by_properties($this->entity_type, [
-      $this->entity_title_field => $title,
-    ]);
+    $entities = \Drupal::entityTypeManager()
+      ->getStorage($this->entity_type)
+      ->loadByProperties([$this->entity_title_field => $title]);
     $this->assertEqual(1, count($entities), 'Entity was saved');
     $entity = reset($entities);
 
@@ -396,9 +398,9 @@ abstract class MetatagFieldTestBase extends WebTestBase {
 
     // Create a new entity object.
     $this->drupalPostForm(NULL, $edit, t($this->entity_save_button_label));
-    $entities = entity_load_multiple_by_properties($this->entity_type, [
-      $this->entity_title_field => $title,
-    ]);
+    $entities = \Drupal::entityTypeManager()
+      ->getStorage($this->entity_type)
+      ->loadByProperties([$this->entity_title_field => $title]);
     $this->assertEqual(1, count($entities), 'Entity was saved');
     $entity = reset($entities);
 
@@ -436,9 +438,9 @@ abstract class MetatagFieldTestBase extends WebTestBase {
       'field_metatag[0][basic][metatag_test]' => 'Kilimanjaro',
     ];
     $this->drupalPostForm(NULL, $edit, t('Save'));
-    $entities = entity_load_multiple_by_properties('entity_test', [
-      $this->entity_title_field => 'Barfoo',
-    ]);
+    $entities = \Drupal::entityTypeManager()
+      ->getStorage('entity_test')
+      ->loadByProperties([$this->entity_title_field => 'Barfoo']);
     $this->assertEqual(1, count($entities), 'Entity was saved');
     $entity = reset($entities);