X-Git-Url: http://aleph1.co.uk/gitweb/?a=blobdiff_plain;f=web%2Fmodules%2Fcontrib%2Fmetatag%2Fsrc%2FTests%2FMetatagNodeTranslationTest.php;h=07e0199ed0269b69102652187124f1478946632b;hb=af6d1fb995500ae68849458ee10d66abbdcfb252;hp=0e9ff0d707ecc8e7f5a0ac1fbfbb5a5159e4449e;hpb=a2bd1bf0c2c1f1a17d188f4dc0726a45494cefae;p=yaffs-website

diff --git a/web/modules/contrib/metatag/src/Tests/MetatagNodeTranslationTest.php b/web/modules/contrib/metatag/src/Tests/MetatagNodeTranslationTest.php
index 0e9ff0d70..07e0199ed 100644
--- a/web/modules/contrib/metatag/src/Tests/MetatagNodeTranslationTest.php
+++ b/web/modules/contrib/metatag/src/Tests/MetatagNodeTranslationTest.php
@@ -74,49 +74,71 @@ class MetatagNodeTranslationTest extends WebTestBase {
    * Tests the metatag value translations.
    */
   public function testMetatagValueTranslation() {
+    if (floatval(\Drupal::VERSION) <= 8.3) {
+      $save_label = t('Save and publish');
+      $save_label_i18n = t('Save and keep published (this translation)');
+    }
+    else {
+      $save_label = t('Save');
+      $save_label_i18n = t('Save (this translation)');
+    }
+
     // Set up a content type.
-    $name = $this->randomString();
+    $name = $this->randomMachineName() . ' ' . $this->randomMachineName();
     $this->drupalLogin($this->adminUser);
     $this->drupalCreateContentType(['type' => 'metatag_node', 'name' => $name]);
 
     // Add a metatag field to the content type.
-    $this->drupalGet("admin/structure/types");
-    $this->drupalGet("admin/structure/types/manage/metatag_node/fields/add-field");
+    $this->drupalGet('admin/structure/types');
+    $this->assertResponse(200);
+    $this->drupalGet('admin/structure/types/manage/metatag_node');
+    $this->assertResponse(200);
+    $edit = [
+      'language_configuration[language_alterable]' => TRUE,
+      'language_configuration[content_translation]' => TRUE,
+    ];
+    $this->drupalPostForm(NULL, $edit, t('Save content type'));
+    $this->assertResponse(200);
+
+    $this->drupalGet('admin/structure/types/manage/metatag_node/fields/add-field');
     $this->assertResponse(200);
     $edit = [
-      'label' => 'Metatag',
-      'field_name' => 'metatag_field',
+      'label' => 'Meta tags',
+      'field_name' => 'meta_tags',
       'new_storage_type' => 'metatag',
     ];
     $this->drupalPostForm(NULL, $edit, t('Save and continue'));
+    $this->assertResponse(200);
     $this->drupalPostForm(NULL, [], t('Save field settings'));
-    $this->container->get('entity.manager')->clearCachedFieldDefinitions();
-
-    // Enable translation for our test content type.
-    $this->drupalGet('admin/config/regional/content-language');
     $this->assertResponse(200);
     $edit = [
-      'entity_types[node]' => 1,
-      'settings[node][metatag_node][translatable]' => 1,
-      'settings[node][metatag_node][translatable]' => 1,
-      'settings[node][metatag_node][fields][field_metatag_field]' => 1,
+      'translatable' => TRUE,
     ];
-    $this->drupalPostForm(NULL, $edit, t('Save configuration'));
-
-    $this->drupalGet('admin/structure/types/manage/metatag_node');
+    $this->drupalPostForm(NULL, $edit, t('Save settings'));
+    $this->assertResponse(200);
+    $this->drupalGet('admin/structure/types/manage/metatag_node/fields/node.metatag_node.field_meta_tags');
     $this->assertResponse(200);
 
     // Set up a node without explicit metatag description. This causes the
     // global default to be used, which contains a token (node:summary). The
     // token value should be correctly translated.
 
+    // Load the node form.
+    $this->drupalGet('node/add/metatag_node');
+    $this->assertResponse(200);
+
+    // Check the default values are correct.
+    $this->assertFieldByName('field_meta_tags[0][basic][title]', '[node:title] | [site:name]', 'Default title token is present.');
+    $this->assertFieldByName('field_meta_tags[0][basic][description]', '[node:summary]', 'Default description token is present.');
+
     // Create a node.
-    $this->drupalGet("node/add/metatag_node");
     $edit = [
       'title[0][value]' => 'Node Français',
       'body[0][value]' => 'French summary.',
     ];
-    $this->drupalPostForm(NULL, $edit, t('Save and publish'));
+    $this->drupalPostForm(NULL, $edit, $save_label);
+    $this->assertResponse(200);
+
     $xpath = $this->xpath("//meta[@name='description']");
     $this->assertEqual(count($xpath), 1, 'Exactly one description meta tag found.');
     $value = (string) $xpath[0]['content'];
@@ -124,11 +146,17 @@ class MetatagNodeTranslationTest extends WebTestBase {
 
     $this->drupalGet('node/1/translations/add/en/es');
     $this->assertResponse(200);
+    // Check the default values are there.
+    $this->assertFieldByName('field_meta_tags[0][basic][title]', '[node:title] | [site:name]', 'Default title token is present.');
+    $this->assertFieldByName('field_meta_tags[0][basic][description]', '[node:summary]', 'Default description token is present.');
+
     $edit = [
       'title[0][value]' => 'Node Español',
       'body[0][value]' => 'Spanish summary.',
     ];
-    $this->drupalPostForm(NULL, $edit, t('Save and keep published (this translation)'));
+    $this->drupalPostForm(NULL, $edit, $save_label_i18n);
+    $this->assertResponse(200);
+
     $this->drupalGet('es/node/1');
     $this->assertResponse(200);
     $xpath = $this->xpath("//meta[@name='description']");
@@ -137,14 +165,22 @@ class MetatagNodeTranslationTest extends WebTestBase {
     $this->assertEqual($value, 'Spanish summary.');
     $this->assertNotEqual($value, 'French summary.');
 
+    $this->drupalGet('node/1/edit');
+    $this->assertResponse(200);
+    // Check the default values are there.
+    $this->assertFieldByName('field_meta_tags[0][basic][title]', '[node:title] | [site:name]', 'Default title token is present.');
+    $this->assertFieldByName('field_meta_tags[0][basic][description]', '[node:summary]', 'Default description token is present.');
+
     // Set explicit values on the description metatag instead using the
     // defaults.
     $this->drupalGet('node/1/edit');
     $this->assertResponse(200);
     $edit = [
-      'field_metatag_field[0][basic][description]' => 'Overridden French description.',
+      'field_meta_tags[0][basic][description]' => 'Overridden French description.',
     ];
-    $this->drupalPostForm(NULL, $edit, t('Save and keep published (this translation)'));
+    $this->drupalPostForm(NULL, $edit, $save_label_i18n);
+    $this->assertResponse(200);
+
     $xpath = $this->xpath("//meta[@name='description']");
     $this->assertEqual(count($xpath), 1, 'Exactly one description meta tag found.');
     $value = (string) $xpath[0]['content'];
@@ -155,9 +191,11 @@ class MetatagNodeTranslationTest extends WebTestBase {
     $this->drupalGet('es/node/1/edit');
     $this->assertResponse(200);
     $edit = [
-      'field_metatag_field[0][basic][description]' => 'Overridden Spanish description.',
+      'field_meta_tags[0][basic][description]' => 'Overridden Spanish description.',
     ];
-    $this->drupalPostForm(NULL, $edit, t('Save and keep published (this translation)'));
+    $this->drupalPostForm(NULL, $edit, $save_label_i18n);
+    $this->assertResponse(200);
+
     $xpath = $this->xpath("//meta[@name='description']");
     $this->assertEqual(count($xpath), 1, 'Exactly one description meta tag found.');
     $value = (string) $xpath[0]['content'];
@@ -165,4 +203,5 @@ class MetatagNodeTranslationTest extends WebTestBase {
     $this->assertNotEqual($value, 'Spanish summary.');
     $this->assertNotEqual($value, 'French summary.');
   }
+
 }