From c3615d23756e70309bf306a23ba1a7332b98a942 Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Wed, 4 Jul 2018 14:52:31 +0100
Subject: [PATCH] Issue #2981042 by seanB, chr.fritsch, phenaproxima,
 marcoscano: Add empty text to Media view

---
 .../media/config/optional/views.view.media.yml      |  2 +-
 .../tests/src/Functional/MediaOverviewPageTest.php  |  2 +-
 .../config/install/views.view.media_library.yml     | 13 ++++++++++++-
 .../src/FunctionalJavascript/MediaLibraryTest.php   | 13 +++++++++++++
 4 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/core/modules/media/config/optional/views.view.media.yml b/core/modules/media/config/optional/views.view.media.yml
index 84587b5fb487..7cac70aba566 100644
--- a/core/modules/media/config/optional/views.view.media.yml
+++ b/core/modules/media/config/optional/views.view.media.yml
@@ -811,7 +811,7 @@ display:
           admin_label: ''
           empty: true
           tokenize: false
-          content: 'No content available.'
+          content: 'No media available.'
           plugin_id: text_custom
       relationships: {  }
       arguments: {  }
diff --git a/core/modules/media/tests/src/Functional/MediaOverviewPageTest.php b/core/modules/media/tests/src/Functional/MediaOverviewPageTest.php
index 069390e0feef..6bc1fe3386b5 100644
--- a/core/modules/media/tests/src/Functional/MediaOverviewPageTest.php
+++ b/core/modules/media/tests/src/Functional/MediaOverviewPageTest.php
@@ -54,7 +54,7 @@ class MediaOverviewPageTest extends MediaFunctionalTestBase {
     $this->assertEquals('Updated Sort ascending', $header->getText());
     $header = $assert_session->elementExists('css', 'th#view-operations-table-column');
     $this->assertEquals('Operations', $header->getText());
-    $assert_session->pageTextContains('No content available.');
+    $assert_session->pageTextContains('No media available.');
 
     // Create some content for the view.
     $media_type1 = $this->createMediaType('test');
diff --git a/core/modules/media_library/config/install/views.view.media_library.yml b/core/modules/media_library/config/install/views.view.media_library.yml
index 8c9e784e6008..61ac13600c6e 100644
--- a/core/modules/media_library/config/install/views.view.media_library.yml
+++ b/core/modules/media_library/config/install/views.view.media_library.yml
@@ -363,7 +363,18 @@ display:
       title: Media
       header: {  }
       footer: {  }
-      empty: {  }
+      empty:
+        area_text_custom:
+          id: area_text_custom
+          table: views
+          field: area_text_custom
+          relationship: none
+          group_type: group
+          admin_label: ''
+          empty: true
+          tokenize: false
+          content: 'No media available.'
+          plugin_id: text_custom
       relationships: {  }
       arguments:
         bundle:
diff --git a/core/modules/media_library/tests/src/FunctionalJavascript/MediaLibraryTest.php b/core/modules/media_library/tests/src/FunctionalJavascript/MediaLibraryTest.php
index f8604e644bf9..384005da5564 100644
--- a/core/modules/media_library/tests/src/FunctionalJavascript/MediaLibraryTest.php
+++ b/core/modules/media_library/tests/src/FunctionalJavascript/MediaLibraryTest.php
@@ -97,6 +97,19 @@ class MediaLibraryTest extends JavascriptTestBase {
     $this->submitForm([], 'Delete');
     $assert_session->pageTextNotContains('media_1');
     $assert_session->pageTextContains('media_2');
+
+    // Test 'Select all media'.
+    $this->getSession()->getPage()->checkField('Select all media');
+    $this->getSession()->getPage()->selectFieldOption('Action', 'media_delete_action');
+    $this->submitForm([], 'Apply to selected items');
+    $this->getSession()->getPage()->pressButton('Delete');
+
+    $assert_session->pageTextNotContains('media_2');
+    $assert_session->pageTextNotContains('media_3');
+    $assert_session->pageTextNotContains('media_4');
+
+    // Test empty text.
+    $assert_session->pageTextContains('No media available.');
   }
 
 }