-
Notifications
You must be signed in to change notification settings - Fork 16
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.
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
ability to define and load HTML fixtures in the suite.json file #3
Open
peterbe
wants to merge
1
commit into
codysoyland:master
Choose a base branch
from
peterbe:html-fixtures
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -18,6 +18,7 @@ def get_suite_context(request, path): | |
suite['name'] = ''.join(pieces[-2]) | ||
|
||
# defaults | ||
suite['html_fixtures'] = [] | ||
suite['extra_urls'] = [] | ||
suite['extra_media_urls'] = [] | ||
|
||
|
@@ -29,13 +30,28 @@ def get_suite_context(request, path): | |
|
||
previous_directory = parent_directory(path) | ||
|
||
return { | ||
'files': [path + file for file in files if file.endswith('js')], | ||
'previous_directory': previous_directory, | ||
'in_subdirectory': True and (previous_directory is not None) or False, | ||
'subsuites': directories, | ||
'suite': suite, | ||
} | ||
from django.template.loader import get_template | ||
from django.template import Context | ||
|
||
orig_template_dirs = settings.TEMPLATE_DIRS | ||
settings.TEMPLATE_DIRS += (full_path,) | ||
try: | ||
base_context = {} | ||
for i, template_name in enumerate(suite['html_fixtures']): | ||
t = get_template(template_name) | ||
context = Context(dict(base_context, template_name=template_name)) | ||
suite['html_fixtures'][i] = t.render(context) | ||
|
||
return { | ||
'files': [path + file for file in files if file.endswith('js')], | ||
'previous_directory': previous_directory, | ||
'in_subdirectory': True and (previous_directory is not None) or False, | ||
'subsuites': directories, | ||
'suite': suite, | ||
} | ||
finally: | ||
settings.TEMPLATE_DIRS = orig_template_dirs | ||
|
||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. In case your template foo fails, this doesn't return anything, but resets your template dirs? Is not returning anything really what you want? |
||
|
||
def run_tests(request, path): | ||
suite_context = get_suite_context(request, path) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
<div id="example-stub"> | ||
<!-- just an example for inspiration --> | ||
</div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I guess when in Rome, do as the romans do, not as your editor ;-) The indention should match the rest of the file.