Merge pull request #21 from turniere/ticket/TURNIERE-122

Update ruby and ruby dependencies

.ruby-version

@@ -1 +1 @@
-2.5.3
+2.6.2

Gemfile

@@ -3,7 +3,7 @@
 source 'https://rubygems.org'
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-ruby '2.5.3'
+ruby '2.6.2'
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 gem 'rails', '~> 5.2.1'

Gemfile.lock

@@ -1,62 +1,63 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.2.1.1)
+    actioncable (5.2.3)
-      actionpack (= 5.2.1.1)
+      actionpack (= 5.2.3)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailer (5.2.1.1)
+    actionmailer (5.2.3)
-      actionpack (= 5.2.1.1)
+      actionpack (= 5.2.3)
-      actionview (= 5.2.1.1)
+      actionview (= 5.2.3)
-      activejob (= 5.2.1.1)
+      activejob (= 5.2.3)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.2.1.1)
+    actionpack (5.2.3)
-      actionview (= 5.2.1.1)
+      actionview (= 5.2.3)
-      activesupport (= 5.2.1.1)
+      activesupport (= 5.2.3)
       rack (~> 2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.1.1)
+    actionview (5.2.3)
-      activesupport (= 5.2.1.1)
+      activesupport (= 5.2.3)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    active_model_serializers (0.10.8)
+    active_model_serializers (0.10.9)
       actionpack (>= 4.1, < 6)
       activemodel (>= 4.1, < 6)
       case_transform (>= 0.2)
       jsonapi-renderer (>= 0.1.1.beta1, < 0.3)
-    activejob (5.2.1.1)
+    activejob (5.2.3)
-      activesupport (= 5.2.1.1)
+      activesupport (= 5.2.3)
       globalid (>= 0.3.6)
-    activemodel (5.2.1.1)
+    activemodel (5.2.3)
-      activesupport (= 5.2.1.1)
+      activesupport (= 5.2.3)
-    activerecord (5.2.1.1)
+    activerecord (5.2.3)
-      activemodel (= 5.2.1.1)
+      activemodel (= 5.2.3)
-      activesupport (= 5.2.1.1)
+      activesupport (= 5.2.3)
       arel (>= 9.0)
-    activestorage (5.2.1.1)
+    activestorage (5.2.3)
-      actionpack (= 5.2.1.1)
+      actionpack (= 5.2.3)
-      activerecord (= 5.2.1.1)
+      activerecord (= 5.2.3)
       marcel (~> 0.3.1)
-    activesupport (5.2.1.1)
+    activesupport (5.2.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     arel (9.0.0)
     ast (2.4.0)
+    backport (0.3.0)
     bcrypt (3.1.12)
-    bootsnap (1.3.2)
+    bootsnap (1.4.2)
       msgpack (~> 1.0)
     builder (3.2.3)
-    byebug (10.0.2)
+    byebug (11.0.1)
     case_transform (0.2)
       activesupport
-    concurrent-ruby (1.1.3)
+    concurrent-ruby (1.1.5)
     coveralls (0.8.22)
       json (>= 1.8, < 3)
       simplecov (~> 0.16.1)
@@ -64,38 +65,37 @@ GEM
       thor (~> 0.19.4)
       tins (~> 1.6)
     crass (1.0.4)
-    devise (4.5.0)
+    devise (4.6.2)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0, < 6.0)
       responders
       warden (~> 1.2.3)
-    devise_token_auth (1.0.0)
+    devise_token_auth (1.1.0)
-      devise (> 3.5.2, < 4.6)
+      devise (> 3.5.2, < 4.7)
       rails (>= 4.2.0, < 6)
     diff-lcs (1.3)
     docile (1.3.1)
-    erubi (1.7.1)
+    erubi (1.8.0)
-    eventmachine (1.2.7)
+    factory_bot (5.0.2)
-    factory_bot (4.11.1)
+      activesupport (>= 4.2.0)
-      activesupport (>= 3.0.0)
+    factory_bot_rails (5.0.1)
-    factory_bot_rails (4.11.1)
+      factory_bot (~> 5.0.0)
-      factory_bot (~> 4.11.1)
+      railties (>= 4.2.0)
-      railties (>= 3.0.0)
+    faker (1.9.3)
-    faker (1.9.1)
       i18n (>= 0.7)
-    ffi (1.9.25)
+    ffi (1.10.0)
-    globalid (0.4.1)
+    globalid (0.4.2)
       activesupport (>= 4.2.0)
     htmlentities (4.3.4)
