Merge branch 'develop' into 'develop'

Make user bio optional

See merge request pleroma/pleroma!68

1 files changed, 3 insertions, 2 deletions

diff --git a/test/user_test.exs b/test/user_test.exs
index 0c87b778c..6bfdfe1bf 100644
--- a/test/user_test.exs
+++ b/test/user_test.exs
@@ -101,13 +101,14 @@ defmodule Pleroma.UserTest do
       email: "email@example.com"
     }
 
-    test "it requires a bio, email, name, nickname and password" do
+    test "it requires an email, name, nickname and password, bio is optional" do
       @full_user_data
       |> Map.keys
       |> Enum.each(fn (key) ->
         params = Map.delete(@full_user_data, key)
         changeset = User.register_changeset(%User{}, params)
-        assert changeset.valid? == false
+
+        assert (if key == :bio, do: changeset.valid?, else: not changeset.valid?)
       end)
     end