8000 Moved placeholders from Page to Title model by Aiky30 · Pull Request #6442 · django-cms/django-cms · GitHub
[go: up one dir, main page]
Skip to content

Moved placeholders from Page to Title model #6442

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 21 commits into from
Jul 12, 2018
Merged

Moved placeholders from Page to Title model #6442

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
1100f55
Added start of migrations
Jul 5, 2018
18b8870
Move th eplaceholder field from the page to the title model
Jul 5, 2018
7e3b972
Moving the page placeholder models over to title
Jul 5, 2018
5f662f4
Title -> Placeholder migrations working succesfully
Jul 5, 2018
194402b
Cleaned the migrations
Jul 5, 2018
b64e790
Delete all page models titles placeholders on page delte
Jul 6, 2018
c2fa474
Update the failures on the page tests
Jul 6, 2018
0334681
Continued repairing tests
Jul 6, 2018
3afdf96
Fixed minor issues in the page admin tests
Jul 6, 2018
fa4279e
Recent changes to make tests pass
Jul 9, 2018
ab8df9c
Cleanup
czpython Jul 9, 2018
0e51ad9
Refactor how tests fetch the pages placeholders
Jul 10, 2018
ed84828
Fix typo in previous commit
Jul 10, 2018
758fb2b
Continued fixing tests ensuring the placeholders are fetched properly
Jul 10, 2018
4ef4820
Down to 27Errors and 19 test failures
Jul 10, 2018
ea9bf3b
Reduced the failures and errors to 20/20
Jul 10, 2018
c9eec48
fixed a few more tests including the test_nested_plugins
Jul 10, 2018
8755eb9
more test fixes
czpython Jul 11, 2018
30c979e
more adjustments
czpython Jul 11, 2018
817f0e8
performance tests 1
czpython Jul 11, 2018
57b00f1
refactored migrations
czpython Jul 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8000
Prev Previous commit
Next Next commit
Refactor how tests fetch the pages placeholders
  • Loading branch information
@czpython
Andrew Aikman authored and czpython committed Jul 11, 2018
commit 0e51ad9c7c0f76028d51751a69b350b4a86e3581
18 changes: 6 additions & 12 deletions cms/tests/test_admin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,7 @@ def test_delete(self):
created_by=admin_user, published=True)
create_page('child-page', "nav_playground.html", "en",
created_by=admin_user, published=True, parent=page)
page_title = page.get_title_obj("en")
body = page_title.placeholders.get(slot='body')
body = page.get_placeholders("en").get(slot='body')
add_plugin(body, 'TextPlugin', 'en', body='text')
page.publish('en')
with self.login_user_context(admin_user):
Expand All @@ -151,8 +150,7 @@ def test_delete_diff_language(self):
created_by=admin_user, published=True)
create_page('child-page', "nav_playground.html", "de",
created_by=admin_user, published=True, parent=page)
page_title = page.get_title_obj("en")
body = page_title.placeholders.get(slot='body')
body = page.get_placeholders("en").get(slot='body')
add_plugin(body, 'TextPlugin', 'en', body='text')
page.publish('en')
with self.login_user_context(admin_user):
Expand Down Expand Up @@ -363,8 +361,7 @@ def test_empty_placeholder_with_nested_plugins(self):
# This allows us to catch a strange bug that happened
# under these conditions with the new related name handling.
page_en = create_page("EmptyPlaceholderTestPage (EN)", "nav_playground.html", "en")
page_en_title = page_en.get_title_obj("en")
ph = page_en_title.placeholders.get(slot="body")
ph = page_en.get_placeholders("en").get(slot="body")

column_wrapper = add_plugin(ph, "MultiColumnPlugin", "en")

