X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs-website;a=blobdiff_plain;f=web%2Fcore%2Fmodules%2Fviews%2Fsrc%2FTests%2FFieldApiDataTest.php;fp=web%2Fcore%2Fmodules%2Fviews%2Fsrc%2FTests%2FFieldApiDataTest.php;h=f6d5159dd8572f5fe40a9768ebf54a6e1bedcfd4;hp=0e1569592f9f6da78570c9a0e8e42a339fdafabb;hb=9917807b03b64faf00f6a1f29dcb6eafc454efa5;hpb=aea91e65e895364e460983b890e295aa5d5540a5

diff --git a/web/core/modules/views/src/Tests/FieldApiDataTest.php b/web/core/modules/views/src/Tests/FieldApiDataTest.php
index 0e1569592..f6d5159dd 100644
--- a/web/core/modules/views/src/Tests/FieldApiDataTest.php
+++ b/web/core/modules/views/src/Tests/FieldApiDataTest.php
@@ -5,6 +5,11 @@ namespace Drupal\views\Tests;
 use Drupal\Component\Render\MarkupInterface;
 use Drupal\field\Entity\FieldConfig;
 use Drupal\field\Tests\Views\FieldTestBase;
+use Drupal\language\Entity\ConfigurableLanguage;
+use Drupal\language\Entity\ContentLanguageSettings;
+use Drupal\node\Entity\Node;
+use Drupal\node\Entity\NodeType;
+use Drupal\views\Views;
 
 /**
  * Tests the Field Views data.
@@ -13,10 +18,27 @@ use Drupal\field\Tests\Views\FieldTestBase;
  */
 class FieldApiDataTest extends FieldTestBase {
 
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['language'];
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $testViews = ['test_field_config_translation_filter'];
+
+  /**
+   * The nodes used by the translation filter tests.
+   *
+   * @var \Drupal\node\NodeInterface[]
+   */
+  protected $translationNodes;
+
   protected function setUp() {
-    parent::setUp();
+    parent::setUp(FALSE);
 
-    $field_names = $this->setUpFieldStorages(1);
+    $field_names = $this->setUpFieldStorages(4);
 
     // Attach the field to nodes only.
     $field = [
@@ -43,6 +65,109 @@ class FieldApiDataTest extends FieldTestBase {
       ];
       $nodes[] = $this->drupalCreateNode($edit);
     }
+
+    $bundles = [];
+    $bundles[] = $bundle = NodeType::create(['type' => 'bundle1']);
+    $bundle->save();
+    $bundles[] = $bundle = NodeType::create(['type' => 'bundle2']);
+    $bundle->save();
+
+    // Make the first field translatable on all bundles.
+    $field = FieldConfig::create([
+      'field_name' => $field_names[1],
+      'entity_type' => 'node',
+      'bundle' => $bundles[0]->id(),
+      'translatable' => TRUE,
+    ]);
+    $field->save();
+    $field = FieldConfig::create([
+      'field_name' => $field_names[1],
+      'entity_type' => 'node',
+      'bundle' => $bundles[1]->id(),
+      'translatable' => TRUE,
+    ]);
+    $field->save();
+
+    // Make the second field not translatable on any bundle.
+    $field = FieldConfig::create([
+      'field_name' => $field_names[2],
+      'entity_type' => 'node',
+      'bundle' => $bundles[0]->id(),
+      'translatable' => FALSE,
+    ]);
+    $field->save();
+    $field = FieldConfig::create([
+      'field_name' => $field_names[2],
+      'entity_type' => 'node',
+      'bundle' => $bundles[1]->id(),
+      'translatable' => FALSE,
+    ]);
+    $field->save();
+
+    // Make the last field translatable on some bundles.
+    $field = FieldConfig::create([
+      'field_name' => $field_names[3],
+      'entity_type' => 'node',
+      'bundle' => $bundles[0]->id(),
+      'translatable' => TRUE,
+    ]);
+    $field->save();
+    $field = FieldConfig::create([
+      'field_name' => $field_names[3],
+      'entity_type' => 'node',
+      'bundle' => $bundles[1]->id(),
+      'translatable' => FALSE,
+    ]);
+    $field->save();
+
+    // Create some example content.
+    ConfigurableLanguage::create([
+      'id' => 'es',
+    ])->save();
+    ConfigurableLanguage::create([
+      'id' => 'fr',
+    ])->save();
+
+    $config = ContentLanguageSettings::loadByEntityTypeBundle('node', $bundles[0]->id());
+    $config->setDefaultLangcode('es')
+      ->setLanguageAlterable(TRUE)
+      ->save();
+    $config = ContentLanguageSettings::loadByEntityTypeBundle('node', $bundles[1]->id());
+    $config->setDefaultLangcode('es')
+      ->setLanguageAlterable(TRUE)
+      ->save();
+
+    $node = Node::create([
+      'title' => 'Test title ' . $bundles[0]->id(),
+      'type' => $bundles[0]->id(),
+      'langcode' => 'es',
+      $field_names[1] => 'field name 1: es',
+      $field_names[2] => 'field name 2: es',
+      $field_names[3] => 'field name 3: es',
+    ]);
+    $node->save();
+    $this->translationNodes[] = $node;
+    $translation = $node->addTranslation('fr');
+    $translation->{$field_names[1]}->value = 'field name 1: fr';
+    $translation->{$field_names[3]}->value = 'field name 3: fr';
+    $translation->title->value = $node->title->value;
+    $translation->save();
+
+    $node = Node::create([
+      'title' => 'Test title ' . $bundles[1]->id(),
+      'type' => $bundles[1]->id(),
+      'langcode' => 'es',
+      $field_names[1] => 'field name 1: es',
+      $field_names[2] => 'field name 2: es',
+      $field_names[3] => 'field name 3: es',
+    ]);
+    $node->save();
+    $this->translationNodes[] = $node;
+    $translation = $node->addTranslation('fr');
+    $translation->{$field_names[1]}->value = 'field name 1: fr';
+    $translation->title->value = $node->title->value;
+    $translation->save();
+
   }
 
   /**
@@ -137,4 +262,118 @@ class FieldApiDataTest extends FieldTestBase {
     return $data;
   }
 
+  /**
+   * Tests filtering entries with different translatabilty.
+   */
+  public function testEntityFieldFilter() {
+    $map = [
+      'nid' => 'nid',
+      'langcode' => 'langcode',
+    ];
+
+    $view = Views::getView('test_field_config_translation_filter');
+
+    // Filter by 'field name 1: es'.
+    $view->setDisplay('embed_1');
+    $this->executeView($view);
+    $expected = [
+      [
+        'nid' => $this->translationNodes[0]->id(),
+        'langcode' => 'es',
+      ],
+      [
+        'nid' => $this->translationNodes[1]->id(),
+        'langcode' => 'es',
+      ],
+    ];
+
+    $this->assertIdenticalResultset($view, $expected, $map);
+    $view->destroy();
+
+    // Filter by 'field name 1: fr'.
+    $view->setDisplay('embed_2');
+    $this->executeView($view);
+    $expected = [
+      [
+        'nid' => $this->translationNodes[0]->id(),
+        'langcode' => 'fr',
+      ],
+      [
+        'nid' => $this->translationNodes[1]->id(),
+        'langcode' => 'fr',
+      ],
+    ];
+
+    $this->assertIdenticalResultset($view, $expected, $map);
+    $view->destroy();
+
+    // Filter by 'field name 2: es'.
+    $view->setDisplay('embed_3');
+    $this->executeView($view);
+    $expected = [
+      [
+        'nid' => $this->translationNodes[0]->id(),
+        'langcode' => 'es',
+      ],
+      [
+        'nid' => $this->translationNodes[0]->id(),
+        'langcode' => 'fr',
+      ],
+      [
+        'nid' => $this->translationNodes[1]->id(),
+        'langcode' => 'es',
+      ],
+      [
+        'nid' => $this->translationNodes[1]->id(),
+        'langcode' => 'fr',
+      ],
+    ];
+
+    $this->assertIdenticalResultset($view, $expected, $map);
+    $view->destroy();
+
+    // Filter by 'field name 2: fr', which doesn't exist.
+    $view->setDisplay('embed_4');
+    $this->executeView($view);
+    $expected = [];
+
+    $this->assertIdenticalResultset($view, $expected, $map);
+    $view->destroy();
+
+    // Filter by 'field name 3: es'.
+    $view->setDisplay('embed_5');
+    $this->executeView($view);
+    $expected = [
+      [
+        'nid' => $this->translationNodes[0]->id(),
+        'langcode' => 'es',
+      ],
+      [
+        'nid' => $this->translationNodes[1]->id(),
+        'langcode' => 'es',
+      ],
+      // Why is this one returned?
+      [
+        'nid' => $this->translationNodes[1]->id(),
+        'langcode' => 'fr',
+      ],
+    ];
+
+    $this->assertIdenticalResultset($view, $expected, $map);
+    $view->destroy();
+
+    // Filter by 'field name 3: fr'.
+    $view->setDisplay('embed_6');
+    $this->executeView($view);
+    $expected = [
+      [
+        'nid' => $this->translationNodes[0]->id(),
+        'langcode' => 'fr',
+      ],
+    ];
+
+    $this->assertIdenticalResultset($view, $expected, $map);
+    $view->destroy();
+  }
+
 }