mirror of
https://github.com/wagtail/wagtail.git
synced 2024-11-29 01:22:07 +01:00
parent
235f217fee
commit
3680e32ca8
@ -780,6 +780,7 @@
|
|||||||
* Nikhil S Kalburgi
|
* Nikhil S Kalburgi
|
||||||
* Salvo Polizzi
|
* Salvo Polizzi
|
||||||
* Badr Fourane
|
* Badr Fourane
|
||||||
|
* Vaishnav Dasari
|
||||||
|
|
||||||
## Translators
|
## Translators
|
||||||
|
|
||||||
|
@ -294,7 +294,7 @@ class Tabs {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Set url to have tab an tab hash at the end
|
* Set url to have a tab hash at the end
|
||||||
*/
|
*/
|
||||||
setURLHash(tabId) {
|
setURLHash(tabId) {
|
||||||
if (
|
if (
|
||||||
|
@ -71,12 +71,12 @@ class TestBulkPublish(WagtailTestUtils, TestCase):
|
|||||||
|
|
||||||
def test_publish_view(self):
|
def test_publish_view(self):
|
||||||
"""
|
"""
|
||||||
This tests that the publish view responds with an publish confirm page
|
This tests that the publish view responds with a publish confirm page
|
||||||
"""
|
"""
|
||||||
# Request confirm publish page
|
# Request confirm publish page
|
||||||
response = self.client.get(self.url)
|
response = self.client.get(self.url)
|
||||||
|
|
||||||
# # Check that the user received an publish confirm page
|
# # Check that the user received a publish confirm page
|
||||||
self.assertEqual(response.status_code, 200)
|
self.assertEqual(response.status_code, 200)
|
||||||
self.assertTemplateUsed(
|
self.assertTemplateUsed(
|
||||||
response, "wagtailadmin/pages/bulk_actions/confirm_bulk_publish.html"
|
response, "wagtailadmin/pages/bulk_actions/confirm_bulk_publish.html"
|
||||||
@ -206,12 +206,12 @@ class TestBulkPublish(WagtailTestUtils, TestCase):
|
|||||||
|
|
||||||
def test_publish_descendants_view(self):
|
def test_publish_descendants_view(self):
|
||||||
"""
|
"""
|
||||||
This tests that the publish view responds with an publish confirm page that does not contain the form field 'include_descendants'
|
This tests that the publish view responds with a publish confirm page that does not contain the form field 'include_descendants'
|
||||||
"""
|
"""
|
||||||
# Get publish page for page with no descendants
|
# Get publish page for page with no descendants
|
||||||
response = self.client.get(self.url)
|
response = self.client.get(self.url)
|
||||||
|
|
||||||
# Check that the user received an publish confirm page
|
# Check that the user received a publish confirm page
|
||||||
self.assertEqual(response.status_code, 200)
|
self.assertEqual(response.status_code, 200)
|
||||||
self.assertTemplateUsed(
|
self.assertTemplateUsed(
|
||||||
response, "wagtailadmin/pages/bulk_actions/confirm_bulk_publish.html"
|
response, "wagtailadmin/pages/bulk_actions/confirm_bulk_publish.html"
|
||||||
@ -315,12 +315,12 @@ class TestBulkPublishIncludingDescendants(WagtailTestUtils, TestCase):
|
|||||||
|
|
||||||
def test_publish_descendants_view(self):
|
def test_publish_descendants_view(self):
|
||||||
"""
|
"""
|
||||||
This tests that the publish view responds with an publish confirm page that contains the form field 'include_descendants'
|
This tests that the publish view responds with a publish confirm page that contains the form field 'include_descendants'
|
||||||
"""
|
"""
|
||||||
# Get publish page
|
# Get publish page
|
||||||
response = self.client.get(self.url)
|
response = self.client.get(self.url)
|
||||||
|
|
||||||
# Check that the user received an publish confirm page
|
# Check that the user received a publish confirm page
|
||||||
self.assertEqual(response.status_code, 200)
|
self.assertEqual(response.status_code, 200)
|
||||||
self.assertTemplateUsed(
|
self.assertTemplateUsed(
|
||||||
response, "wagtailadmin/pages/bulk_actions/confirm_bulk_publish.html"
|
response, "wagtailadmin/pages/bulk_actions/confirm_bulk_publish.html"
|
||||||
|
@ -535,7 +535,7 @@ class TestEditCollection(CollectionInstanceTestUtils, WagtailTestUtils, TestCase
|
|||||||
# Retrieve edit form and check fields
|
# Retrieve edit form and check fields
|
||||||
response = self.get(collection_id=self.marketing_sub_collection.id)
|
response = self.get(collection_id=self.marketing_sub_collection.id)
|
||||||
self.assertNotContains(response, "Delete collection")
|
self.assertNotContains(response, "Delete collection")
|
||||||
# Add delete permission to parent collection an try again
|
# Add delete permission to parent collection and try again
|
||||||
GroupCollectionPermission.objects.create(
|
GroupCollectionPermission.objects.create(
|
||||||
group=self.marketing_group,
|
group=self.marketing_group,
|
||||||
collection=self.marketing_collection,
|
collection=self.marketing_collection,
|
||||||
|
@ -483,7 +483,7 @@ class TestSearchPromotionsEditView(WagtailTestUtils, TestCase):
|
|||||||
def setUp(self):
|
def setUp(self):
|
||||||
self.user = self.login()
|
self.user = self.login()
|
||||||
|
|
||||||
# Create an search pick to edit
|
# Create a search pick to edit
|
||||||
self.query = Query.get("Hello")
|
self.query = Query.get("Hello")
|
||||||
self.search_pick = self.query.editors_picks.create(
|
self.search_pick = self.query.editors_picks.create(
|
||||||
page_id=1, sort_order=0, description="Root page"
|
page_id=1, sort_order=0, description="Root page"
|
||||||
@ -645,7 +645,7 @@ class TestSearchPromotionsDeleteView(WagtailTestUtils, TestCase):
|
|||||||
def setUp(self):
|
def setUp(self):
|
||||||
self.login()
|
self.login()
|
||||||
|
|
||||||
# Create an search pick to delete
|
# Create a search pick to delete
|
||||||
self.query = Query.get("Hello")
|
self.query = Query.get("Hello")
|
||||||
self.search_pick = self.query.editors_picks.create(
|
self.search_pick = self.query.editors_picks.create(
|
||||||
page_id=1, description="Root page"
|
page_id=1, description="Root page"
|
||||||
|
@ -474,7 +474,7 @@ def set_locale_on_new_instance(sender, instance, **kwargs):
|
|||||||
return
|
return
|
||||||
|
|
||||||
# If this is a fixture load, use the global default Locale
|
# If this is a fixture load, use the global default Locale
|
||||||
# as the page tree is probably in an flux
|
# as the page tree is probably in flux
|
||||||
if kwargs["raw"]:
|
if kwargs["raw"]:
|
||||||
instance.locale = Locale.get_default()
|
instance.locale = Locale.get_default()
|
||||||
return
|
return
|
||||||
|
Loading…
Reference in New Issue
Block a user