Merge pull request #225 from SEL-Columbia/staging

0.2.6 Release

docker-compose.yml

@@ -1,5 +1,5 @@
 nginx:
-  image: "nginx:1.9.8"
+  image: "nginx:1.9.9"
   links:
     - "webapp:webapp"
   ports:
@@ -10,7 +10,7 @@ nginx:
     - /etc/letsencrypt:/etc/letsencrypt
     - /tmp:/tmp
 webapp:
-  image: "selcolumbia/dokomoforms:0.2.5"
+  image: "selcolumbia/dokomoforms:0.2.6"
   command: bash -c "./docker-wait-for-postgres.sh db && head -c 24 /dev/urandom > cookie_secret && python webapp.py"
   links:
     - "db:db"

dokomoforms/static/src/survey/js/components/Photo.js

@@ -49,7 +49,8 @@ module.exports = React.createClass({
 
     componentWillUnmount: function() {
         if (this.stream) {
-            this.stream.stop();
+	    // https://github.com/andyet/SimpleWebRTC/issues/363#issuecomment-163178700
+	    this.stream.getTracks().forEach(function (track) { track.stop(); });
         }
     },
 
@@ -60,7 +61,8 @@ module.exports = React.createClass({
     startStream: function() {
         var self = this;
         if (self.stream) {
-            self.stream.stop();
+	    // https://github.com/andyet/SimpleWebRTC/issues/363#issuecomment-163178700
+	    self.stream.getTracks().forEach(function (track) { track.stop(); });
         }
         // Browser implementations
         navigator.getUserMedia = navigator.getUserMedia ||

installer.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env sh
-# Dokomo Forms installer for version 0.2.5
+# Dokomo Forms installer for version 0.2.6
 set -e
 
 # Do you have docker installed?
@@ -105,8 +105,8 @@ $SUDO openssl dhparam -out /etc/letsencrypt/live/$LETSENCRYPT_DIR/dhparam.pem 20
 printf "========================================\n"
 printf " Downloading configuration files        \n"
 printf "========================================\n"
-$CURL -O https://raw.githubusercontent.com/SEL-Columbia/dokomoforms/v0.2.5/docker-compose.yml
-$CURL -O https://raw.githubusercontent.com/SEL-Columbia/dokomoforms/v0.2.5/nginx.conf
+$CURL -O https://raw.githubusercontent.com/SEL-Columbia/dokomoforms/v0.2.6/docker-compose.yml
+$CURL -O https://raw.githubusercontent.com/SEL-Columbia/dokomoforms/v0.2.6/nginx.conf
 
 # Edit the configuration files
 printf "========================================\n"

tests/python/test_selenium.py

@@ -852,9 +852,13 @@ def test_edit_user(self):
         try:
             self.wait_for_element('user-name')
         except TimeoutException:
-            self.click(edit_btn)
+            self.click(self.drv.find_element_by_css_selector(
+                'tr.odd:nth-child(3) > td:nth-child(5) > button:nth-child(1)'
+            ))
+
             self.sleep()
             self.wait_for_element('user-name')
+
         (
             self.drv
             .find_element_by_id('user-name')
@@ -4059,6 +4063,7 @@ def test_add_new_facility(self):
         self.wait_for_element('navigate-right', By.CLASS_NAME)
         self.click(self.drv.find_element_by_class_name('navigate-right'))
         # wait for add button
+        self.sleep()
         self.wait_for_element(
             '.btn-add-facility',
             by=By.CSS_SELECTOR
@@ -4085,6 +4090,7 @@ def test_add_new_facility(self):
         # navigate to end of survey and save
         facility_type = Select(self.drv.find_element_by_tag_name('select'))
         self.select_by_index(facility_type, 1)
+        self.sleep()
         self.click(self.drv.find_element_by_class_name('navigate-right'))
         self.click(self.drv.find_element_by_class_name('navigate-right'))