From 14e235d2b47c41f6c1d0cfde7507b1f2435ab815 Mon Sep 17 00:00:00 2001
From: GoZ <goz@226961.no-reply.drupal.org>
Date: Sat, 25 Mar 2017 14:59:47 +0100
Subject: [PATCH] Issue #2863984: Convert web tests to browser tests for
 responsive_image module

---
 .../src/Functional}/ResponsiveImageAdminUITest.php     | 12 ++++++------
 .../Functional}/ResponsiveImageFieldDisplayTest.php    |  2 +-
 .../src/Functional}/ResponsiveImageFieldUiTest.php     | 18 +++++++++---------
 3 files changed, 16 insertions(+), 16 deletions(-)
 rename core/modules/responsive_image/{src/Tests => tests/src/Functional}/ResponsiveImageAdminUITest.php (95%)
 rename core/modules/responsive_image/{src/Tests => tests/src/Functional}/ResponsiveImageFieldDisplayTest.php (99%)
 rename core/modules/responsive_image/{src/Tests => tests/src/Functional}/ResponsiveImageFieldUiTest.php (88%)

diff --git a/core/modules/responsive_image/src/Tests/ResponsiveImageAdminUITest.php b/core/modules/responsive_image/tests/src/Functional/ResponsiveImageAdminUITest.php
similarity index 95%
rename from core/modules/responsive_image/src/Tests/ResponsiveImageAdminUITest.php
rename to core/modules/responsive_image/tests/src/Functional/ResponsiveImageAdminUITest.php
index 0439771..eeaf793 100644
--- a/core/modules/responsive_image/src/Tests/ResponsiveImageAdminUITest.php
+++ b/core/modules/responsive_image/tests/src/Functional/ResponsiveImageAdminUITest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\responsive_image\Tests;
+namespace Drupal\Tests\responsive_image\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Thoroughly test the administrative interface of the Responsive Image module.
  *
  * @group responsive_image
  */
