Archives/asciinema.org
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Well, 2 letter usernames are fine too

Browse Source
This commit is contained in:
Marcin Kulik 2014-04-10 22:22:33 +02:00
parent a6bb7bf5ba
commit ace357187c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/user.rb
View File

@ -1,6 +1,6 @@
class User < ActiveRecord::Base
USERNAME_FORMAT = /\A[a-zA-Z0-9][a-zA-Z0-9-]+[a-zA-Z0-9]\z/
USERNAME_FORMAT = /\A[a-zA-Z0-9][a-zA-Z0-9-]*[a-zA-Z0-9]\z/
has_many :api_tokens, :dependent => :destroy
has_many :asciicasts, :dependent => :destroy
@ -13,7 +13,7 @@ class User < ActiveRecord::Base
validates :username, presence: true
validates :username, uniqueness: { scope: :dummy, case_sensitive: false },
format: { with: USERNAME_FORMAT },
length: { minimum: 3, maximum: 16 },
length: { minimum: 2, maximum: 16 },
unless: :dummy
validates :email, presence: true, uniqueness: true, unless: :dummy

4
spec/models/user_spec.rb
View File

@ -51,13 +51,13 @@ describe User do
it { should allow_value('sickill').for(:username) }
it { should allow_value('sick-ill').for(:username) }
it { should allow_value('abc').for(:username) }
it { should allow_value('ab').for(:username) }
it { should allow_value('s' * 16).for(:username) }
it { should allow_value('Sickill').for(:username) }
it { should_not allow_value('sick.ill').for(:username) }
it { should_not allow_value('-sickill').for(:username) }
it { should_not allow_value('sickill-').for(:username) }
it { should_not allow_value('ab').for(:username) }
it { should_not allow_value('a').for(:username) }
it { should_not allow_value('s' * 17).for(:username) }
it "checks username uniqueness" do