removed unneeded tests

metacademy · Oct 22, 2015 · 004384c · 004384c
1 parent 6ce22a6
commit 004384c
Show file tree

Hide file tree

Showing 12 changed files with 33 additions and 579 deletions.
diff --git a/README.md b/README.md
@@ -18,7 +18,7 @@ For Windows installation/requirements, please see the README located in [/window
 
 
 ### Preliminary requirements
-* `Python 2.7.X` *Nota bene*: install `python-devel`/`python-dev` if you're using a package manager such as `yum` or `apt-get`. The following command should then print a path. If this command raises an exception, make sure that you have `python-devel`/`-dev` for your installed version of python installed:
+* `Python 2.7.X` *Note*: install `python-devel`/`python-dev` if you're using a package manager such as `yum` or `apt-get`. The following command should then print a path. If this command raises an exception, make sure that you have `python-devel`/`-dev` for your installed version of python installed:
 
         python -c 'from distutils.sysconfig import get_makefile_filename as m; print m()'
 

diff --git a/Tests.sh b/Tests.sh
@@ -7,17 +7,19 @@
 
 # set the env
 source ../meta_venv/bin/activate
-python server/manage.py runserver 8080 --noreload & # `&` sends the process to the background
 
 # run the django tests
 echo "Django Tests"
-#python server/manage.py test
+python server/manage.py test
+
+
+python server/manage.py runserver 8080 --noreload & # `&` sends the process to the background
 
 # run the browser tests
 echo "Browser Tests"
 ./node_modules/mocha-phantomjs/bin/mocha-phantomjs http://127.0.0.1:8080/browser-tests
 
 # run the selenium tests
-python selenium_tests/simple_selenium_tests.py
+# python selenium_tests/simple_selenium_tests.py
 
 kill %1 # kills the first, in this case our app_server background process
diff --git a/requirements.txt b/requirements.txt
@@ -13,11 +13,11 @@ coverage==3.7.1
 django-appconf==1.0.1
 django-compressor==1.5
 django-devserver==0.8.0
--e git+https://github.com/toastdriven/django-haystack.git@a3a2fc3a385ea35e76941482bf18460724b6421c#egg=django_haystack-dev
+django-haystack==2.3.1
 django-lazysignup==0.12.2
 django-reversion==1.8.6
 django-simple-captcha==0.4.5
-django-tastypie==0.12.1
+-e git+https://github.com/django-tastypie/django-tastypie@256ebe1de9a78dfb5d4d6e938b813cf4c5c4ac1b#egg=django_tastypie-master
 html5lib==0.999
 ipdb==0.8
 ipython==3.1.0

diff --git a/selenium_tests/deploy_test.html b/selenium_tests/deploy_test.html