Skip to content

Commit 751c37f

Browse files
committed
Remove default "contributor" role from UserInvite
1 parent 2ecd790 commit 751c37f

File tree

4 files changed

+10
-21
lines changed

4 files changed

+10
-21
lines changed

lib/code_corps/model/user_invite.ex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ defmodule CodeCorps.UserInvite do
55

66
schema "user_invites" do
77
field :email, :string, null: false
8-
field :role, :string, default: "contributor"
8+
field :role, :string
99
field :name, :string
1010

1111
belongs_to :project, CodeCorps.Project

priv/repo/migrations/20171228163712_add_user_invites.exs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ defmodule CodeCorps.Repo.Migrations.AddUserInvites do
33

44
def change do
55
create table(:user_invites) do
6-
add :email, :string, null: false
7-
add :name, :string, null: true
8-
add :role, :string, null: true, default: "contributor"
6+
add(:email, :string, null: false)
7+
add(:name, :string, null: true)
8+
add(:role, :string, null: true)
99

10-
add :inviter_id, references(:users)
11-
add :invitee_id, references(:users)
12-
add :project_id, references(:projects)
10+
add(:inviter_id, references(:users))
11+
add(:invitee_id, references(:users))
12+
add(:project_id, references(:projects))
1313

1414
timestamps()
1515
end

priv/repo/structure.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1735,7 +1735,7 @@ CREATE TABLE user_invites (
17351735
id bigint NOT NULL,
17361736
email character varying(255) NOT NULL,
17371737
name character varying(255),
1738-
role character varying(255) DEFAULT 'contributor'::character varying,
1738+
role character varying(255),
17391739
inviter_id bigint,
17401740
invitee_id bigint,
17411741
project_id bigint,

test/lib/code_corps/accounts/accounts_test.exs

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -189,17 +189,6 @@ defmodule CodeCorps.AccountsTest do
189189
assert user_invite.role == "admin"
190190
end
191191

192-
test "defaults role to 'contributor'" do
193-
%{id: inviter_id} = insert(:user)
194-
195-
{:ok, %UserInvite{} = user_invite} =
196-
@base_attrs
197-
|> Map.put(:inviter_id, inviter_id)
198-
|> Accounts.create_invite
199-
200-
assert user_invite.role == "contributor"
201-
end
202-
203192
test "does not allow invalid roles" do
204193
%{id: inviter_id} = insert(:user)
205194

@@ -285,13 +274,13 @@ defmodule CodeCorps.AccountsTest do
285274

286275
test "creates project membership if project provided" do
287276
project = insert(:project)
288-
invite = insert(:user_invite, invitee: nil, project: project)
277+
invite = insert(:user_invite, invitee: nil, project: project, role: "admin")
289278

290279
{:ok, %User{} = user} =
291280
@valid_user_params
292281
|> Map.put("invite_id", invite.id)
293282
|> Accounts.claim_invite
294-
assert Repo.get_by(ProjectUser, user_id: user.id, project_id: project.id)
283+
assert Repo.get_by(ProjectUser, user_id: user.id, project_id: project.id, role: "admin")
295284
end
296285

297286
test "returns :invite_not_found if bad id provided" do

0 commit comments

Comments
 (0)