-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
d1ffuz0r
committed
Dec 10, 2011
1 parent
bae1e63
commit 098e4dd
Showing
16 changed files
with
580 additions
and
348 deletions.
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,3 @@ | ||
| *.pyc | ||
| lulz.db | ||
| public/media/backgrounds/*.* |
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 |
|---|---|---|
| @@ -1,24 +1,31 @@ | ||
| from django.contrib import admin | ||
| from django.contrib.auth.models import Group | ||
| from models import Category, Comments, Job, Likes | ||
| from models import Category, Comments, Job, Likes, Image | ||
|
|
||
|
|
||
| class AdminImages(admin.ModelAdmin): | ||
| list_display = ("name", "image",) | ||
|
|
||
|
|
||
| class AdminJobs(admin.ModelAdmin): | ||
| list_display = ("name", "date", "published") | ||
| list_display = ("name", "category", "published", "date") | ||
|
|
||
|
|
||
| class AdminCategory(admin.ModelAdmin): | ||
| list_display = ("name",) | ||
|
|
||
|
|
||
| class AdminComments(admin.ModelAdmin): | ||
| list_display = ("text", "job") | ||
| list_display = ("text", "job", "ip", "agent") | ||
|
|
||
|
|
||
| class AdminLikes(admin.ModelAdmin): | ||
| list_display = ("ip", "type") | ||
|
|
||
|
|
||
| admin.site.register(Image, AdminImages) | ||
| admin.site.register(Category, AdminCategory) | ||
| admin.site.register(Comments, AdminComments) | ||
| admin.site.register(Job, AdminJobs) | ||
| admin.site.register(Likes, AdminLikes) | ||
| admin.site.unregister(Group) | ||
| admin.site.unregister(Group) |
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
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
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 |
|---|---|---|
| @@ -1,45 +1,127 @@ | ||
| # -*- coding: utf-8 -*- | ||
| from django.test import TestCase | ||
| from unittest import skip | ||
| from django.test.client import Client | ||
| from lulz.models import Image | ||
| from models import Job, Category, Comments, Likes | ||
|
|
||
|
|
||
| class ViewsTests(TestCase): | ||
| def setUp(self): | ||
| self.category = Category.objects.create(name="php") | ||
| self.client = Client() | ||
|
|
||
| def test_home(self): | ||
| request = self.client.get('/') | ||
| self.assertContains(request, text='Нет работ') | ||
| request = self.client.get("/") | ||
| self.assertContains(request, text="ДЖОПЛУЛЗ") | ||
|
|
||
| def test_admin(self): | ||
| request = self.client.get('/admin/') | ||
| self.assertContains(request, text='Django') | ||
| request = self.client.get("/admin/") | ||
| self.assertContains(request, text="Django") | ||
|
|
||
| def test_full_vacancy_get_fail(self): | ||
| request = self.client.get("/ajax/full/") | ||
| self.assertEqual(request.content, '{"success": false}') | ||
|
|
||
| def test_full_vacancy_ajax_true(self): | ||
| self.image = Image.objects.create(name="phpp", | ||
| image="img/php.png") | ||
|
|
||
| category = Category.objects.create(name="php") | ||
| category.image.add(self.image) | ||
| self.job = Job.objects.create(name="test", | ||
| desc="description", | ||
| category=category, | ||
| published=True) | ||
| self.comment = Comments.objects.create(text="lol", | ||
| job=self.job) | ||
| request = self.client.post("/ajax/full/", data={ | ||
| "id": self.job.id | ||
| }) | ||
| self.assertContains(request, "vacancy") | ||
|
|
||
| def test_create_comment_get_false(self): | ||
| request = self.client.get("/ajax/addcomment/") | ||
| self.assertEqual(request.content, '{"success": false}') | ||
|
|
||
| @skip("working") | ||
| def test_create_comment_ajax_true(self): | ||
| self.image = Image.objects.create(name="phpp", | ||
| image="img/php.png") | ||
| category = Category.objects.create(name="php", image=[1]) | ||
| Job.objects.create(name="test", | ||
| desc="description", | ||
| category=category) | ||
| print self.job.id | ||
| request = self.client.post("/ajax/addcomment/", data={ | ||
| "text": "test", | ||
| "job": 1 | ||
| }) | ||
| self.assertEqual(request.content, '{"success": true}') | ||
|
|
||
| def test_create_comment_ajax_false(self): | ||
| request = self.client.post("/ajax/addcomment/", data={ | ||
| "text": "test" | ||
| }) | ||
| self.assertEqual(request.content, '{"success": false}') | ||
|
|
||
| def test_create_vacancy_get_false(self): | ||
| request = self.client.get("/ajax/addvacancy/") | ||
| self.assertEqual(request.content, '{"success": false}') | ||
|
|
||
| def test_create_vacancy_ajax_true(self): | ||
| request = self.client.post("/ajax/addvacancy/", data={ | ||
| "name": "test", | ||
| "desc": "testdesc", | ||
| "tags": "test, test1, test2", | ||
| "category": 1, | ||
| "link": "http://google.com" | ||
| }) | ||
| self.assertEqual(request.content, '{"success": true}') | ||
|
|
||
| def test_create_vacancy_ajax_false(self): | ||
| request = self.client.post("/ajax/addvacancy/", data={ | ||
| "name": "test", | ||
| "desc": "testdesc", | ||
| "tags": "test, test1, test2", | ||
| "category": 1, | ||
| }) | ||
| self.assertEqual(request.content, '{"success": false}') | ||
|
|
||
|
|
||
| class ModelsTest(TestCase): | ||
| def setUp(self): | ||
| self.category = Category.objects.create(name="php", | ||
| image="php.png") | ||
| self.image = Image.objects.create(name="phpp", | ||
| image="img/php.png") | ||
|
|
||
| self.category = Category.objects.create(name="php") | ||
|
|
||
| self.job = Job.objects.create(name="test", | ||
| desc="description", | ||
| category=self.category) | ||
|
|
||
| self.comment = Comments.objects.create(text="lol", | ||
| job=self.job) | ||
| job=self.job) | ||
|
|
||
| self.like = Likes.objects.create(job=self.job, | ||
| type="1") | ||
|
|
||
| def test_job(self): | ||
| job = Job.objects.filter(name="test").get() | ||
| self.assertEqual(job.__unicode__(), 'test') | ||
| self.assertEqual(job.__unicode__(), "test") | ||
|
|
||
| def test_category(self): | ||
| cat = Category.objects.filter(name="php").get() | ||
| self.assertEqual(cat.__unicode__(), 'php') | ||
| self.assertEqual(cat.__unicode__(), "php") | ||
|
|
||
| def test_comment(self): | ||
| comm = Comments.objects.filter(text="lol").get() | ||
| self.assertEqual(comm.__unicode__(), 'lol/test') | ||
| self.assertEqual(comm.__unicode__(), "lol/test") | ||
|
|
||
| def test_like(self): | ||
| like = Likes.objects.filter(job=self.job).get() | ||
| self.assertEqual(like.__unicode__(), 'test/True') | ||
| self.assertEqual(like.__unicode__(), "test/True") | ||
|
|
||
| def test_image(self): | ||
| image = Image.objects.filter(name="phpp").get() | ||
| self.assertEqual(image.__unicode__(), "phpp") |
Oops, something went wrong.