test

.travis.yml

@@ -4,25 +4,39 @@ rvm:
   - 2.3.1
 sudo: false
 addons:
+#  sauce_connect:
+#    username: "judahmeek"
+#  jwt:
+#    secure: "A/bVoePCHtwLGH4wVLCHK39+tml2axc/M/Mjnpg4m4bjgMI7GD4YqlnZMNrUBzNAv+Q66pp0sWjTy/Xm4tDaYnSxJFrWjD2wn5ZPpMEyB162nR+QqYqWl5DqP+jlOuIK+7iRmrRTlDS4LLTl43+nWxvRB16aat2U01P/+GKtQ+o="
   apt:
     sources:
       - ubuntu-toolchain-r-test
-      - travis-ci/sqlite3
     packages:
       - g++-4.9
-      - sqlite3
+services:
+  - postgresql
 env:
   global:
     - RAILS_ENV=test
     - CXX=g++-4.9
+    - SAUCE_LABS_URL=http://judahmeek:1ed6d81c-c3e0-4fd0-9012-1d2274c4b261@ondemand.saucelabs.com:80/wd/hub
+before_install:
+  - mkdir $PWD/travis-phantomjs
+  - curl -sSL https://github.com/Medium/phantomjs/releases/download/v2.1.1/phantomjs-2.1.1-linux-x86_64.tar.bz2 -o $PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2
+  - tar -xvf $PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2 -C $PWD/travis-phantomjs
+  - export PATH=$PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64/bin:$PATH
 install:
   - bundle install
-  - nvm install 6.3
-  - nvm use 6.3
+  - nvm install 6.7
+  - nvm use 6.7
   - npm install
-before_script:
-   - export DISPLAY=:99.0
-   - sh -e /etc/init.d/xvfb start
+  - rake db:setup
+# No need to run xvfb if running headless testing
+#before_script:
+#   - export DISPLAY=:99.0
+#   - sh -e /etc/init.d/xvfb start
+
 script:
   - bundle exec rake db:schema:load
-  - DRIVER=selenium_firefox bundle exec rake
+  #  - DRIVER=selenium_firefox bundle exec rake
+  - bundle exec rake

Gemfile

@@ -7,13 +7,9 @@ gem "rails"
 gem "listen"
 
 # Note: We're using sqllite3 for development and testing
-gem "sqlite3", group: [:development, :test]
+# gem "sqlite3", group: [:development, :test]
 
-group :production do
-  # Pg is used for Heroku
-  gem "pg"
-  gem "rails_12factor" # Never include this for development or tests
-end
+gem "pg"
 
 gem "puma"
 
@@ -104,7 +100,7 @@ group :test  do
   gem "generator_spec"
   gem "launchy"
   gem "poltergeist"
-  gem "rspec-rails", "3.5.0.beta3"
+  gem "rspec-rails", "~> 3"
   gem "rspec-retry"
-  gem "selenium-webdriver", require: !["poltergeist", "poltergeist_errors_ok", "webkit"].include?(ENV["DRIVER"])
+  gem "selenium-webdriver", "<3.0.0", require: !["poltergeist", "poltergeist_errors_ok", "webkit"].include?(ENV["DRIVER"])
 end