diff options
| author | Luke Bennett <lbennett@gitlab.com> | 2018-06-07 08:56:41 +0300 |
|---|---|---|
| committer | Luke Bennett <lbennett@gitlab.com> | 2018-06-07 08:56:41 +0300 |
| commit | a97f4ec3615595694b11676484e9ac1ba5524a9e (patch) | |
| tree | c82ad96af00a0cdd898f26a8e1da5a9bdae14819 /spec/features/projects | |
| parent | 119b128ec8415a074a73b73a7878717779c6e0f3 (diff) | |
| parent | 760b12dc6b3a927c918855e2ee85a1c0e6bddb73 (diff) | |
Merge branch 'master' into '39549-label-list-page-redesign-with-draggable-labels'
# Conflicts:
# app/views/projects/labels/index.html.haml
Diffstat (limited to 'spec/features/projects')
| -rw-r--r-- | spec/features/projects/settings/user_manages_group_links_spec.rb | 2 | ||||
| -rw-r--r-- | spec/features/projects/settings/user_manages_project_members_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/features/projects/settings/user_manages_group_links_spec.rb b/spec/features/projects/settings/user_manages_group_links_spec.rb index fdf42797091..92ce2ca83c7 100644 --- a/spec/features/projects/settings/user_manages_group_links_spec.rb +++ b/spec/features/projects/settings/user_manages_group_links_spec.rb @@ -30,7 +30,7 @@ describe 'Projects > Settings > User manages group links' do click_link('Share with group') select2(group_market.id, from: '#link_group_id') - select('Master', from: 'link_group_access') + select('Maintainer', from: 'link_group_access') click_button('Share') diff --git a/spec/features/projects/settings/user_manages_project_members_spec.rb b/spec/features/projects/settings/user_manages_project_members_spec.rb index 8af95522165..d3003753ae6 100644 --- a/spec/features/projects/settings/user_manages_project_members_spec.rb +++ b/spec/features/projects/settings/user_manages_project_members_spec.rb @@ -62,7 +62,7 @@ describe 'Projects > Settings > User manages project members' do page.within('.project-members-groups') do expect(page).to have_content('OpenSource') - expect(first('.group_member')).to have_content('Master') + expect(first('.group_member')).to have_content('Maintainer') end end end |