Try fixing a few test deprecations

This commit is contained in:
Jyri-Petteri Paloposki 2020-08-20 18:33:36 +03:00
parent 399e2c0b76
commit a0768636c3
13 changed files with 43 additions and 49 deletions

View file

@ -9,8 +9,8 @@ class PreferencesController < ApplicationController
def update
@prefs = current_user.prefs
@user = current_user
user_updated = current_user.update_attributes(user_params)
prefs_updated = current_user.preference.update_attributes(prefs_params)
user_updated = current_user.update(user_params)
prefs_updated = current_user.preference.update(prefs_params)
if (user_updated && prefs_updated)
if params['user']['password'].present? # password updated?
logout_user t('preferences.password_changed')

View file

@ -35,7 +35,7 @@ class Context < ApplicationRecord
validates_presence_of :name, :message => "context must have a name"
validates_length_of :name, :maximum => 255, :message => "context name must be less than 256 characters"
validates_uniqueness_of :name, :message => "already exists", :scope => "user_id"
validates_uniqueness_of :name, :message => "already exists", :scope => "user_id", :case_sensitive => false
def self.null_object
NullContext.new

View file

@ -18,7 +18,7 @@ class Project < ApplicationRecord
validates_presence_of :name
validates_length_of :name, :maximum => 255
validates_uniqueness_of :name, :scope => "user_id"
validates_uniqueness_of :name, :scope => "user_id", :case_sensitive => true
acts_as_list :scope => 'user_id = #{user_id} AND state = \'#{state}\'', :top_of_list => 0

View file

@ -105,7 +105,7 @@ class User < ApplicationRecord
validates_presence_of :password_confirmation, if: :password_required?
validates_confirmation_of :password
validates_length_of :login, within: 3..80
validates_uniqueness_of :login, on: :create
validates_uniqueness_of :login, on: :create, :case_sensitive => false
validate :validate_auth_type
validates :email, :allow_blank => true, format: { with: URI::MailTo::EMAIL_REGEXP }

View file

@ -21,5 +21,5 @@
<div id="input_box">
<%= render :partial => "shared/add_new_item_form" %>
<%= render :file => "sidebar/sidebar" %>
<%= render :template => "sidebar/sidebar" %>
</div>

View file

@ -19,5 +19,5 @@
</div>
<div id="input_box">
<%= render :file => "sidebar/sidebar" %>
<%= render :template => "sidebar/sidebar" %>
</div>

View file

@ -42,5 +42,5 @@
<div id="input_box">
<%= render :partial => "shared/add_new_item_form" %>
<%= render :file => "sidebar/sidebar" %>
<%= render :template => "sidebar/sidebar" %>
</div>

View file

@ -12,5 +12,5 @@
<div id="input_box">
<%= render :partial => "shared/add_new_item_form" %>
<%= render :file => "sidebar/sidebar" %>
</div>
<%= render :template => "sidebar/sidebar" %>
</div>

View file

@ -27,5 +27,5 @@
<div id="input_box">
<%= render :partial => "shared/add_new_item_form" %>
<%= render :file => "sidebar/sidebar" %>
<%= render :template => "sidebar/sidebar" %>
</div>