Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
N
nuages
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
etch
nuages
Commits
8e35e542
Commit
8e35e542
authored
Jun 24, 2013
by
Christophe Siraut
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Tests continuation.
parent
de1172bb
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
32 additions
and
57 deletions
+32
-57
.gitignore
.gitignore
+1
-0
meetingpoll/models.py
meetingpoll/models.py
+2
-1
meetingpoll/templates/meetingpoll/poll_detail.html
meetingpoll/templates/meetingpoll/poll_detail.html
+1
-1
meetingpoll/templates/meetingpoll/vote-form.html
meetingpoll/templates/meetingpoll/vote-form.html
+0
-52
nuages/test_functional.py
nuages/test_functional.py
+21
-2
nuages/urls.py
nuages/urls.py
+5
-0
nuages_base/templates/base.html
nuages_base/templates/base.html
+1
-0
registration_templates/templates/registration/login.html
registration_templates/templates/registration/login.html
+1
-1
No files found.
.gitignore
View file @
8e35e542
...
...
@@ -4,5 +4,6 @@
fixtures
staticroot
local_settings.py
local_urls.py
.coverage
htmlcov
meetingpoll/models.py
View file @
8e35e542
...
...
@@ -3,6 +3,7 @@ from django.contrib.sites.models import Site
from
django.core.urlresolvers
import
reverse
from
django.db
import
models
from
django.utils.translation
import
ugettext_lazy
as
_
import
datetime
import
string
import
random
...
...
@@ -21,7 +22,7 @@ class Poll(models.Model):
max_length
=
8
,
default
=
createId
(
5
))
title
=
models
.
CharField
(
_
(
'Title'
),
max_length
=
80
)
pub_date
=
models
.
DateField
(
auto_now_add
=
True
)
pub_date
=
models
.
DateField
(
default
=
datetime
.
datetime
.
now
)
upd_date
=
models
.
DateField
(
auto_now
=
True
)
description
=
models
.
CharField
(
max_length
=
300
)
user
=
models
.
ForeignKey
(
User
,
null
=
True
)
...
...
meetingpoll/templates/meetingpoll/poll_detail.html
View file @
8e35e542
...
...
@@ -53,7 +53,7 @@
</tr>
<tr>
<form
action=
"
/{{ object.id }}/vote/
"
method=
"post"
>
{% csrf_token %}
<form
action=
"
.
"
method=
"post"
>
{% csrf_token %}
<td
class=
'names'
title=
" Fill in your name "
>
<div
class=
"blue"
>
{% trans "Your name:" %}
</div>
{{ form.as_p }}
...
...
meetingpoll/templates/meetingpoll/vote-form.html
deleted
100644 → 0
View file @
de1172bb
{% extends "base.html" %}
{% block title %}Create an meeting{% endblock %}
{% block content %}
<h3>
Sondage: {{object}}
</h3>
<p
class=
"info"
>
{{object.description}}
</p>
<form
method=
"post"
action=
""
>
{% csrf_token %}
<table
id=
"dateChoice"
class=
"form-container"
>
<tbody>
<thead>
<tr>
<th
scope=
"col"
>
Dates
</th>
<th
scope=
"col"
>
Details
</th>
</tr>
</thead>
{% for v in vforms.forms %}
<tr
id=
"{{ v.prefix }}-row"
>
<td>
{% for fld in v.hidden_fields %}{{ fld }}{% endfor %}
{% if v.instance.pk %}{{ v.DELETE }}{% endif %}
{{ v.voter }}
</td>
<td>
{{ v.voice }}
</td>
</tr>
{% endfor %}
</tbody>
</table>
<p>
{{ vforms.management_form }}
<br
/><label
class=
"hide"
>
.
</label>
<input
type=
"submit"
value=
"Save"
/>
</p>
</form>
</tbody>
</table>
{% endblock %}
nuages/test_functional.py
View file @
8e35e542
...
...
@@ -13,7 +13,7 @@ class LoginProcess(WebTest):
login
=
self
.
app
.
get
(
reverse
(
'auth_login'
))
login
.
form
[
'username'
]
=
'username_1'
login
.
form
[
'password'
]
=
'password_1'
response
=
login
.
form
.
submit
(
'Log in'
).
follow
()
response
=
login
.
form
.
submit
().
follow
()
self
.
assertEquals
(
'200 OK'
,
response
.
status
)
self
.
assertContains
(
response
,
'My account'
,
count
=
1
,
status_code
=
200
)
...
...
@@ -22,7 +22,7 @@ class LoginProcess(WebTest):
login
=
self
.
app
.
get
(
reverse
(
'auth_login'
))
login
.
form
[
'username'
]
=
'foo'
login
.
form
[
'password'
]
=
'bar'
response
=
login
.
form
.
submit
(
'Log in'
)
response
=
login
.
form
.
submit
()
self
.
assertContains
(
response
,
'Please enter a correct username and password.'
,
...
...
@@ -53,3 +53,22 @@ class MeetingPoll(WebTest):
def
test_404
(
self
):
response
=
self
.
app
.
get
(
'/%s/'
%
createId
(
5
),
status
=
404
)
self
.
assertEqual
(
response
.
status_code
,
404
)
def
test_creation
(
self
):
new
=
self
.
app
.
get
(
reverse
(
'new'
))
form
=
new
.
forms
[
0
]
form
[
'title'
]
=
'fake title'
form
[
'description'
]
=
'fake description'
edition
=
form
.
submit
().
follow
()
self
.
assertContains
(
edition
,
'Manage choices'
,
count
=
1
,
status_code
=
200
)
form
=
edition
.
forms
[
0
]
form
[
'choice_set-0-choice'
]
=
'06-06-2013 17:00'
form
[
'choice_set-0-details'
]
=
'fake detail'
votepage
=
form
.
submit
().
follow
()
form
=
votepage
.
forms
[
0
]
form
[
'2013-06-06 17:00:00-voice'
]
=
1
form
[
'2013-06-06 17:00:00-comment'
]
=
"jaw-dropping comment"
votepageagain
=
form
.
submit
()
self
.
assertContains
(
votepageagain
,
'jaw-dropping comment'
,
count
=
1
,
status_code
=
200
)
nuages/urls.py
View file @
8e35e542
...
...
@@ -17,3 +17,8 @@ urlpatterns = patterns('',
urlpatterns
+=
i18n_patterns
(
''
,
url
(
r'^'
,
include
(
'nuages_base.urls_translated'
)),
)
try
:
from
local_urls
import
*
except
ImportError
,
e
:
pass
nuages_base/templates/base.html
View file @
8e35e542
...
...
@@ -40,6 +40,7 @@
<div
id=
"content"
>
{% block content %}{% endblock %}
{% block main %}{% endblock %}
</div>
<div
class=
"menu"
>
...
...
registration_templates/templates/registration/login.html
View file @
8e35e542
...
...
@@ -7,7 +7,7 @@
{% csrf_token %}
{{ form.as_p }}
<input
type=
"submit"
value=
"{% trans 'Log in' %}"
name=
"Log in"
/>
<input
type=
"submit"
value=
"{% trans 'Log in' %}"
/>
<input
type=
"hidden"
name=
"next"
value=
"{{ next }}"
/>
</form>
<br
/>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment