Merge 6ea95c6 into 269e300

.tool-versions

@@ -1,2 +1,2 @@
-ruby 2.3.1
+ruby 2.6.0
 nodejs 8.11.3

.travis.yml

@@ -4,6 +4,14 @@ services:
   - postgresql
   - redis-server
 sudo: false
+addons:
+  chrome: stable
+  apt:
+    packages:
+      - chromium-chromedriver
+  artifacts:
+    paths:
+      - $(ls -d -1 $PWD/tmp/capybara/* | tr "\n" ":")
 env:
   - "DB=postgresql"
 before_install:
@@ -16,6 +24,7 @@ install:
 before_script:
   - "cp config/database.yml.example config/database.yml"
   - "cp .env.sample .env"
+  - ln -s /usr/lib/chromium-browser/chromedriver ~/bin/chromedriver
   - "export DISPLAY=:99.0"
   - "sh -e /etc/init.d/xvfb start"
   - "bundle exec rake --trace fulcrum:setup db:setup"

Gemfile

@@ -79,7 +79,8 @@ group :test do
   gem 'codeclimate-test-reporter', require: nil
   gem 'database_cleaner'
   gem 'factory_bot_rails'
-  gem 'poltergeist'
+  gem 'selenium-webdriver'
+  gem 'rspec-retry'
   gem 'rspec-activemodel-mocks'
   gem 'rspec-its'
   gem 'rspec-rails'
@@ -105,4 +106,3 @@ group :development, :test do
   gem 'pry-remote'
   gem "pusher-fake", "~> 1.10"
 end
-

Gemfile.lock

@@ -112,9 +112,10 @@ GEM
       capybara (>= 1.0, < 4)
       launchy
     chartkick (3.0.2)
+    childprocess (0.9.0)
+      ffi (~> 1.0, >= 1.0.11)
     chronic (0.10.2)
     chunky_png (1.3.11)
-    cliver (0.3.2)
     cloudinary (1.1.7)
       aws_cf_signer
       rest-client
@@ -329,10 +330,6 @@ GEM
     platform-api (2.2.0)
       heroics (~> 0.0.25)
       moneta (~> 1.0.0)
-    poltergeist (1.18.1)
-      capybara (>= 2.1, < 4)
-      cliver (~> 0.3.1)
-      websocket-driver (>= 0.2.0)
     powerpack (0.1.2)
     pry (0.12.2)
       coderay (~> 1.1.0)
@@ -457,6 +454,8 @@ GEM
       rspec-expectations (~> 3.8.0)
       rspec-mocks (~> 3.8.0)
       rspec-support (~> 3.8.0)
+    rspec-retry (0.6.1)
+      rspec-core (> 3.3)
     rspec-support (3.8.0)
     rubocop (0.63.1)
       jaro_winkler (~> 1.5.1)
@@ -469,6 +468,7 @@ GEM
     rubocop-rspec (1.32.0)
       rubocop (>= 0.60.0)
     ruby-progressbar (1.10.0)
+    rubyzip (1.2.2)
     safe_yaml (1.0.4)
     sass (3.4.25)
     sass-rails (5.0.7)
@@ -480,6 +480,9 @@ GEM
     sassc (2.0.0)
       ffi (~> 1.9.6)
       rake
+    selenium-webdriver (3.141.0)
+      childprocess (~> 0.5)
+      rubyzip (~> 1.2, >= 1.2.2)
     shoulda-matchers (3.1.3)
       activesupport (>= 4.0.0)
     sidekiq (5.2.5)
@@ -602,7 +605,6 @@ DEPENDENCIES
   pg
   pg_search
   platform-api
-  poltergeist
   pry-rails
   pry-remote
   puma
@@ -623,9 +625,11 @@ DEPENDENCIES
   rspec-activemodel-mocks
   rspec-its
   rspec-rails
+  rspec-retry
   rubocop (= 0.63.1)
   rubocop-rspec
   sass-rails
+  selenium-webdriver
   shoulda-matchers
   sidekiq
   sidekiq_mailer

app/helpers/application_helper.rb

@@ -1,5 +1,10 @@
 module ApplicationHelper
   def team_logo(image_path)
-    cl_image_tag(image_path, size: '32x32', crop: :fill, radius: 5, border: '1px_solid_black')
+    cl_image_tag(image_path,
+      width: 32,
+      height: 32,
+      crop: :fill,
+      radius: 5,
+      border: '1px_solid_black')
   end
 end

app/views/layouts/application.html.erb

@@ -23,7 +23,9 @@
       <div class="navbar-header">
 
         <% if session[:current_team_slug] && current_team.try(:logo) %>
-          <%= team_logo(current_team.logo.path) %>
+          <a href="/" class="navbar-brand navbar-logo">
+            <%= team_logo(current_team.logo.path) %>
+          </a>
         <% else %>
           <a href="/" class="navbar-brand navbar-logo">
             <%= image_tag 'logo.png', width: 32, height: 32 %>

app/views/teams/edit.html.erb

@@ -60,7 +60,7 @@
       <div class="panel-body">
         <% if session[:current_team_slug] && current_team.try(:logo) %>
           <div class="text-center">
-            <img class="user-image" src="<%= current_team.logo.path %>">
+            <%= team_logo(current_team.logo.path) %>
           </div>
           <hr />
         <% end %>

config/environments/test.rb

@@ -45,7 +45,7 @@
   # Randomize the order test cases are executed.
   config.active_support.test_order = :random
 
-  config.middleware.use NoAnimations
+  # config.middleware.use NoAnimations
 
   config.active_job.queue_adapter = :inline
 end