-    i18n (1.1.1)
+    i18n (1.6.0)
       concurrent-ruby (~> 1.0)
     interactor (3.1.1)
     interactor-rails (2.2.0)
       interactor (~> 3.0)
       rails (>= 4.2, < 5.3)
-    jaro_winkler (1.5.1)
+    jaro_winkler (1.5.2)
-    json (2.1.0)
+    json (2.2.0)
     jsonapi-renderer (0.2.0)
     kramdown (1.17.0)
     listen (3.1.5)
@@ -110,57 +110,57 @@ GEM
     marcel (0.3.3)
       mimemagic (~> 0.3.2)
     method_source (0.9.2)
-    mimemagic (0.3.2)
+    mimemagic (0.3.3)
     mini_mime (1.0.1)
-    mini_portile2 (2.3.0)
+    mini_portile2 (2.4.0)
     minitest (5.11.3)
-    msgpack (1.2.4)
+    msgpack (1.2.9)
     nio4r (2.3.1)
-    nokogiri (1.8.5)
+    nokogiri (1.10.2)
-      mini_portile2 (~> 2.3.0)
+      mini_portile2 (~> 2.4.0)
     orm_adapter (0.5.0)
-    parallel (1.12.1)
+    parallel (1.17.0)
-    parser (2.5.3.0)
+    parser (2.6.2.0)
       ast (~> 2.4.0)
-    powerpack (0.1.2)
+    psych (3.1.0)
-    puma (3.12.0)
+    puma (3.12.1)
-    rack (2.0.6)
+    rack (2.0.7)
-    rack-cors (1.0.2)
+    rack-cors (1.0.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     railroady (1.5.3)
-    rails (5.2.1.1)
+    rails (5.2.3)
-      actioncable (= 5.2.1.1)
+      actioncable (= 5.2.3)
-      actionmailer (= 5.2.1.1)
+      actionmailer (= 5.2.3)
-      actionpack (= 5.2.1.1)
+      actionpack (= 5.2.3)
-      actionview (= 5.2.1.1)
+      actionview (= 5.2.3)
-      activejob (= 5.2.1.1)
+      activejob (= 5.2.3)
-      activemodel (= 5.2.1.1)
+      activemodel (= 5.2.3)
-      activerecord (= 5.2.1.1)
+      activerecord (= 5.2.3)
-      activestorage (= 5.2.1.1)
+      activestorage (= 5.2.3)
-      activesupport (= 5.2.1.1)
+      activesupport (= 5.2.3)
       bundler (>= 1.3.0)
-      railties (= 5.2.1.1)
+      railties (= 5.2.3)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.0.4)
       loofah (~> 2.2, >= 2.2.2)
-    railties (5.2.1.1)
+    railties (5.2.3)
-      actionpack (= 5.2.1.1)
+      actionpack (= 5.2.3)
-      activesupport (= 5.2.1.1)
+      activesupport (= 5.2.3)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.19.0, < 2.0)
     rainbow (3.0.0)
-    rake (12.3.1)
+    rake (12.3.2)
     rb-fsevent (0.10.3)
-    rb-inotify (0.9.10)
+    rb-inotify (0.10.0)
-      ffi (>= 0.5.0, < 2)
+      ffi (~> 1.0)
-    responders (2.4.0)
+    responders (2.4.1)
-      actionpack (>= 4.2.0, < 5.3)
+      actionpack (>= 4.2.0, < 6.0)
-      railties (>= 4.2.0, < 5.3)
+      railties (>= 4.2.0, < 6.0)
     reverse_markdown (1.1.0)
       nokogiri
     rspec-core (3.8.0)
@@ -171,7 +171,7 @@ GEM
     rspec-mocks (3.8.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
-    rspec-rails (3.8.1)
+    rspec-rails (3.8.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
@@ -180,26 +180,27 @@ GEM
       rspec-mocks (~> 3.8.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.0)
-    rubocop (0.60.0)
+    rubocop (0.66.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.5, != 2.5.1.1)
-      powerpack (~> 0.1)
+      psych (>= 3.1.0)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.4.0)
+      unicode-display_width (>= 1.4.0, < 1.6)
     ruby-progressbar (1.10.0)
     ruby_dep (1.5.0)
-    shoulda-matchers (3.1.2)
+    shoulda-matchers (4.0.1)
-      activesupport (>= 4.0.0)
+      activesupport (>= 4.2.0)
     simplecov (0.16.1)
       docile (~> 1.1)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
-    solargraph (0.29.1)
+    solargraph (0.31.3)
-      eventmachine (~> 1.2, >= 1.2.5)
+      backport (~> 0.3)
       htmlentities (~> 4.3, >= 4.3.4)
+      jaro_winkler (~> 1.5)
       kramdown (~> 1.16)
       parser (~> 2.3)
       reverse_markdown (~> 1.0, >= 1.0.5)
@@ -219,8 +220,8 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    sqlite3 (1.3.13)
+    sqlite3 (1.4.0)
-    term-ansicolor (1.7.0)
+    term-ansicolor (1.7.1)
       tins (~> 1.0)
     thor (0.19.4)
     thread_safe (0.3.6)
@@ -228,13 +229,13 @@ GEM
     tins (1.20.2)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    unicode-display_width (1.4.0)
+    unicode-display_width (1.5.0)
     warden (1.2.8)
       rack (>= 2.0.6)
     websocket-driver (0.7.0)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.3)
