Merge branch 'SLB-454-teaser-list-follow-up' into dev

AmazeeLabs · Oct 27, 2024 · 3550f0c · 3550f0c
2 parents a288b48 + dfa8f61
commit 3550f0c
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 12 deletions.
diff --git a/packages/drupal/gutenberg_blocks/css/edit.css b/packages/drupal/gutenberg_blocks/css/edit.css
@@ -312,3 +312,18 @@ details[open] > summary svg {
 .col-start-2 {
   grid-column-start: 2;
 }
+
+
+/* Reset a few link input suggestion styles to their gutenberg editor values. */
+.block-editor-inner-blocks .block-editor-link-control__search-input-wrapper {
+  border: 1px solid #cccccc;
+  font-size: 13px;
+}
+
+.block-editor-inner-blocks .block-editor-link-control__search-input-wrapper button.block-editor-link-control__search-item {
+  padding: 12px 16px;
+}
+
+.block-editor-inner-blocks .block-editor-link-control__search-input-wrapper button.block-editor-link-control__search-item:hover {
+  background-color: #ddd;
+}
diff --git a/packages/drupal/gutenberg_blocks/js/blocks/teaser-list.tsx b/packages/drupal/gutenberg_blocks/js/blocks/teaser-list.tsx
@@ -47,7 +47,7 @@ registerBlockType<{
       attributes;
 
     return (
-      <div className={'container-wrapper'}>
+      <div className={'container-wrapper !border-stone-500'}>
         <div className={'container-label'}>{__('Teaser list')}</div>
         <InspectorControls>
           <PanelBody>

diff --git a/tests/e2e/specs/drupal/homepage.spec.ts b/tests/e2e/specs/drupal/homepage.spec.ts
@@ -35,15 +35,17 @@ test.describe('the homepage', () => {
     ).toBeVisible();
   });
 
-  test.describe('if german is the preferred language', () => {
-    test.use({ locale: 'de-DE' });
-    test('redirects to german ', async ({ page }) => {
-      await page.goto(websiteUrl('/'));
-      const content = await page.getByRole('main');
-      await expect(
-        content.getByText('Architektur', { exact: true }),
-      ).toBeVisible();
-    });
+  test('redirects to german if german is the preferred language', async ({
+    browser,
+  }) => {
+    const context = await browser.newContext({ locale: 'de-DE' });
+    const page = await context.newPage();
+    await page.goto(websiteUrl('/'));
+    const content = await page.getByRole('main');
+    await expect(
+      content.getByText('Architektur', { exact: true }),
+    ).toBeVisible();
+    context.close();
   });
 
   test('it displays an image', async ({ page }) => {

diff --git a/tests/e2e/specs/drupal/preview-editor-sidebar.spec.ts b/tests/e2e/specs/drupal/preview-editor-sidebar.spec.ts
@@ -7,7 +7,7 @@ test.describe('instant preview - toggle editor sidebar', () => {
   test('toggle the preview editor sidebar', async ({ page }) => {
     await page.goto(cmsUrl('/admin/content'));
     await page.getByRole('link', { name: 'Add content' }).click();
-    await page
+    await (await page.locator('.layout-region--node-main'))
       .getByLabel('Title', { exact: true })
       .fill('Instant preview sidebar test');
     await page.locator('#edit-submit').click();

diff --git a/tests/e2e/specs/drupal/preview.spec.ts b/tests/e2e/specs/drupal/preview.spec.ts
@@ -7,7 +7,7 @@ test.describe('instant preview', () => {
   test('display an unpublished page in an iframe', async ({ page }) => {
     await page.goto(cmsUrl('/admin/content'));
     await page.getByRole('link', { name: 'Add content' }).click();
-    await page
+    await (await page.locator('.layout-region--node-main'))
       .getByLabel('Title', { exact: true })
       .fill('Instant preview test');
     await page.locator('#edit-submit').click();