Merge pull request #774 from starteam/jmclaus/fix-preview

Fix tests

.travis.yml

@@ -23,11 +23,12 @@ before_script:
 - ./chromedriver > /tmp/chromedriver.log 2> /tmp/chromedriver.err &
 - pip install -r requirements.txt
 - wget https://raw.githubusercontent.com/knadh/jqdialog/master/jqdialog.js -P html_app/js/
+- cp node_modules/closure-templates/soyutils.js html_app/js/
 - python html_app/build.py
 - "./manage.py collectstatic --noinput"
 install:
   - pip install -r requirements.dev.txt
-  - npm install --prefix html_app
+  - npm install
 script:
 - "./manage.py test --liveserver=localhost:8100-8200 --verbosity=2"
 addons:

html_app/.gitignore

@@ -2,3 +2,4 @@
 videos/
 # Downloaded on install by Ansible to meet TLO's requirements
 js/jqdialog.js
+js/soyutils.js

html_app/package.json → package.json

@@ -4,7 +4,7 @@
   "description": "StarCellBio",
   "dependencies": {
     "clean-css": "~3.1.5",
-    "gulp-soy": "^1.0.1",
+    "closure-templates": "20130416.0.0",
     "uglify-js": "~2.4.16"
   },
   "repository": {

provision/ansible-dev.yml

@@ -53,7 +53,12 @@
       pip: requirements='/vagrant/requirements.dev.txt' virtualenv={{ venv_path }}
 
     - name: Install node packages
-      npm: path=/vagrant/html_app
+      npm: path=/vagrant
+
+    - name: Install soyutils
+      shell: >
+        executable=/bin/bash
+        cp /vagrant/node_modules/closure-templates/soyutils.js /vagrant/html_app/js/
 
     - name: Install jqDialog
       get_url:

static_assets.yml

@@ -7,7 +7,7 @@ javascripts:
   - js/jquery-1.7.2.min.js
   - js/jquery.tinymce.min.js
   - js/tinymce.min.js
-  - node_modules/gulp-soy/node_modules/closure-templates/soyutils.js
+  - js/soyutils.js
   - starcellbio.app.js
   - ../scb/get_user.js
   - js/plugins/fullscreen/plugin.min.js