Merge branch 'development'

.gitignore

@@ -23,8 +23,11 @@ data/walkoff.config
 docs/_*/
 npm-debug.log
 tests/testWorkflows/testGeneratedWorkflows_bkup
+tests/tmp/*
 walkoff/api/composed_api.yaml
 walkoff/client/node_modules/
 walkoff/client/build/
+walkoff/client/coverage/
+walkoff/client/dist/
 !apps/*.py
 !interfaces/*.py

.travis.yml

@@ -1,22 +1,93 @@
-language: python
-os:
-    - linux
-python:
-    - "2.7"
-    - "3.4"
-    - "3.5"
-    - "3.6"
-install:
-  - pip install -r requirements.txt
-  - pip install coverage
-before_script:
-  - python scripts/generate_certificates.py
-script:
-  - coverage run run_all_tests.py
-  - coverage combine
-  - coverage report
-branches:
-    only: 
-      - master
-      - development
+matrix:
+  include:
+    - language: python
+      os: linux
+      python: "2.7"
+      install:
+        - pip install -r requirements.txt
+        - pip install coverage
+      before_script:
+        - python scripts/generate_certificates.py
+      script:
+        - coverage run run_all_tests.py
+        - coverage combine
+        - coverage report
+      branches:
+        only:
+          - master
+          - development
+
+    - language: python
+      os: linux
+      python: "3.4"
+      install:
+        - pip install -r requirements.txt
+        - pip install coverage
+      before_script:
+        - python scripts/generate_certificates.py
+      script:
+        - coverage run run_all_tests.py
+        - coverage combine
+        - coverage report
+      branches:
+        only:
+          - master
+          - development
+
+    - language: python
+      os: linux
+      python: "3.5"
+      install:
+        - pip install -r requirements.txt
+        - pip install coverage
+      before_script:
+        - python scripts/generate_certificates.py
+      script:
+        - coverage run run_all_tests.py
+        - coverage combine
+        - coverage report
+      branches:
+        only:
+          - master
+          - development
+
+    - language: python
+      os: linux
+      python: "3.6"
+      install:
+        - pip install -r requirements.txt
+        - pip install coverage
+      before_script:
+        - python scripts/generate_certificates.py
+      script:
+        - coverage run run_all_tests.py
+        - coverage combine
+        - coverage report
+      branches:
+        only:
+          - master
+          - development
+
+    - language: node_js
+      node_js:
+        - "node"
+      addons:
+      apt:
+        sources:
+          - google-chrome
+        packages:
+          - google-chrome-stable
+          - google-chrome-beta
+      before_install:
+        - export CHROME_BIN=chromium-browser
+        - export DISPLAY=:99.0
+        - sh -e /etc/init.d/xvfb start
+      before_script:
+        - cd walkoff/client
+        - npm install
+      script: npm run test -- --single-run
+      branches:
+        only:
+          - master
+          - development
 

CHANGELOG.md

@@ -1,6 +1,19 @@
 # Changelog
 <!-- Use the tags Added, Changed, Deprecated, Removed, Fixed, Security, and
      Contributor to describe changes -->
+
+## [0.6.5]
+###### 2018-02-01
+
+### Added
+* Webpack is now used to increase UI performance
+
+### Changed
+* Default return codes for the Walkoff app
+
+### Contributor
+* Some UI tests are now run on Travis-CI
+
 ## [0.6.4]
 ###### 2018-01-18
 

README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://img.shields.io/travis/iadgov/WALKOFF/master.svg?maxAge=3600&label=Linux)](https://travis-ci.org/iadgov/WALKOFF) Windows [![Build status](https://ci.appveyor.com/api/projects/status/hs6ujwd1f87n39ut/branch/master?svg=true)](https://ci.appveyor.com/project/iadgovuser11/walkoff/branch/master)
+[![Build Status](https://img.shields.io/travis/iadgov/WALKOFF/master.svg?maxAge=3600&label=Linux)](https://travis-ci.org/iadgov/WALKOFF) [![Build status](https://ci.appveyor.com/api/projects/status/hs6ujwd1f87n39ut/branch/master?svg=true)](https://ci.appveyor.com/project/iadgovuser11/walkoff/branch/master)
 [![Maintainability](https://api.codeclimate.com/v1/badges/330249e13845a07a69a2/maintainability)](https://codeclimate.com/github/iadgov/WALKOFF/maintainability)[![GitHub (pre-)release](https://img.shields.io/github/release/iadgov/WALKOFF/all.svg?style=flat)](release)