Expand All @@ -391,8 +388,7 @@ def test_empty_placeholder_in_correct_language(self):
"""
# create some objects
page_en = create_page("EmptyPlaceholderTestPage (EN)", "nav_playground.html", "en")
page_en_title = page_en.get_title_obj("en")
ph = page_en_title.placeholders.get(slot="body")
ph = page_en.get_placeholders("en").get(slot="body")

# add the text plugin to the en version of the page
add_plugin(ph, "TextPlugin", "en", body="Hello World EN 1")
Expand Down Expand Up @@ -601,8 +597,7 @@ def test_too_many_plugins_global(self):
url = admin_reverse('cms_page_add_plugin')
with self.settings(CMS_PERMISSION=False, CMS_PLACEHOLDER_CONF=conf):
page = create_page('somepage', 'nav_playground.html', 'en')
page_title = page.get_title_obj(language='en')
body = page_title.placeholders.get(slot='body')
body = page.get_placeholders("en").get(slot='body')
add_plugin(body, 'TextPlugin', 'en', body='text')
with self.login_user_context(admin_user):
data = {
Expand All @@ -625,8 +620,7 @@ def test_too_many_plugins_type(self):
url = admin_reverse('cms_page_add_plugin')
with self.settings(CMS_PERMISSION=False, CMS_PLACEHOLDER_CONF=conf):
page = create_page('somepage', 'nav_playground.html', 'en')
page_title = page.get_title_obj(language='en')
body = page_title.placeholders.get(slot='body')
body = page.get_placeholders("en").get(slot='body')
add_plugin(body, 'TextPlugin', 'en', body='text')
with self.login_user_context(admin_user):
data = {
Expand Down
7 changes: 3 additions & 4 deletions cms/tests/test_alias.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,8 +218,7 @@ def test_alias_placeholder_is_not_editable(self):
published=True,
in_navigation=True,
)
source_title = source_page.get_title_obj(language="en")
source_placeholder = source_title.placeholders.get(slot="col_left")
source_placeholder = source_page.get_placeholders("en").get(slot="col_left")

style = api.add_plugin(
source_placeholder,
Expand All @@ -236,7 +235,7 @@ def test_alias_placeholder_is_not_editable(self):
published=True,
in_navigation=True,
)
target_placeholder = target_page.placeholders.get(slot="col_left")
target_placeholder = target_page.get_placeholders("en").get(slot="col_left")
alias = api.add_plugin(
target_placeholder,
'AliasPlugin',
Expand Down Expand Up @@ -273,7 +272,7 @@ def test_alias_placeholder_is_not_editable(self):
self.assertNotIn(start_tag, output)

editable_placeholders = renderer.get_rendered_editable_placeholders()
self.assertNotIn(source_placeholder,editable_placeholders)
self.assertNotIn(source_placeholder, editable_placeholders)

def test_alias_from_page_change_form_text(self):
superuser = self.get_superuser()
Expand Down
48 changes: 17 additions & 31 deletions cms/tests/test_page_admin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,7 @@ def _translation_exists(self, slug=None, title=None):
return lookup.exists()

def _get_add_plugin_uri(self, page, language='en'):
page_title = page.get_title_obj(language=language)
placeholder = page_title.placeholders.get(slot='body')
placeholder = page.get_placeholders(language).get(slot='body')
uri = self.get_add_plugin_uri(
placeholder=placeholder,
plugin_type='LinkPlugin',
Expand Down Expand Up @@ -1742,9 +1741,8 @@ def test_page_changelist_search(self):
def test_global_limit_on_plugin_move(self):
superuser = self.get_superuser()
cms_page = self.get_page()
cms_page_title = cms_page.get_title_obj()
source_placeholder = cms_page_title.placeholders.get(slot='right-column')
target_placeholder = cms_page_title.placeholders.get(slot='body')
source_placeholder = cms_page.get_placeholders("en").get(slot='right-column')
target_placeholder = cms_page.get_placeholders("en").get(slot='body')
data = {
'placeholder': source_placeholder,
'plugin_type': 'LinkPlugin',
Expand Down Expand Up @@ -1772,9 +1770,8 @@ def test_global_limit_on_plugin_move(self):
def test_type_limit_on_plugin_move(self):
superuser = self.get_superuser()
cms_page = self.get_page()
cms_page_title = cms_page.get_title_obj()
source_placeholder = cms_page_title.placeholders.get(slot='right-column')
target_placeholder = cms_page_title.placeholders.get(slot='body')
source_placeholder = cms_page.get_placeholders("en").get(slot='right-column')
target_placeholder = cms_page.get_placeholders("en").get(slot='body')
data = {
'placeholder': source_placeholder,
'plugin_type': 'TextPlugin',
Expand Down Expand Up @@ -3046,8 +3043,7 @@ def test_user_can_add_plugin(self):
"""
page = self.get_permissions_test_page()
staff_user = self.get_staff_user_with_no_permissions()
title = page.get_title_obj()
placeholder = title.placeholders.get(slot='body')
placeholder = page.get_placeholders("en").get(slot='body')
plugins = placeholder.get_plugins('en').filter(plugin_type='LinkPlugin')
endpoint = self._get_add_plugin_uri(page)

Expand All @@ -3070,8 +3066,7 @@ def test_user_cant_add_plugin(self):
"""
page = self.get_permissions_test_page()
staff_user = self.get_staff_user_with_no_permissions()
title = page.get_title_obj()
placeholder = title.placeholders.get(slot='body')
placeholder = page.get_placeholders("en").get(slot='body')
plugins = placeholder.get_plugins('en').filter(plugin_type='LinkPlugin')
endpoint = self._get_add_plugin_uri(page)

Expand Down Expand Up @@ -3221,8 +3216,7 @@ def test_user_cant_move_plugin(self):
plugin = self._add_plugin_to_page(page)
endpoint = self.get_move_plugin_uri(plugin)
source_placeholder = plugin.placeholder
title = page.get_title_obj(language='en')
target_placeholder = title.placeholders.get(slot='right-column')
target_placeholder = page.get_placeholders("en").get(slot='right-column')

data = {
'plugin_id': plugin.pk,
Expand Down Expand Up @@ -3393,8 +3387,7 @@ def test_user_can_clear_empty_placeholder(self):
page = self.get_permissions_test_page()

staff_user = self.get_staff_user_with_no_permissions()
title = page.get_title_obj()
placeholder = title.placeholders.get(slot='body')
placeholder = page.get_placeholders("en").get(slot='body')
endpoint = self.get_clear_placeholder_url(placeholder)

self.add_permission(staff_user, 'change_page')
Expand All @@ -3413,8 +3406,7 @@ def test_user_cant_clear_empty_placeholder(self):
page = self.get_permissions_test_page()

staff_user = self.get_staff_user_with_no_permissions()
title = page.get_title_obj()
placeholder = title.placeholders.get(slot='body')
placeholder = page.get_placeholders("en").get(slot='body')
endpoint = self.get_clear_placeholder_url(placeholder)

self.add_permission(staff_user, 'change_page')
Expand Down Expand Up @@ -4544,8 +4536,7 @@ def test_user_can_add_plugin(self):
"""
page = self._permissions_page
staff_user = self.get_staff_user_with_no_permissions()
title = page.get_title_obj()
placeholder = title.placeholders.get(slot='body')
placeholder = page.get_placeholders("en").get(slot='body')
plugins = placeholder.get_plugins('en').filter(plugin_type='LinkPlugin')
endpoint = self._get_add_plugin_uri(page)

