Skip to content
代码片段 群组 项目
提交 3f32ae9e 编辑于 作者: Stan Hu's avatar Stan Hu
浏览文件

Merge branch '355503-unable-to-invite-groups-to-a-project-when-group-lock-enabled' into 'master'

Resolve Unable to Invite Groups to a Project When Group Lock Enabled

See merge request gitlab-org/gitlab!82636
No related branches found
No related tags found
无相关合并请求
- return unless can_admin_project_member?(project) - return unless can_invite_members_for_project?(project)
.js-invite-groups-modal{ data: common_invite_group_modal_data(project, ProjectMember, 'true') } .js-invite-groups-modal{ data: common_invite_group_modal_data(project, ProjectMember, 'true') }
...@@ -29,9 +29,11 @@ ...@@ -29,9 +29,11 @@
expect(rendered).to have_content('You can invite another group to') expect(rendered).to have_content('You can invite another group to')
expect(rendered).not_to have_link('Import from a project') expect(rendered).not_to have_link('Import from a project')
expect(rendered).to have_selector('.js-invite-group-trigger') expect(rendered).to have_selector('.js-invite-group-trigger')
expect(rendered).to have_selector('.js-invite-groups-modal')
expect(rendered).not_to have_selector('.js-invite-members-trigger') expect(rendered).not_to have_selector('.js-invite-members-trigger')
expect(rendered).not_to have_content('Members can be added by project') expect(rendered).not_to have_content('Members can be added by project')
expect(response).to render_template(partial: 'projects/_invite_members_modal') expect(response).to render_template(partial: 'projects/_invite_members_modal')
expect(response).to render_template(partial: 'projects/_invite_groups_modal')
end end
context 'when project can not be shared' do context 'when project can not be shared' do
...@@ -44,6 +46,8 @@ ...@@ -44,6 +46,8 @@
expect(rendered).to have_content('Project members') expect(rendered).to have_content('Project members')
expect(rendered).not_to have_content('You can invite') expect(rendered).not_to have_content('You can invite')
expect(rendered).not_to have_selector('.js-invite-group-trigger')
expect(response).not_to render_template(partial: 'projects/_invite_groups_modal')
expect(response).to render_template(partial: 'projects/_invite_members_modal') expect(response).to render_template(partial: 'projects/_invite_members_modal')
end end
end end
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册