Merge pull request #85 from sanger/develop

Develop into master

Author: emrojo

.travis.yml

@@ -1,25 +1,36 @@
 language: ruby
+dist: xenial
+sudo: required
+addons:
+  chrome: stable
 cache:
   bundler: true
   yarn: true
   directories:
   - node_modules
   - vendor/bundle
+before_install:
+- google-chrome-stable --headless --disable-gpu --remote-debugging-port=9222 http://localhost &
 install:
 - bundle install --deployment
 - yarn install
 before_script:
 - export SECRET_KEY_BASE=`bundle exec rake secret`
 - bundle exec rake db:create RAILS_ENV=test
+- RAILS_ENV=test bundle exec rails webdrivers:chromedriver:update -r webdrivers
+- ln -s /home/travis/.webdrivers/chromedriver ~/bin/chromedriver
+- export PATH=~/bin:$PATH
 script:
-- bundle exec rake
+- bundle exec rspec
+- xvfb-run -a bundle exec rspec --tag browser
 - yarn test
 after_success:
 - chmod +x ./compile-build
 - "./compile-build"
 services:
 - redis-server
 - mysql
+- xvfb
 deploy:
   provider: releases
   api_key:

Gemfile

@@ -29,6 +29,7 @@ gem 'jquery-rails'
 gem 'react-rails'
 gem 'sass-rails'
 gem 'bootstrap-sass'
+gem 'sass'
 gem 'will_paginate'
 gem 'will_paginate-bootstrap'
 
@@ -83,6 +84,11 @@ group :test do
   gem 'rails-controller-testing'
   gem 'database_cleaner'
   gem 'json-schema'
+  gem 'capybara'
+  gem 'selenium-webdriver'
+  gem 'mock_redis'
+  # Keep webdriver in sync with chrome to prevent frustrating CI failures
+  gem 'webdrivers', require: false
 end
 
 group :test do