.travis.yml in fat_free_crm-0.17.3 vs .travis.yml in fat_free_crm-0.18.0

@@ -1,34 +1,37 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.3.6
   - 2.4.2
+  - 2.5.0
 
 env:
   global:
     - BROWSER=chrome
   matrix:
     - DB=postgres TEST_SUITE=rubocop
     - DB=postgres TEST_SUITE="rake spec:features"
     - DB=postgres TEST_SUITE="rake spec:models"
-    - DB=postgres TEST_SUITE="rake spec:mailers"
-    - DB=postgres TEST_SUITE="rake spec:controllers"
-    - DB=postgres TEST_SUITE="rake spec:helpers"
-    - DB=postgres TEST_SUITE="rake spec:lib"
-    - DB=postgres TEST_SUITE="rake spec:routing"
-    - DB=postgres TEST_SUITE="rake spec:views"
+    - DB=postgres TEST_SUITE="rake spec:controllers spec:lib spec:routing spec:mailers"
+    - DB=postgres TEST_SUITE="rake spec:views spec:helpers"
     - DB=mysql TEST_SUITE="rake spec:models"
     - DB=sqlite TEST_SUITE="rake spec:models"
 
 matrix:
   fast_finish: true
+  exclude:
+    - rvm: 2.5.0
+      env: DB=postgres TEST_SUITE=rubocop
   allow_failures:
-    - rvm: 2.3.6
-      env: DB=sqlite TEST_SUITE="rake spec:models"
     - rvm: 2.4.2
+      env: DB=mysql TEST_SUITE="rake spec:models"
+    - rvm: 2.4.2
       env: DB=sqlite TEST_SUITE="rake spec:models"
+    - rvm: 2.5.0
+      env: DB=mysql TEST_SUITE="rake spec:models"
+    - rvm: 2.5.0
+      env: DB=sqlite TEST_SUITE="rake spec:models"
 
 addons:
   chrome: stable
 
 bundler_args: --path=vendor/bundle --without heroku
@@ -38,9 +41,11 @@
 before_install:
   - "export DISPLAY=:99.0"
   - "sh -e /etc/init.d/xvfb start"
 
 before_script:
+  # gem update --system is a workaround for travis-ci/travis-ci#8978
+  - "gem update --system"
   - sh -c "cp config/database.$DB.yml config/database.yml"
   - sh -c "if [ \"$DB\" = 'postgres' ]; then psql -c 'create database fat_free_crm_test;' -U postgres; fi"
   - sh -c "if [ \"$DB\" = 'mysql' ]; then mysql -e 'create database fat_free_crm_test;'; fi"
   - "RAILS_ENV=test bundle exec rake spec:preparedb"