Skip to content

Commit

Permalink
Fix tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@kmmbvnr
kmmbvnr committed Jun 30, 2014
1 parent 390cc29 commit ab034b6
Show file tree
Hide file tree
Showing 10 changed files with 303 additions and 105 deletions.
115 changes: 35 additions & 80 deletions tests/unit/templates/unit/form.html
View file
Original file line number Diff line number Diff line change
@@ -1,80 +1,35 @@
{% load static %}{% load viewflow %}
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>Form Sample Template</title>

<link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css">
<link href="{% static 'viewflow/css/font-awesome.css' %}" rel="stylesheet" type="text/css" />
<link href="{% static 'viewflow/css/chosen/chosen.css' %}" rel="stylesheet" type="text/css" />
<link href="{% static 'viewflow/css/AdminLTE.css' %}" rel="stylesheet" type="text/css" />
<link rel="stylesheet" href="{% static 'viewflow/css/viewflow.css' %}">
</head>
<body>
<div class="container">
<div class="page-header">
<h1>Form example</h1>
</div>
<div class="nav-tabs-custom">
<ul class="nav nav-tabs" role="tablist">
<li class="active">
<a href="#viewflow_tab" data-toggle="tab">Viewflow</a>
</li>
<li>
<a href="#standard_tab" data-toggle="tab">Standard django</a>
</li>
</ul>
<div class="tab-content">
<div class="tab-pane active" id="viewflow_tab">
<form method="POST" enctype="multipart/form-data">
{% viewform 'unit/form_layout.html' %}
{# Add pencil icon on text_input field #}
{% viewpart field_group_class_add 'text_input' %}has-feedback{% endviewpart %}
{% viewpart field_icon 'text_input' %}<span class="glyphicon glyphicon glyphicon-pencil form-control-feedback"></span>{% endviewpart %}
{% endviewform %}
</form>
</div>
<div class="tab-pane" id="standard_tab">
<form method="POST" enctype="multipart/form-data">
<table>
{{ form.as_table }}
</table>
</form>
</div>
</div>
</div>
</div>

<!-- jQuery 2.0.2 -->
<script src="http://ajax.googleapis.com/ajax/libs/jquery/2.0.2/jquery.min.js"></script>

<!-- Bootstrap -->
<script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>

<!-- InputMask -->
<script src="{% static 'viewflow/js/input-mask/jquery.inputmask.js' %}" type="text/javascript"></script>
<script src="{% static 'viewflow/js/input-mask/jquery.inputmask.date.extensions.js' %}" type="text/javascript"></script>
<script src="{% static 'viewflow/js/input-mask/jquery.inputmask.extensions.js' %}" type="text/javascript"></script>

<!--ICheck -->
<script src="{% static 'viewflow/js/iCheck/icheck.js' %}" type="text/javascript"></script>

<!-- Choosen -->
<script src="{% static 'viewflow/js/chosen/chosen.jquery.js' %}" type="text/javascript"></script>


<!-- Theme AdminLte -->
<script src="{% static 'viewflow/js/AdminLte.js' %}" type="text/javascript"></script>

<script type="text/javascript">
$(function() {
$("[data-mask]").inputmask();
$(".chosen").chosen();
});
</script>
</body>
</html>

{% extends 'viewflow/base_site.html' %}
{% load viewflow %}
{% block content %}
<div class="page-header">
<h1>Form example</h1>
</div>
<div class="nav-tabs-custom">
<ul class="nav nav-tabs" role="tablist">
<li class="active">
<a href="#viewflow_tab" data-toggle="tab">Viewflow</a>
</li>
<li>
<a href="#standard_tab" data-toggle="tab">Standard django</a>
</li>
</ul>
<div class="tab-content">
<div class="tab-pane active" id="viewflow_tab">
<form method="POST" enctype="multipart/form-data">
{% viewform 'viewflow/form/layout.html' %}
{# Add pencil icon on text_input field #}
{% viewpart field_group_class_add 'text_input' %}has-feedback{% endviewpart %}
{% viewpart field_icon 'text_input' %}<span class="glyphicon glyphicon glyphicon-pencil form-control-feedback"></span>{% endviewpart %}
{% endviewform %}
</form>
</div>
<div class="tab-pane" id="standard_tab">
<form method="POST" enctype="multipart/form-data">
<table>
{{ form.as_table }}
</table>
</form>
</div>
</div>
</div>
{% endblock content %}
12 changes: 0 additions & 12 deletions tests/unit/templates/unit/form_layout.html
View file

This file was deleted.

11 changes: 4 additions & 7 deletions tests/unit/tests/test_render_tags.py
View file
Original file line number Diff line number Diff line change
@@ -1,22 +1,19 @@
from django.template import Template, Context
from django.test import TestCase
from unit.forms import AllElementsForm


class TestRenderTag(TestCase):
DEFAULT_RENDER_TEMPLATE = """
{% load viewflow %}
{% viewform 'unit/test_render_form.html' %}
{% viewpart field 'username' %}
{% viewform 'viewflow/form/layout.html' %}
{% viewpart field 'text_input' %}
REDEFINED
{% endviewpart %}
{% endviewform %}
"""

def test_render_form_succeed(self):
"""
"""
template = Template(TestRenderTag.DEFAULT_RENDER_TEMPLATE)
result = template.render(Context({'var': 'varvalue'}))
result = template.render(Context({'form': AllElementsForm()}))
self.assertIn('REDEFINED', result)
1 change: 1 addition & 0 deletions update_theme.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ mkdir -p viewflow/static/viewflow/fonts
cp -v submodules/theme/css/font-awesome.css viewflow/static/viewflow/css
cp -v submodules/theme/fonts/FontAwesome.otf viewflow/static/viewflow/fonts
cp -v submodules/theme/fonts/fontawesome-* viewflow/static/viewflow/fonts
cp -v submodules/theme/fonts/glyphicons-halflings-regular.* viewflow/static/viewflow/fonts

# admin lte
cp -v submodules/theme/css/AdminLTE.css viewflow/static/viewflow/css
Expand Down
Binary file added viewflow/static/viewflow/fonts/glyphicons-halflings-regular.eot
View file
Binary file not shown.
Loading

0 comments on commit ab034b6

Please sign in to comment.