Merge pull request #2965 from AndrewKvalheim/users-role-versions

Fix bug in which role assignments aren’t tracked in version history

app/models/user.rb

@@ -23,8 +23,8 @@ class User < ApplicationRecord
   end
 
   has_many :users_roles
-  has_many :roles, through: :users_roles, dependent: :destroy
   rolify
+  has_many :roles, through: :users_roles, dependent: :destroy
 
   has_paper_trail on: [:create, :update], ignore: [:sign_in_count, :remember_created_at, :current_sign_in_at, :last_sign_in_at, :current_sign_in_ip, :last_sign_in_ip, :unconfirmed_email,
                                                    :avatar_content_type, :avatar_file_size, :avatar_updated_at, :updated_at, :confirmation_sent_at, :confirmation_token, :reset_password_token]

spec/features/versions_spec.rb

@@ -344,7 +344,6 @@ feature 'Version' do
   end
 
   scenario 'display changes in users_role for conference role', feature: true, versioning: true, js: true do
-    skip('fails since paper_trail 12.2.0')
     user = create(:user)
     role = Role.find_by(name: 'cfp', resource_id: conference.id, resource_type: 'Conference')
     user.add_role :cfp, conference