v0.2.2 Fix migrations and tests.

Author: onrik

webshell/__init__.py

@@ -1,4 +1,4 @@
-VERSION = (0, 2, 1)
+VERSION = (0, 2, 2)
 
 
 def get_version():

webshell/migrations/0001_initial.py

@@ -14,11 +14,12 @@ class Migration(migrations.Migration):
             name='Script',
             fields=[
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('name', models.CharField(max_length=100)),
-                ('source', models.TextField()),
+                ('name', models.CharField(max_length=100, verbose_name='Name')),
+                ('source', models.TextField(verbose_name='Source')),
             ],
             options={
+                'verbose_name': 'Script',
+                'verbose_name_plural': 'Scripts',
             },
-            bases=(models.Model,),
         ),
     ]

webshell/tests.py

@@ -2,17 +2,26 @@
 from django.test import TestCase
 from django.conf import settings
 from django.core.urlresolvers import reverse
-from django.contrib.auth.models import User
+from django.contrib.auth import get_user_model
+
+from webshell.models import Script
+
+User = get_user_model()
 
 
 class WebshellTestCase(TestCase):
     def setUp(self):
-        self.user = User.objects.create(username='user')
+        self.user = User.objects.create(
+            username='user', is_staff=True, is_superuser=True)
         self.user.set_password('123456')
         self.user.save()
         self.url = reverse('execute-script')
         self.login_url = '%s?next=%s' % (settings.LOGIN_URL, self.url)
 
+    def login(self):
+        self.assertTrue(self.client.login(
+            username=self.user.username, password='123456'))
+
     def test_wrong_method(self):
         response = self.client.get(self.url)
         self.assertEqual(response.status_code, 405)
@@ -22,16 +31,30 @@ def test_login_required(self):
         self.assertRedirects(response, self.login_url, 302, 404)
 
     def test_superuser_required(self):
-        self.assertTrue(
-            self.client.login(username=self.user.username, password='123456'))
+        self.user.is_superuser = False
+        self.user.save()
+        self.login()
         response = self.client.post(self.url)
         self.assertRedirects(response, self.login_url, 302, 404)
 
     def test_success(self):
-        self.user.is_superuser = True
-        self.user.save()
+        self.login()
 
-        self.assertTrue(
-            self.client.login(username=self.user.username, password='123456'))
         response = self.client.post(self.url, data={'source': 'print(1)'})
+        self.assertEqual(response.status_code, 200)
         self.assertEqual(response.content, b'1\n')
+
+    def test_admin(self):
+        self.login()
+
+        script = Script.objects.create(name='Test')
+
+        urls = (
+            reverse('admin:webshell_script_add'),
+            reverse('admin:webshell_script_change', args=[script.id]),
+            reverse('admin:webshell_script_changelist'),
+        )
+
+        for url in urls:
+            response = self.client.get(url)
+            self.assertEqual(response.status_code, 200)