Merge pull request #1381 from glogiotatidis/entrypoint-fix

[Issue #1380] Fix JSON key name for button entrypoint.
mozmeao · May 19, 2020 · 7fa4e95 · 7fa4e95
2 parents 356b2a5 + fdecffb
commit 7fa4e95
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/snippets/base/models.py b/snippets/base/models.py
@@ -709,9 +709,9 @@ def _convert_special_buttons(self, data):
                     if args:
                         to_append['button_action_args'] = args
                     if entrypoint_name:
-                        to_append['entrypoint_name'] = entrypoint_name
+                        to_append['button_entrypoint_name'] = entrypoint_name
                     if entrypoint_value:
-                        to_append['entrypoint_value'] = entrypoint_value
+                        to_append['button_entrypoint_value'] = entrypoint_value
 
         for key in to_delete:
             local_data.pop(key)

diff --git a/snippets/base/tests/test_models.py b/snippets/base/tests/test_models.py
@@ -340,10 +340,15 @@ def test_process_rendered_data(self):
         data = {
             'foo': '',
             'bar': 'bar',
+            'button_url': 'special:about:logins'
         }
         expected_data = {
             'bar': 'bar',
             'links': {},
+            'button_action': 'OPEN_ABOUT_PAGE',
+            'button_action_args': 'logins',
+            'button_entrypoint_name': 'entryPoint',
+            'button_entrypoint_value': 'snippet',
         }
         snippet = ASRSnippetFactory()
         with patch('snippets.base.models.util.fluent_link_extractor',