Merge branch 'develop' of github.com:bsgreenb/Wordout into initial_re…

…factoring
bsgreenb · Jan 30, 2012 · 7e05c3a · 7e05c3a
2 parents fa2ffab + 112d59c
commit 7e05c3a
Show file tree

Hide file tree

Showing 7 changed files with 273 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,7 @@
 
 .DS_Store*
 
+wordoutdb
 *.log
 *.pot
 *.pyc

diff --git a/test_display_sharers.py b/test_display_sharers.py
@@ -0,0 +1,8 @@
+from wordout.models import *
+from django.db import connection
+
+def test_shit():
+    customer = Customer.objects.get(pk=1)
+    result = customer.display_sharers(order_by='action_count',action_type_id=1)
+    print len(connection.queries)
+    return result
diff --git a/tests.py b/tests.py
@@ -1,8 +0,0 @@
-from wordout.models import *
-from django.db import connection
-
-def test_shit():
-    customer = Customer.objects.get(pk=1)
-    result = customer.display_sharers(order_by='action_count',action_type_id=1)
-    print len(connection.queries)
-    return result

diff --git a/wordout/fixtures/test_datasource.json b/wordout/fixtures/test_datasource.json
diff --git a/wordout/migrations/0001_initial.pyc b/wordout/migrations/0001_initial.pyc
diff --git a/wordout/migrations/0002_initial.py b/wordout/migrations/0002_initial.py
diff --git a/wordout/migrations/__init__.pyc b/wordout/migrations/__init__.pyc
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,7 @@ @@
     .DS_Store*
+    wordoutdb
     *.log
     *.pot
     *.pyc
@@ Expand Down @@