From b32bb7383d6d2ea45abcae865561e2771e797133 Mon Sep 17 00:00:00 2001
From: Thibaud Colas <thibaudcolas@gmail.com>
Date: Tue, 14 May 2019 12:08:29 +0100
Subject: [PATCH] Fix failing Django tests due to changes in HTML structure

---
 wagtail/admin/tests/test_edit_handlers.py | 4 ++--
 wagtail/snippets/tests.py                 | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/wagtail/admin/tests/test_edit_handlers.py b/wagtail/admin/tests/test_edit_handlers.py
index 86babe033..1f4cbb8b6 100644
--- a/wagtail/admin/tests/test_edit_handlers.py
+++ b/wagtail/admin/tests/test_edit_handlers.py
@@ -290,8 +290,8 @@ class TestTabbedInterface(TestCase):
 
         # result should contain tab panels
         self.assertIn('<div class="tab-content">', result)
-        self.assertIn('<section id="tab-event-details" class="shiny active">', result)
-        self.assertIn('<section id="tab-speakers" class=" ">', result)
+        self.assertIn('<section id="tab-event-details" class="shiny active" role="tabpanel" aria-labelledby="tab-label-event-details">', result)
+        self.assertIn('<section id="tab-speakers" class=" " role="tabpanel" aria-labelledby="tab-label-speakers">', result)
 
         # result should contain rendered content from descendants
         self.assertIn('Abergavenny sheepdog trials</textarea>', result)
diff --git a/wagtail/snippets/tests.py b/wagtail/snippets/tests.py
index ef60139a4..d806e88f0 100644
--- a/wagtail/snippets/tests.py
+++ b/wagtail/snippets/tests.py
@@ -169,7 +169,7 @@ class TestSnippetCreateView(TestCase, WagtailTestUtils):
         response = self.get()
         self.assertEqual(response.status_code, 200)
         self.assertTemplateUsed(response, 'wagtailsnippets/snippets/create.html')
-        self.assertNotContains(response, '<ul class="tab-nav merged">')
+        self.assertNotContains(response, '<ul class="tab-nav merged" role="tablist">')
         self.assertNotContains(response, '<a href="#tab-advert" class="active">Advert</a>', html=True)
         self.assertNotContains(response, '<a href="#tab-other" class="">Other</a>', html=True)
 
@@ -179,7 +179,7 @@ class TestSnippetCreateView(TestCase, WagtailTestUtils):
 
         self.assertEqual(response.status_code, 200)
         self.assertTemplateUsed(response, 'wagtailsnippets/snippets/create.html')
-        self.assertContains(response, '<ul class="tab-nav merged">')
+        self.assertContains(response, '<ul class="tab-nav merged" role="tablist">')
         self.assertContains(response, '<a href="#tab-advert" class="active">Advert</a>', html=True)
         self.assertContains(response, '<a href="#tab-other" class="">Other</a>', html=True)
 
@@ -255,7 +255,7 @@ class TestSnippetEditView(BaseTestSnippetEditView):
         response = self.get()
         self.assertEqual(response.status_code, 200)
         self.assertTemplateUsed(response, 'wagtailsnippets/snippets/edit.html')
-        self.assertNotContains(response, '<ul class="tab-nav merged">')
+        self.assertNotContains(response, '<ul class="tab-nav merged" role="tablist">')
         self.assertNotContains(response, '<a href="#advert" class="active">Advert</a>', html=True)
         self.assertNotContains(response, '<a href="#other" class="">Other</a>', html=True)
 
@@ -315,7 +315,7 @@ class TestEditTabbedSnippet(BaseTestSnippetEditView):
 
         self.assertEqual(response.status_code, 200)
         self.assertTemplateUsed(response, 'wagtailsnippets/snippets/edit.html')
-        self.assertContains(response, '<ul class="tab-nav merged">')
+        self.assertContains(response, '<ul class="tab-nav merged" role="tablist">')
         self.assertContains(response, '<a href="#tab-advert" class="active">Advert</a>', html=True)
         self.assertContains(response, '<a href="#tab-other" class="">Other</a>', html=True)