Skip to content

Commit 65a72ca

Browse files
Fixed membership admin
1 parent bf4eb60 commit 65a72ca

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

lib/travis/services/assembla_user_service.rb

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,13 @@ def find_or_create_user
2323
end
2424

2525
def find_or_create_organization(user)
26-
user.organizations.find_or_create_by!(
26+
org = Organization.find_or_create_by!(
2727
vcs_id: @payload['space_id'],
2828
vcs_type: 'AssemblaOrganization'
2929
)
30+
membership = org.memberships.find_or_create_by(user: user)
31+
membership.update(role: 'admin')
32+
org
3033
end
3134

3235
def create_org_subscription(user, organization_id)

spec/lib/services/assembla_user_service_spec.rb

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,11 @@
6666
expect(service_org.vcs_type).to eq(expected_attrs[:vcs_type])
6767
expect(service_org.vcs_id).to eq(expected_attrs[:vcs_id])
6868
end
69+
70+
it 'has admin membership' do
71+
service_org = service.find_or_create_organization(user)
72+
expect(service_org.memberships.find_by(user: user).role).to eq('admin')
73+
end
6974
end
7075

7176
describe '#create_org_subscription' do

0 commit comments

Comments
 (0)