Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2026-02-25 08:34:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Try fixing a few test deprecations

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

2
app/models/context.rb
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

2
app/models/project.rb
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

2
app/models/user.rb
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 }