Expand All @@ -4572,8 +4563,7 @@ def test_user_cant_add_plugin(self):
"""
page = self._permissions_page
staff_user = self.get_staff_user_with_no_permissions()
page_title = page.get_title_obj()
placeholder = page_title.placeholders.get(slot='body')
placeholder = page.get_placeholders("en").get(slot='body')
plugins = placeholder.get_plugins('en').filter(plugin_type='LinkPlugin')
endpoint = self._get_add_plugin_uri(page)

Expand Down Expand Up @@ -4747,8 +4737,7 @@ def test_user_cant_move_plugin(self):
plugin = self._add_plugin_to_page(page)
endpoint = self.get_move_plugin_uri(plugin)
source_placeholder = plugin.placeholder
title = page.get_title_obj()
target_placeholder = title.placeholders.get(slot='right-column')
target_placeholder = page.get_placeholders("en").get(slot='right-column')

data = {
'plugin_id': plugin.pk,
Expand Down Expand Up @@ -4784,7 +4773,7 @@ def test_user_can_copy_plugin(self):
endpoint = self.get_copy_plugin_uri(plugin)
source_placeholder = plugin.placeholder
title = page.get_title_obj(translation.language)
target_placeholder = title.placeholders.get(slot='right-column')
target_placeholder = page.get_placeholders(translation.language).get(slot='right-column')

data = {
'source_plugin_id': plugin.pk,
Expand Down Expand Up @@ -4826,8 +4815,7 @@ def test_user_cant_copy_plugin(self):
translation = self._add_translation_to_page(page)
endpoint = self.get_copy_plugin_uri(plugin)
source_placeholder = plugin.placeholder
title = page.get_title_obj(translation.language)
target_placeholder = title.placeholders.get(slot='right-column')
target_placeholder = page.get_placeholders(translation.language).get(slot='right-column')

data = {
'source_plugin_id': plugin.pk,
Expand Down Expand Up @@ -4940,8 +4928,7 @@ def test_user_can_clear_empty_placeholder(self):
"""
page = self._permissions_page
staff_user = self.get_staff_user_with_no_permissions()
title = page.get_title_obj()
placeholder = title.placeholders.get(slot='body')
placeholder = page.get_placeholders("en").get(slot='body')
endpoint = self.get_clear_placeholder_url(placeholder)

self.add_permission(staff_user, 'change_page')
Expand All @@ -4959,8 +4946,7 @@ def test_user_cant_clear_empty_placeholder(self):
"""
page = self._permissions_page
staff_user = self.get_staff_user_with_no_permissions()
page_title = page.get_title_obj()
placeholder = page_title.placeholders.get(slot='body')
placeholder = page.get_placeholders("en").get(slot='body')
endpoint = self.get_clear_placeholder_url(placeholder)

self.add_permission(staff_user, 'change_page')
Expand Down
6 changes: 2 additions & 4 deletions cms/tests/test_placeholder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1014,8 +1014,7 @@ def test_repr(self):
class PlaceholderConfTests(TestCase):
def test_get_all_plugins_single_page(self):
page = create_page('page', 'col_two.html', 'en')
title = page.get_title_obj(language='en')
placeholder = title.placeholders.get(slot='col_left')
placeholder = page.get_placeholders('en').get(slot='col_left')
conf = {
'col_two': {
'plugins': ['TextPlugin', 'LinkPlugin'],
Expand All @@ -1033,8 +1032,7 @@ def test_get_all_plugins_single_page(self):
def test_get_all_plugins_inherit(self):
parent = create_page('parent', 'col_two.html', 'en')
page = create_page('page', constants.TEMPLATE_INHERITANCE_MAGIC, 'en', parent=parent)
title = page.get_title_obj(language='en')
placeholder = title.placeholders.get(slot='col_left')
placeholder = page.get_placeholders("en").get(slot='col_left')
conf = {
'col_two': {
'plugins': ['TextPlugin', 'LinkPlugin'],
Expand Down
Loading
0