Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into develop

This commit is contained in:
Roger Braun 2017-05-22 19:08:46 +02:00
commit 87c2c42bad
2 changed files with 26 additions and 0 deletions

View File

@ -0,0 +1,19 @@
defmodule Pleroma.Repo.Migrations.CaseInsensivtivity do
use Ecto.Migration
def up do
execute ("create extension if not exists citext")
alter table(:users) do
modify :email, :citext
modify :nickname, :citext
end
end
def down do
alter table(:users) do
modify :email, :string
modify :nickname, :string
end
execute ("drop extension if exists citext")
end
end

View File

@ -114,6 +114,13 @@ defmodule Pleroma.UserTest do
assert user == fetched_user assert user == fetched_user
end end
test "gets an existing user, case insensitive" do
user = insert(:user, nickname: "nick")
fetched_user = User.get_or_fetch_by_nickname("NICK")
assert user == fetched_user
end
test "fetches an external user via ostatus if no user exists" do test "fetches an external user via ostatus if no user exists" do
fetched_user = User.get_or_fetch_by_nickname("shp@social.heldscal.la") fetched_user = User.get_or_fetch_by_nickname("shp@social.heldscal.la")
assert fetched_user.nickname == "shp@social.heldscal.la" assert fetched_user.nickname == "shp@social.heldscal.la"