Update test environment.

.gitignore

@@ -42,6 +42,7 @@ htmlcov/
 .cache
 nosetests.xml
 coverage.xml
+tests.integration.*
 
 # Translations
 *.mo

.travis.yml

@@ -5,8 +5,15 @@ before_install:
     - "export DISPLAY=:99"
     - "sh -e /etc/init.d/xvfb start"
 install:
-    - "sh install_test_deps.sh"
-    - "python setup.py develop"
+    - "pip install -e git://github.com/edx/xblock-sdk.git#egg=xblock-sdk"
+    - "cd $VIRTUAL_ENV/src/xblock-sdk/"
+    - "pip install -r $VIRTUAL_ENV/src/xblock-sdk/requirements/base.txt"
+    - "pip install -r $VIRTUAL_ENV/src/xblock-sdk/requirements/test.txt"
+    - "cd -"
+    - "pip install -r requirements.txt"
+    - "mkdir var"
 script: pep8 poll --max-line-length=120 && pylint poll && python run_tests.py --with-coverage --cover-package=poll
 notifications:
   email: false
+addons:
+  firefox: "36.0"
\ No newline at end of file

install_test_deps.sh

-# Installs xblock-sdk and dependencies needed to run the tests suite.
-# Run this script inside a fresh virtual environment.
-pip install -e git://github.com/edx/xblock-sdk.git#egg=xblock-sdk
-pip install -r $VIRTUAL_ENV/src/xblock-sdk/requirements.txt
-pip install -r $VIRTUAL_ENV/src/xblock-sdk/test-requirements.txt
-python setup.py develop

requirements.txt

--e .
 markdown
--e git+https://github.com/edx-solutions/xblock-utils.git#egg=xblock-utils
+-e git://github.com/edx/xblock-utils.git#egg=xblock-utils
 -e git://github.com/nosedjango/nosedjango.git@ed7d7f9aa969252ff799ec159f828eaa8c1cbc5a#egg=nosedjango-dev
 ddt
 mock
+selenium==2.47.3  # 2.48 is not working atm
+-e .
\ No newline at end of file