Issue #3128263: Move thunder_amp theme to d.o.

composer.json

@@ -60,9 +60,6 @@
             "drupal/diff": {
                 "Back button for comparison page": "https://www.drupal.org/files/issues/back_button_for-2853193-4.patch"
             },
-            "drupal/amp": {
-                "Missing schema": "https://www.drupal.org/files/issues/missing_schema_for-2878769-3.patch"
-            },
             "drupal/entity_browser": {
                 "Provide inline entity form FieldWidgetDisplay": "https://www.drupal.org/files/issues/2019-07-04/2858438_17.patch",
                 "Re-order + remove broken with the Entity Reference (and File) widget": "https://www.drupal.org/files/issues/2020-03-30/2851580-83.patch"
@@ -82,8 +79,6 @@
     "require": {
         "composer/installers": "^1.2",
         "cweagans/composer-patches": "^1.6.5",
-        "drupal/amp": "1.2",
-        "drupal/amptheme": "^1.1",
         "marc1706/fast-image-size": "^1.1.0",
         "oomphinc/composer-installers-extender": "^1.1",
         "drupal/access_unpublished": "^1.0-alpha8",
@@ -137,6 +132,7 @@
         "drupal/slick": "^2.0-rc3",
         "drupal/slick_media": "^2.0-alpha2",
         "drupal/thunder_admin": "^3.0",
+        "drupal/thunder_amp": "^1.0-beta2",
         "drupal/thunder_fia": "^1.0",
         "drupal/token": "^1.0",
         "drupal/update_helper": "^1.3",
@@ -170,8 +166,5 @@
         "drupal/config_profile": "^1.0",
         "mglaman/phpstan-drupal": "~0.12.0",
         "phpstan/phpstan-deprecation-rules": "~0.12.0"
-    },
-    "conflict": {
-        "masterminds/html5": "^2.4.0"
     }
 }

drupal-org.make

@@ -119,6 +119,8 @@ projects[thunder_admin][type] = theme
 projects[thunder_admin][version] = 3
 projects[thunder_fia][type] = module
 projects[thunder_fia][version] = 1
+projects[thunder_amp][type] = module
+projects[thunder_amp][version] = 1
 projects[token][type] = module
 projects[token][version] = 1
 projects[update_helper][type] = module

tests/src/FunctionalJavascript/ModuleIntegrationTest.php

@@ -234,6 +234,41 @@ public function testAmpIntegration() {
     $this->getSession()->executeScript('AMPValidationSuccess = false; console.info = function(message) { if (message === "AMP validation successful.") { AMPValidationSuccess = true } }; amp.validator.validateUrlAndLog(document.location.href, document);');
     $this->assertJsCondition('AMPValidationSuccess === true', 10000, 'AMP validation successful.');
 
+    $this->drupalLogout();
+    $this->drupalLogin($this->rootUser);
+
+    // Verify that the Site branding block is in the header region.
+    $this->drupalGet('admin/structure/block/list/thunder_amp');
+    $element = $this->xpath("//tr[contains(@data-drupal-selector, :block) and contains(@class, :status)]//select/option[@selected and @value=:region]",
+      [
+        ':block' => 'edit-blocks-thunder-amp-branding',
+        ':status' => 'block-enabled',
+        ':region' => 'header',
+      ]
+    );
+    $this->assertNotEmpty($element);
+
+    // Verify that the Title block is in the content region.
+    $this->drupalGet('admin/structure/block/list/thunder_amp');
+    $element = $this->xpath("//tr[contains(@data-drupal-selector, :block) and contains(@class, :status)]//select/option[@selected and @value=:region]",
+      [
+        ':block' => 'edit-blocks-thunder-amp-page-title',
+        ':status' => 'block-enabled',
+        ':region' => 'content',
+      ]
+    );
+    $this->assertNotEmpty($element);
+
+    // Verify that the Content block is in the content region.
+    $this->drupalGet('admin/structure/block/list/thunder_amp');
+    $element = $this->xpath("//tr[contains(@data-drupal-selector, :block) and contains(@class, :status)]//select/option[@selected and @value=:region]",
+      [
+        ':block' => 'edit-blocks-thunder-amp-content',
+        ':status' => 'block-enabled',
+        ':region' => 'content',
+      ]
+    );
+    $this->assertNotEmpty($element);
   }
 
   /**

tests/src/Traits/ThunderTestTrait.php

@@ -9,6 +9,7 @@
 use Drupal\Core\File\FileSystemInterface;
 use Drupal\Core\Site\Settings;
 use Drupal\dblog\Controller\DbLogController;
+use Drupal\user\Entity\User;
 use Symfony\Component\HttpFoundation\Request;
 
 /**
@@ -48,6 +49,21 @@ public function installDrupal() {
     $this->installDefaultThemeFromClassProperty($container);
     $this->installModulesFromClassProperty($container);
     $this->rebuildAll();
+    $this->replaceUser1();
+  }
+
+  /**
+   * Replace User 1 with the user created here.
+   */
+  protected function replaceUser1() {
+    /** @var \Drupal\user\UserInterface $account */
+    // @todo: Saving the account before the update is problematic.
+    // https://www.drupal.org/node/2560237
+    $account = User::load(1);
+    $account->setPassword($this->rootUser->pass_raw);
+    $account->setEmail($this->rootUser->getEmail());
+    $account->setUsername($this->rootUser->getAccountName());
+    $account->save();
   }
 
   /**