diff options
author | tauriedavis <taurie@gitlab.com> | 2017-07-25 12:38:25 -0700 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2017-07-28 15:29:13 +0100 |
commit | f8e5941d372b9b41dc76668932920b2af3fd3c28 (patch) | |
tree | f27a3f2e2202de467a0ded958345d38f1b952f44 /spec/features/projects/settings/merge_requests_settings_spec.rb | |
parent | 7ea89083060d5f44f9b3fd4e3258798269ac883a (diff) | |
download | gitlab-ce-f8e5941d372b9b41dc76668932920b2af3fd3c28.tar.gz |
trying to fix tests
Diffstat (limited to 'spec/features/projects/settings/merge_requests_settings_spec.rb')
-rw-r--r-- | spec/features/projects/settings/merge_requests_settings_spec.rb | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/spec/features/projects/settings/merge_requests_settings_spec.rb b/spec/features/projects/settings/merge_requests_settings_spec.rb index 796e2026905..620f769995f 100644 --- a/spec/features/projects/settings/merge_requests_settings_spec.rb +++ b/spec/features/projects/settings/merge_requests_settings_spec.rb @@ -20,6 +20,9 @@ feature 'Project settings > Merge Requests', :js do expect(page).to have_content('Only allow merge requests to be merged if all discussions are resolved') select 'Disabled', from: "project_project_feature_attributes_merge_requests_access_level" + within('.sharing-permissions-form') do + click_on('Save changes') + end expect(page).not_to have_content('Only allow merge requests to be merged if the pipeline succeeds') expect(page).not_to have_content('Only allow merge requests to be merged if all discussions are resolved') @@ -37,6 +40,9 @@ feature 'Project settings > Merge Requests', :js do expect(page).to have_content('Only allow merge requests to be merged if all discussions are resolved') select 'Everyone with access', from: "project_project_feature_attributes_builds_access_level" + within('.sharing-permissions-form') do + click_on('Save changes') + end expect(page).to have_content('Only allow merge requests to be merged if the pipeline succeeds') expect(page).to have_content('Only allow merge requests to be merged if all discussions are resolved') @@ -55,6 +61,9 @@ feature 'Project settings > Merge Requests', :js do expect(page).not_to have_content('Only allow merge requests to be merged if all discussions are resolved') select 'Everyone with access', from: "project_project_feature_attributes_merge_requests_access_level" + within('.sharing-permissions-form') do + click_on('Save changes') + end expect(page).to have_content('Only allow merge requests to be merged if the pipeline succeeds') expect(page).to have_content('Only allow merge requests to be merged if all discussions are resolved') @@ -73,7 +82,9 @@ feature 'Project settings > Merge Requests', :js do scenario 'when unchecked sets :printing_merge_request_link_enabled to false' do uncheck('project_printing_merge_request_link_enabled') - click_on('Save') + within('.merge-request-settings-form') do + click_on('Save changes') + end # Wait for save to complete and page to reload checkbox = find_field('project_printing_merge_request_link_enabled') |