0
0
Fork 0

Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- app/javascript/packs/public.js
- app/models/user.rb
- config/settings.yml
- db/schema.rb

Moved public.js changes to settings.js.
This commit is contained in:
Thibaut Girka 2018-12-09 13:28:09 +01:00
commit e7f1bfdc2d
47 changed files with 751 additions and 43 deletions

View file

@ -15,14 +15,6 @@ describe UniqueUsernameValidator do
expect(account).to be_valid
end
it 'adds an error when the username is already used with ignoring dots' do
pending 'allowing dots in username is still in development'
Fabricate(:account, username: 'abcd.ef')
account = double(username: 'ab.cdef', persisted?: false, errors: double(add: nil))
subject.validate(account)
expect(account.errors).to have_received(:add)
end
it 'adds an error when the username is already used with ignoring cases' do
Fabricate(:account, username: 'ABCdef')
account = double(username: 'abcDEF', persisted?: false, errors: double(add: nil))