From 9b7c4023e88c15027bb5764acec3c4e09e120e6a Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Thu, 13 Aug 2015 15:22:33 -0400
Subject: [PATCH] Run eslint instead of jshint, remove rbx

---
 .travis.yml           | 8 +++++---
 lib/tasks/docker.rake | 4 ++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 352361f0f..a57a5f703 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,7 +23,6 @@ rvm:
   - 2.0.0
   - 2.1
   - 2.2
-  - rbx-2
 
 services:
   - redis-server
@@ -33,8 +32,11 @@ sudo: false
 cache: bundler
 
 before_install:
-  - npm i -g jshint
-  - jshint .
+  - npm i -g eslint babel-eslint
+  - eslint app/assets/javascripts
+  - eslint --ext .es6 app/assets/javascripts
+  - eslint --ext .es6 test/javascripts
+  - eslint test/javascripts
 
 before_script:
   - bundle exec rake db:create db:migrate
diff --git a/lib/tasks/docker.rake b/lib/tasks/docker.rake
index c53ade086..0045fcee4 100644
--- a/lib/tasks/docker.rake
+++ b/lib/tasks/docker.rake
@@ -35,8 +35,8 @@ task 'docker:test' do
     end
     unless ENV["RUBY_ONLY"]
       @good &&= run_or_fail("eslint app/assets/javascripts")
-      @good &&= run_or_fail("eslint --ext \".es6\" app/assets/javascripts")
-      @good &&= run_or_fail("eslint --ext \".es6\" test/javascripts")
+      @good &&= run_or_fail("eslint --ext .es6 app/assets/javascripts")
+      @good &&= run_or_fail("eslint --ext .es6 test/javascripts")
       @good &&= run_or_fail("eslint test/javascripts")
       @good &&= run_or_fail("bundle exec rake qunit:test")
     end