Merge pull request #438 from stevepiercy/2.0-branch

Begin fixing functional tests for Deform 2.0-branch

.travis.yml

@@ -1,9 +1,8 @@
 # Wire up travis
 language: python
-sudo: false
 
 addons:
-  firefox: "43.0"
+  firefox: latest
 
 services:
   - xvfb
@@ -45,24 +44,18 @@ matrix:
 
 install:
   - travis_retry pip install tox
-
-# For Selenium
-# https://docs.travis-ci.com/user/gui-and-headless-browsers/
-# http://stackoverflow.com/a/34703838/315168
-# https://benlimmer.com/2019/01/14/travis-ci-xvfb/
-before_script:
-  - "export DISPLAY=:99.0"
-  - echo "Extracting firefox and setting PATH variable..."
-  - tar -xjf /tmp/firefox-43.0.tar.bz2 --directory /tmp
-  - export PATH="/tmp/firefox:$PATH"
-  - echo "Using firefox version `firefox --version`"
+  # https://dev.to/erikwhiting88/install-browsers-and-webdrivers-in-travisci-n76
+  - wget -N https://github.com/mozilla/geckodriver/releases/download/v0.26.0/geckodriver-v0.26.0-linux64.tar.gz -P /tmp/
+  - tar -xzf /tmp/geckodriver-v0.26.0-linux64.tar.gz -C /tmp/
+  - rm /tmp/geckodriver-v0.26.0-linux64.tar.gz
+  - sudo mv /tmp/geckodriver /usr/local/bin
 
 script:
   - travis_retry tox
 
 notifications:
-  email:
-    - [email protected]
+#  email:
+#    - [email protected]
   irc:
     channels:
       - "chat.freenode.net#pyramid"

deform/templates/autocomplete_input.pt

@@ -15,7 +15,7 @@
         deform.addCallback(
           '${field.oid}',
           function (oid) {
-              $('#' + oid).typeahead(${options});
+              $('#' + oid).typeahead(${structure:options});
           }
         );
     </script>

setup.py

@@ -54,7 +54,7 @@
 
 # Needed to run deformdemo tests
 functional_testing_extra = [
-    "selenium<3",
+    "selenium>=3",
     "pyramid",
     "pygments",
     "waitress",