From 4aad2710800feae6930a7049fed49303242d00e0 Mon Sep 17 00:00:00 2001 From: Albina Starykova Date: Tue, 17 Sep 2024 21:26:23 +0200 Subject: [PATCH] Update BE tests --- client/scss/components/_indicator.scss | 28 +++++++++---------- .../pages/listing/_locked_indicator.html | 2 +- .../admin/tests/pages/test_explorer_view.py | 2 +- wagtail/admin/tests/test_reports_views.py | 2 +- wagtail/admin/tests/test_site_summary.py | 6 ++-- wagtail/admin/tests/tests.py | 2 +- wagtail/documents/tests/test_site_summary.py | 6 ++-- wagtail/images/tests/test_site_summary.py | 6 ++-- 8 files changed, 27 insertions(+), 27 deletions(-) diff --git a/client/scss/components/_indicator.scss b/client/scss/components/_indicator.scss index 38f4da1aebb4..456eadeff27b 100644 --- a/client/scss/components/_indicator.scss +++ b/client/scss/components/_indicator.scss @@ -1,3 +1,17 @@ +.indicator { + margin-inline-end: 0; + opacity: theme('opacity.70'); + + .icon { + padding: 2px; + vertical-align: middle; // reset vertical-align set by icon.initial + } + + &--is-dimmed { + opacity: theme('opacity.50'); + } +} + .privacy-indicator { &.public { .label-private { @@ -11,17 +25,3 @@ } } } - -.indicator { - margin-inline-end: 0; - opacity: theme('opacity.70'); - - .icon { - padding: 2px; - vertical-align: middle; // reset vertical-align set by icon.initial - } - - &--is-inverse { - opacity: theme('opacity.50'); - } -} diff --git a/wagtail/admin/templates/wagtailadmin/pages/listing/_locked_indicator.html b/wagtail/admin/templates/wagtailadmin/pages/listing/_locked_indicator.html index f35c2b88198b..e1a062aadb4d 100644 --- a/wagtail/admin/templates/wagtailadmin/pages/listing/_locked_indicator.html +++ b/wagtail/admin/templates/wagtailadmin/pages/listing/_locked_indicator.html @@ -8,7 +8,7 @@ {% if page.locked %} {% icon name="lock" classname="initial" %} diff --git a/wagtail/admin/tests/pages/test_explorer_view.py b/wagtail/admin/tests/pages/test_explorer_view.py index 0e9ee4d6a05f..7f097c58c5a7 100644 --- a/wagtail/admin/tests/pages/test_explorer_view.py +++ b/wagtail/admin/tests/pages/test_explorer_view.py @@ -1195,7 +1195,7 @@ def test_admin_home_page_changes_with_permissions(self): response = self.client.get(reverse("wagtailadmin_home")) self.assertEqual(response.status_code, 200) # Bob should only see the welcome for example.com, not testserver - self.assertContains(response, "Welcome to the example.com Wagtail CMS") + self.assertContains(response, "example.com") self.assertNotContains(response, "testserver") def test_breadcrumb_with_no_user_permissions(self): diff --git a/wagtail/admin/tests/test_reports_views.py b/wagtail/admin/tests/test_reports_views.py index 820f4f810291..fdb0f9927e31 100644 --- a/wagtail/admin/tests/test_reports_views.py +++ b/wagtail/admin/tests/test_reports_views.py @@ -194,7 +194,7 @@ def test_simple(self): self.assertActiveFilterNotRendered(soup) # Locked by current user shown in indicator - self.assertContains(response, "locked-indicator indicator--is-inverse") + self.assertNotContains(response, "indicator--is-dimmed") self.assertContains( response, 'title="This page is locked, by you, to further editing"' ) diff --git a/wagtail/admin/tests/test_site_summary.py b/wagtail/admin/tests/test_site_summary.py index b77a2924ec97..a6a7cb9fb24c 100644 --- a/wagtail/admin/tests/test_site_summary.py +++ b/wagtail/admin/tests/test_site_summary.py @@ -57,11 +57,11 @@ def test_no_sites_summary_links_to_wagtail_root(self): self.assertSummaryContainsLinkToPage(self.wagtail_root.pk) def test_summary_includes_page_count_without_wagtail_root(self): - self.assertSummaryContains(f"{Page.objects.count() - 1} Pages") + self.assertSummaryContains(f"{Page.objects.count() - 1} Pages") def test_summary_shows_zero_pages_if_none_exist_except_wagtail_root(self): Page.objects.exclude(pk=self.wagtail_root.pk).delete() - self.assertSummaryContains("0 Pages") + self.assertSummaryContains("0 Pages") def test_user_with_no_page_permissions_is_not_shown_panel(self): self.user.is_superuser = False @@ -78,4 +78,4 @@ def test_user_with_limited_page_permissions_sees_proper_page_count(self): self.user.is_superuser = False self.user.save() self.user.groups.add(self.test_page_group) - self.assertSummaryContains("1 Page") + self.assertSummaryContains("1 Page") diff --git a/wagtail/admin/tests/tests.py b/wagtail/admin/tests/tests.py index 13674fe2761a..88eb0d44866c 100644 --- a/wagtail/admin/tests/tests.py +++ b/wagtail/admin/tests/tests.py @@ -29,7 +29,7 @@ def setUp(self): def test_simple(self): response = self.client.get(reverse("wagtailadmin_home")) self.assertEqual(response.status_code, 200) - self.assertContains(response, "Welcome to the Test Site Wagtail CMS") + self.assertContains(response, "Test Site") def test_admin_menu(self): response = self.client.get(reverse("wagtailadmin_home")) diff --git a/wagtail/documents/tests/test_site_summary.py b/wagtail/documents/tests/test_site_summary.py index 762e691ea19f..8a87a95bccc9 100644 --- a/wagtail/documents/tests/test_site_summary.py +++ b/wagtail/documents/tests/test_site_summary.py @@ -122,9 +122,9 @@ def test_user_with_no_permissions_is_not_shown_panel(self): def test_user_sees_proper_doc_count(self): cases = ( - (self.superuser, "3 Documents"), - (self.report_adder, "2 Documents"), - (self.report_chooser, "2 Documents"), + (self.superuser, "3 Documents"), + (self.report_adder, "2 Documents"), + (self.report_chooser, "2 Documents"), ) for user, content in cases: with self.subTest(user=user): diff --git a/wagtail/images/tests/test_site_summary.py b/wagtail/images/tests/test_site_summary.py index b23c18259026..06435f0db40c 100644 --- a/wagtail/images/tests/test_site_summary.py +++ b/wagtail/images/tests/test_site_summary.py @@ -126,9 +126,9 @@ def test_user_with_no_permissions_is_not_shown_panel(self): def test_user_sees_proper_image_count(self): cases = ( - (self.superuser, "3 Images"), - (self.bird_adder, "2 Images"), - (self.bird_chooser, "2 Images"), + (self.superuser, "3 Images"), + (self.bird_adder, "2 Images"), + (self.bird_chooser, "2 Images"), ) for user, content in cases: with self.subTest(user=user):