-class ResponsiveImageAdminUITest extends WebTestBase {
+class ResponsiveImageAdminUITest extends BrowserTestBase {
 
   /**
    * Modules to enable.
@@ -78,11 +78,11 @@ public function testResponsiveImageAdmin() {
     );
     foreach ($cases as $case) {
       // Check if the radio buttons are present.
-      $this->assertFieldByName('keyed_styles[responsive_image_test_module.' . $case[0] . '][' . $case[1] . '][image_mapping_type]', '');
+      $this->assertFieldByName('keyed_styles[responsive_image_test_module.' . $case[0] . '][' . $case[1] . '][image_mapping_type]', NULL);
       // Check if the image style dropdowns are present.
-      $this->assertFieldByName('keyed_styles[responsive_image_test_module.' . $case[0] . '][' . $case[1] . '][image_style]', '');
+      $this->assertFieldByName('keyed_styles[responsive_image_test_module.' . $case[0] . '][' . $case[1] . '][image_style]', NULL);
       // Check if the sizes textfields are present.
-      $this->assertFieldByName('keyed_styles[responsive_image_test_module.' . $case[0] . '][' . $case[1] . '][sizes]', '');
+      $this->assertFieldByName('keyed_styles[responsive_image_test_module.' . $case[0] . '][' . $case[1] . '][sizes]', NULL);
 
       foreach ($image_styles as $image_style_name) {
         // Check if the image styles are available in the dropdowns.
diff --git a/core/modules/responsive_image/src/Tests/ResponsiveImageFieldDisplayTest.php b/core/modules/responsive_image/tests/src/Functional/ResponsiveImageFieldDisplayTest.php
similarity index 99%
rename from core/modules/responsive_image/src/Tests/ResponsiveImageFieldDisplayTest.php
rename to core/modules/responsive_image/tests/src/Functional/ResponsiveImageFieldDisplayTest.php
index b50d71b..306f7a2 100644
--- a/core/modules/responsive_image/src/Tests/ResponsiveImageFieldDisplayTest.php
+++ b/core/modules/responsive_image/tests/src/Functional/ResponsiveImageFieldDisplayTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\responsive_image\Tests;
+namespace Drupal\Tests\responsive_image\Functional;
 
 use Drupal\Component\Utility\Unicode;
 use Drupal\image\Tests\ImageFieldTestBase;
diff --git a/core/modules/responsive_image/src/Tests/ResponsiveImageFieldUiTest.php b/core/modules/responsive_image/tests/src/Functional/ResponsiveImageFieldUiTest.php
similarity index 88%
rename from core/modules/responsive_image/src/Tests/ResponsiveImageFieldUiTest.php
rename to core/modules/responsive_image/tests/src/Functional/ResponsiveImageFieldUiTest.php
index c6acb56..28e785d 100644
--- a/core/modules/responsive_image/src/Tests/ResponsiveImageFieldUiTest.php
+++ b/core/modules/responsive_image/tests/src/Functional/ResponsiveImageFieldUiTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Drupal\responsive_image\Tests;
+namespace Drupal\Tests\responsive_image\Functional;
 
 
 use Drupal\field_ui\Tests\FieldUiTestTrait;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\responsive_image\Entity\ResponsiveImageStyle;
 
 /**
@@ -12,7 +12,7 @@
  *
  * @group responsive_image
  */
-class ResponsiveImageFieldUiTest extends WebTestBase {
+class ResponsiveImageFieldUiTest extends BrowserTestBase {
 
   use FieldUiTestTrait;
 
@@ -55,9 +55,9 @@ public function testResponsiveImageFormatterUI() {
     $edit = [
       'fields[field_image][type]' => 'responsive_image',
       'fields[field_image][region]' => 'content',
-      'refresh_rows' => 'field_image',
     ];
-    $this->drupalPostAjaxForm(NULL, $edit, ['op' => t('Refresh')]);
+    $this->cssSelect('input[name="refresh_rows"]')[0]->setValue('field_image');
+    $this->drupalPostForm(NULL, $edit, t('Refresh'));
     $this->assertText("Select a responsive image style.", 'The expected summary is displayed.');
 
     // Submit the form.
@@ -93,7 +93,7 @@ public function testResponsiveImageFormatterUI() {
 
     // Click on the formatter settings button to open the formatter settings
     // form.
-    $this->drupalPostAjaxForm(NULL, [], "field_image_settings_edit");
+    $this->drupalPostForm(NULL, [], "field_image_settings_edit");
 
     // Assert that the correct fields are present.
     $fieldnames = [
@@ -107,7 +107,7 @@ public function testResponsiveImageFormatterUI() {
       'fields[field_image][settings_edit_form][settings][responsive_image_style]' => 'style_one',
       'fields[field_image][settings_edit_form][settings][image_link]' => 'content',
     ];
-    $this->drupalPostAjaxForm(NULL, $edit, "field_image_plugin_settings_update");
+    $this->drupalPostForm(NULL, $edit, "field_image_plugin_settings_update");
 
     // Save the form to save the settings.
     $this->drupalPostForm(NULL, [], t('Save'));
@@ -116,12 +116,12 @@ public function testResponsiveImageFormatterUI() {
 
     // Click on the formatter settings button to open the formatter settings
     // form.
-    $this->drupalPostAjaxForm(NULL, [], "field_image_settings_edit");
+    $this->drupalPostForm(NULL, [], "field_image_settings_edit");
     $edit = [
       'fields[field_image][settings_edit_form][settings][responsive_image_style]' => 'style_one',
       'fields[field_image][settings_edit_form][settings][image_link]' => 'file',
     ];
-    $this->drupalPostAjaxForm(NULL, $edit, "field_image_plugin_settings_update");
+    $this->drupalPostForm(NULL, $edit, "field_image_plugin_settings_update");
 
     // Save the form to save the third party settings.
     $this->drupalPostForm(NULL, [], t('Save'));
-- 
2.8.1