Merge pull request #325 from nottinghamtec/travis-fix

Bump chrome and chromedriver, update recaptcha keys, add --no-sandbox to chrome

.travis.yml

@@ -4,10 +4,10 @@ python:
 cache: pip
 
 addons:
-  chrome: beta
+  chrome: stable
 
 install:
-  - wget http://chromedriver.storage.googleapis.com/2.32/chromedriver_linux64.zip
+  - wget https://chromedriver.storage.googleapis.com/2.36/chromedriver_linux64.zip
   - unzip chromedriver_linux64.zip
   - export PATH=$PATH:$(pwd)
   - chmod +x chromedriver

PyRIGS/settings.py

@@ -162,8 +162,8 @@ LOGOUT_URL = '/user/logout/'
 ACCOUNT_ACTIVATION_DAYS = 7
 
 # reCAPTCHA settings
-RECAPTCHA_PUBLIC_KEY = os.environ.get('RECAPTCHA_PUBLIC_KEY', None)
-RECAPTCHA_PRIVATE_KEY = os.environ.get('RECAPTCHA_PRIVATE_KEY', None)
+RECAPTCHA_PUBLIC_KEY = os.environ.get('RECAPTCHA_PUBLIC_KEY', "6LeIxAcTAAAAAJcZVRqyHh71UMIEGNQ_MXjiZKhI")  # If not set, use development key
+RECAPTCHA_PRIVATE_KEY = os.environ.get('RECAPTCHA_PRIVATE_KEY', "6LeIxAcTAAAAAGG-vFI1TnRWxMZNFuojJ4WifJWe")  # If not set, use development key
 NOCAPTCHA = True
 
 # Email

RIGS/test_functional.py

@@ -32,6 +32,7 @@ def create_browser():
     options.add_argument("--window-size=1920,1080")
     if os.environ.get('CI', False):
         options.add_argument("--headless")
+        options.add_argument("--no-sandbox")
     driver = webdriver.Chrome(chrome_options=options)
     return driver
 

requirements.txt

@@ -24,7 +24,7 @@ python-dateutil==2.6.1
 pytz==2017.3
 raven==6.3.0
 reportlab==3.4.0
-selenium==3.7.0
+selenium==3.11.0
 simplejson==3.13.2
 six==1.11.0
 sqlparse==0.2.4