docs: Move integrations.html to integrations/index.html.

Add omiting rule for all of integrations docs in test_templates.
This commit is contained in:
Tomasz Kolek 2017-03-31 07:40:52 +02:00 committed by Tim Abbott
parent 62603940a7
commit 5b17622589
5 changed files with 9 additions and 5 deletions

View File

@ -207,7 +207,7 @@ ZulipMobile/0.5.4 (Android; 4.2; maguro)
Every Zulip integration must be documented in Every Zulip integration must be documented in
`zerver/webhooks/mywebhook/doc.html` (or `zerver/webhooks/mywebhook/doc.html` (or
`templates/zerver/integrations.html`, for non-webhook integrations). `templates/zerver/integrations/<integration_name>.html`, for non-webhook integrations).
Usually, this involves a few steps: Usually, this involves a few steps:
* Add text explaining all of the steps required to setup the * Add text explaining all of the steps required to setup the

View File

@ -115,7 +115,7 @@ def check_html_templates(templates, all_dups):
'templates/zerver/features.html', 'templates/zerver/features.html',
'templates/zerver/hello.html', 'templates/zerver/hello.html',
'templates/zerver/home.html', 'templates/zerver/home.html',
'templates/zerver/integrations.html', 'templates/zerver/integrations/index.html',
'templates/zerver/invite_user.html', 'templates/zerver/invite_user.html',
'templates/zerver/login.html', 'templates/zerver/login.html',
'templates/zerver/markdown_help.html', 'templates/zerver/markdown_help.html',
@ -162,7 +162,7 @@ def check_html_templates(templates, all_dups):
'templates/zerver/help/main.html', 'templates/zerver/help/main.html',
'templates/zerver/home.html', 'templates/zerver/home.html',
'templates/zerver/index.html', 'templates/zerver/index.html',
'templates/zerver/integrations.html', 'templates/zerver/integrations/index.html',
'templates/zerver/keyboard_shortcuts.html', 'templates/zerver/keyboard_shortcuts.html',
'templates/zerver/landing_nav.html', 'templates/zerver/landing_nav.html',
'templates/zerver/left_sidebar.html', 'templates/zerver/left_sidebar.html',

View File

@ -1,6 +1,7 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from __future__ import absolute_import from __future__ import absolute_import
import re
from typing import Any, Dict, Iterable from typing import Any, Dict, Iterable
import logging import logging
@ -111,8 +112,11 @@ class TemplateTestCase(ZulipTestCase):
'zerver/api_content.json', 'zerver/api_content.json',
'zerver/handlebars_compilation_failed.html', 'zerver/handlebars_compilation_failed.html',
] ]
integrations_regexp = re.compile('zerver/integrations/.*.html')
skip = covered + defer + logged_out + logged_in + unusual + ['tests/test_markdown.html', 'zerver/terms.html'] skip = covered + defer + logged_out + logged_in + unusual + ['tests/test_markdown.html', 'zerver/terms.html']
templates = [t for t in get_all_templates() if t not in skip] templates = [t for t in get_all_templates() if not (t in skip or integrations_regexp.match(t))]
self.render_templates(templates, self.get_context()) self.render_templates(templates, self.get_context())
# Test the deferred templates with updated context. # Test the deferred templates with updated context.

View File

@ -99,7 +99,7 @@ def add_integrations_context(context):
class IntegrationView(ApiURLView): class IntegrationView(ApiURLView):
template_name = 'zerver/integrations.html' template_name = 'zerver/integrations/index.html'
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):
# type: (**Any) -> Dict[str, Any] # type: (**Any) -> Dict[str, Any]