Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Update tox.ini, drop Django 1.3 support, update for 1.6 alpha.
  • Loading branch information
carljm committed Jun 6, 2013
1 parent 06e5450 commit 1286632
Show file tree
Hide file tree
Showing 7 changed files with 48 additions and 32 deletions.
4 changes: 2 additions & 2 deletions CHANGES.rst
Expand Up @@ -4,6 +4,8 @@ CHANGES
tip (unreleased)
----------------

- BACKWARDS-INCOMPATIBLE: Django versions prior to 1.4 are no longer tested or supported.

- Updated to most recent sorl-thumbnail. Thanks Svyatoslav Bulbakha.

- Added Russian translation. Thanks Svyatoslav Bulbakha.
Expand All @@ -13,8 +15,6 @@ tip (unreleased)
- Updated to use Django 1.3's class-based views. Fixes #10. Thanks Andrés
Reyes Monge and Ales Zabala Alava.

- Django versions prior to 1.3 are no longer tested or supported.


0.5.1 (2011.03.22)
------------------
Expand Down
2 changes: 1 addition & 1 deletion README.rst
Expand Up @@ -31,7 +31,7 @@ or get the in-development version::
Dependencies
------------

``django-adminfiles`` requires `Django`_ 1.3 or later,
``django-adminfiles`` requires `Django`_ 1.4 or later,
`sorl-thumbnail`_ 11.12 (not compatible with old 3.x series)
and the `Python Imaging Library`_.

Expand Down
2 changes: 1 addition & 1 deletion adminfiles/urls.py
@@ -1,4 +1,4 @@
from django.conf.urls.defaults import *
from django.conf.urls import patterns, url

from django.contrib.admin.views.decorators import staff_member_required

Expand Down
2 changes: 2 additions & 0 deletions tests/test_settings.py
Expand Up @@ -25,3 +25,5 @@
ROOT_URLCONF = 'tests.urls'

TEMPLATE_DIRS = (join(TEST_ROOT, 'templates'),)

SECRET_KEY = 'not empty'
42 changes: 21 additions & 21 deletions tests/tests.py
Expand Up @@ -47,13 +47,13 @@ def setUp(self):
self.admin.is_active = True
self.admin.save()
self.assertTrue(self.client.login(username='admin', password='testpw'))

def tearDown(self):
admin.site.unregister(Post)

def test_picker_class_applied(self):
response = self.client.get('/admin/tests/post/add/')
self.assertContains(response, 'name="content" class="vLargeTextField adminfilespicker"')
self.assertContains(response, 'class="vLargeTextField adminfilespicker"')

def test_picker_loads(self):
"""
Expand All @@ -71,38 +71,38 @@ def test_browser_links(self):
"""
response = self.client.get('/adminfiles/all/?field=test')
self.assertContains(response, 'href="/adminfiles/images/?field=test')

def test_images_picker_loads(self):
response = self.client.get('/adminfiles/images/?field=test')
self.assertContains(response, 'href="/media/adminfiles/tiny.png"')
self.assertNotContains(response, 'href="/media/adminfiles/somefile.txt')

def test_files_picker_loads(self):
response = self.client.get('/adminfiles/files/?field=test')
self.assertNotContains(response, 'href="/media/adminfiles/tiny.png"')
self.assertContains(response, 'href="/media/adminfiles/somefile.txt')

def test_custom_links(self):
_old_links = settings.ADMINFILES_INSERT_LINKS.copy()
settings.ADMINFILES_INSERT_LINKS['text/plain'] = [('Crazy insert', {'yo': 'thing'})]

response = self.client.get('/adminfiles/all/?field=test')
self.assertContains(response, 'rel="some-file:yo=thing"')

settings.ADMINFILES_INSERT_LINKS = _old_links

def test_thumb_order(self):
_old_order = settings.ADMINFILES_THUMB_ORDER
settings.ADMINFILES_THUMB_ORDER = ('title',)

response = self.client.get('/adminfiles/all/?field=test')
image_index = response.content.find('tiny.png')
file_index = response.content.find('somefile.txt')
self.assertTrue(image_index > 0)
self.assertTrue(image_index < file_index)

settings.ADMINFILES_THUMB_ORDER = _old_order

