commit 1240a49554247d30341f6f178ff7a682b0b227c9
Author: Shaun Dychko <ShaunDychko@475828.no-reply.drupal.org>
Date:   Mon Jul 6 14:44:57 2015 -0700

    fix tests

diff --git a/core/modules/views/src/Tests/Handler/AreaEntityTest.php b/core/modules/views/src/Tests/Handler/AreaEntityTest.php
index 4bc9af7..74b0d8b 100644
--- a/core/modules/views/src/Tests/Handler/AreaEntityTest.php
+++ b/core/modules/views/src/Tests/Handler/AreaEntityTest.php
@@ -128,8 +128,8 @@ public function doTestRender($entities) {
     $preview = $view->preview('default', [$entities[1]->id()]);
     $this->setRawContent(\Drupal::service('renderer')->renderRoot($preview));
     $view_class = 'js-view-dom-id-' . $view->dom_id;
-    $header_xpath = '//div[@class = "' . $view_class . '"]/div[1]';
-    $footer_xpath = '//div[@class = "' . $view_class . '"]/div[3]';
+    $header_xpath = '//div[@class = "' . $view_class . '"]/header[1]';
+    $footer_xpath = '//div[@class = "' . $view_class . '"]/footer[last()]';
 
     $result = $this->xpath($header_xpath);
     $this->assertTrue(strpos(trim((string) $result[0]), $entities[0]->label()) !== FALSE, 'The rendered entity appears in the header of the view.');
@@ -164,7 +164,7 @@ public function doTestRender($entities) {
     $preview = $view->preview('default', array($entities[1]->id()));
     $this->setRawContent($renderer->renderRoot($preview));
     $view_class = 'js-view-dom-id-' . $view->dom_id;
-    $result = $this->xpath('//div[@class = "' . $view_class . '"]/div[1]');
+    $result = $this->xpath('//div[@class = "' . $view_class . '"]/header[1]');
     $this->assertTrue(strpos(trim((string) $result[0]), $entities[0]->label()) !== FALSE, 'The rendered entity appears in the header of the view.');
     $this->assertTrue(strpos(trim((string) $result[0]), 'test') !== FALSE, 'The rendered entity appeared in the right view mode.');
 
@@ -173,7 +173,7 @@ public function doTestRender($entities) {
     $preview = $view->preview('default', array($entities[2]->id()));
     $this->setRawContent($renderer->renderRoot($preview));
     $view_class = 'js-view-dom-id-' . $view->dom_id;
-    $result = $this->xpath('//div[@class = "' . $view_class . '"]/div[3]');
+    $result = $this->xpath('//div[@class = "' . $view_class . '"]/footer[last()]');
     $this->assertTrue(strpos($result[0], $entities[2]->label()) === FALSE, 'The rendered entity does not appear in the footer of the view.');
 
     // Test the available view mode options.