-    yard (0.9.16)
+    yard (0.9.19)
 
 PLATFORMS
   ruby
@@ -265,7 +266,7 @@ DEPENDENCIES
   tzinfo-data
 
 RUBY VERSION
-   ruby 2.5.3p105
+   ruby 2.6.2p47
 
 BUNDLED WITH
-   1.17.1
+   1.17.2

app/models/user.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class User < ApplicationRecord
+  extend Devise::Models
+
   devise :database_authenticatable, :registerable,
          :recoverable, :rememberable, :trackable
 

db/seeds.rb

@@ -3,7 +3,7 @@
 require 'faker'
 
 user = User.create! username: Faker::Internet.username, email: Faker::Internet.email, password: Faker::Internet.password
-tournament = user.tournaments.create! name: Faker::Dog.name
+tournament = user.tournaments.create! name: Faker::Creature::Dog.name
 
 @teams = []
 16.times do

spec/controllers/teams_controller_spec.rb

@@ -24,7 +24,7 @@ RSpec.describe TeamsController, type: :controller do
   describe 'PUT #update' do
     let(:valid_update) do
       {
-        name: Faker::Dog.name
+        name: Faker::Creature::Dog.name
       }
     end
 

spec/controllers/tournaments_controller_spec.rb

@@ -62,7 +62,7 @@ RSpec.describe TournamentsController, type: :controller do
   describe 'POST #create', skip: true do
     let(:create_data) do
       {
-        name: Faker::Dog.name,
+        name: Faker::Creature::Dog.name,
         description: Faker::Lorem.sentence,
         public: false,
         teams: {
@@ -109,7 +109,7 @@ RSpec.describe TournamentsController, type: :controller do
   describe 'PUT #update' do
     let(:valid_update) do
       {
-        name: Faker::Dog.name
+        name: Faker::Creature::Dog.name
       }
     end
 

spec/factories/teams.rb

@@ -2,11 +2,11 @@
 
 FactoryBot.define do
   factory :team do
-    name { Faker::Dog.name }
+    name { Faker::Creature::Dog.name }
     tournament
   end
 
   factory :detached_team, class: Team do
-    name { Faker::Dog.name }
+    name { Faker::Creature::Dog.name }
   end
 end

spec/factories/tournaments.rb

@@ -2,7 +2,7 @@
 
 FactoryBot.define do
   factory :tournament do
-    name { Faker::Dog.name }
+    name { Faker::Creature::Dog.name }
     description { Faker::Lorem.sentence }
     user
     transient do

spec/models/match_spec.rb

@@ -5,8 +5,8 @@ require 'rails_helper'
 RSpec.describe Match, type: :model do
   context 'association' do
     it { should have_many :match_scores }
-    it { should belong_to :stage }
+    it { should belong_to(:stage).optional }
-    it { should belong_to :group }
+    it { should belong_to(:group).optional }
   end
 
   context '#new' do

spec/models/team_spec.rb

@@ -8,7 +8,7 @@ RSpec.describe Team, type: :model do
   end
 
   describe 'association' do
-    it { should belong_to :tournament }
+    it { should belong_to(:tournament).optional }
     it { should have_many :group_scores }
     it { should have_many :match_scores }
   end

spec/models/tournament_spec.rb

@@ -7,7 +7,7 @@ RSpec.describe Tournament, type: :model do
     it { should validate_presence_of :name }
     it { should validate_presence_of :code }
     it do
-      tournament = create(:tournament, code: Faker::Dog.name)
+      tournament = create(:tournament, code: Faker::Creature::Dog.name)
       expect(tournament).to validate_uniqueness_of :code
     end
     it { should_not validate_presence_of :description }