class SignalTests(FileUploadTestCase):
"""
Test tracking of uploaded file references, and auto-resave of
Expand Down Expand Up @@ -155,14 +155,14 @@ def test_update_reference(self):
def _render_on_save(sender, instance, **kwargs):
instance.content = render_uploads(instance.content)
pre_save.connect(_render_on_save, sender=Post)

self.somefile.title = 'A New Title'
self.somefile.save()

reloaded_post = Post.objects.get(title='Some title')

self.assertTrue('A New Title' in reloaded_post.content)

class TemplateTestCase(TestCase):
"""
A TestCase that stores information about rendered templates, much
Expand All @@ -173,7 +173,7 @@ def store_rendered_template(self, signal, sender, template, context,
**kwargs):
self.templates.append(template)
self.contexts.append(context)

def setUp(self):
self.templates = []
self.contexts = ContextList()
Expand All @@ -190,7 +190,7 @@ class RenderTests(TemplateTestCase, FileUploadTestCase):
def setUp(self):
super(RenderTests, self).setUp()
self.populate()

def test_render_template_used(self):
render_uploads('<<<some-file>>>')
self.assertEquals(self.templates[0].name,
Expand All @@ -209,11 +209,11 @@ def test_render_subtype_template_used(self):
def test_render_whitespace(self):
render_uploads('<<< some-file \n>>>')
self.assertEquals(len(self.templates), 1)

def test_render_amidst_content(self):
render_uploads('Some test here<<< some-file \n>>>and more here')
self.assertEquals(len(self.templates), 1)

def test_render_upload_in_context(self):
render_uploads('<<<some-file>>>')
self.assertEquals(self.contexts['upload'].upload.name,
Expand Down Expand Up @@ -266,7 +266,7 @@ def test_default_template_renders_image_title_as_alt(self):
def test_default_template_renders_link(self):
html = render_uploads('<<<some-file>>>')
self.assertTrue('<a href="/media/adminfiles/somefile.txt"' in html)

def test_default_template_renders_link_class(self):
html = render_uploads(u'<<<some-file:class=other classes>>>')
self.assertTrue('class="other classes"' in html)
Expand Down Expand Up @@ -309,7 +309,7 @@ def test_render_uploads_template_filter_alt_template(self):
'post': Post(title=u'a post',
content=u'<<<some-file>>>')}))
self.assertEquals(self.templates[1].name, 'alt/default.html')

def test_render_upload_template_filter(self):
tpl = template.Template(u'{% load adminfiles_tags %}'
u'{{ img|render_upload }}')
Expand All @@ -330,12 +330,12 @@ def test_render_upload_template_filter_alt_template(self):
u'{{ f|render_upload:"template_path=alt" }}')
html = tpl.render(template.Context({'f': self.somefile}))
self.assertEquals(self.templates[1].name, 'alt/default.html')

def test_render_upload_template_filter_alt_template_options(self):
tpl = template.Template(
u'{% load adminfiles_tags %}'
u'{{ f|render_upload:"template_path=alt:class=yo" }}')
html = tpl.render(template.Context({'f': self.somefile}))
self.assertEquals(self.templates[1].name, 'alt/default.html')
self.assertTrue('class="yo"' in html)

2 changes: 1 addition & 1 deletion tests/urls.py
@@ -1,4 +1,4 @@
from django.conf.urls.defaults import *
from django.conf.urls import patterns, url, include

from django.contrib import admin

Expand Down
26 changes: 20 additions & 6 deletions tox.ini
@@ -1,29 +1,43 @@
[tox]
envlist=py25,py25-trunk,py26,py26-trunk,py27,py27-trunk
envlist=py25-1.4,py26-1.4,py26-trunk,py27-1.4,py27,py27-trunk

[testenv]
deps=
django==1.3.1
Django==1.5.1
sorl-thumbnail==11.12
PIL==1.1.7
commands=python setup.py test

[testenv:py25-trunk]
[testenv:py25-1.4]
basepython=python2.5
deps=
https://github.com/django/django/tarball/master
Django==1.4.5
sorl-thumbnail==11.12
PIL==1.1.7

[testenv:py26-1.4]
basepython=python2.6
deps=
Django==1.4.5
sorl-thumbnail==11.12
PIL==1.1.7

[testenv:py26-trunk]
basepython=python2.5
basepython=python2.6
deps=
https://github.com/django/django/tarball/master
sorl-thumbnail==11.12
PIL==1.1.7

[testenv:py27-1.4]
basepython=python2.7
deps=
Django==1.4.5
sorl-thumbnail==11.12
PIL==1.1.7

[testenv:py27-trunk]
basepython=python2.5
basepython=python2.7
deps=
https://github.com/django/django/tarball/master
sorl-thumbnail==11.12
Expand Down

0 comments on commit 1286632

Please sign in to comment.