diff options
| author | Sean McGivern <sean@gitlab.com> | 2019-07-22 15:14:53 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2019-07-22 15:14:53 +0000 |
| commit | ffb39001616f0c9457785e44bcabfc7342e9f919 (patch) | |
| tree | 8a4972a3e7f6f068bc0622c476f1ed56a4715a3e /spec | |
| parent | 8b284a51c03d6ab0634f115b38014d5a87f73d57 (diff) | |
| parent | 36f8d7bd7950dbc2ddc6bc6299b5947d80ec5cd9 (diff) | |
| download | gitlab-ce-ffb39001616f0c9457785e44bcabfc7342e9f919.tar.gz | |
Merge branch 'ce-9688-add-remove-blocking-mrs' into 'master'
CE backport of "Add or remove blocking merge requests"
See merge request gitlab-org/gitlab-ce!30908
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/features/projects/tree/create_directory_spec.rb | 4 | ||||
| -rw-r--r-- | spec/features/projects/tree/create_file_spec.rb | 4 | ||||
| -rw-r--r-- | spec/support/capybara.rb | 1 |
3 files changed, 7 insertions, 2 deletions
diff --git a/spec/features/projects/tree/create_directory_spec.rb b/spec/features/projects/tree/create_directory_spec.rb index 2cb2a23b7be..8585e24bc35 100644 --- a/spec/features/projects/tree/create_directory_spec.rb +++ b/spec/features/projects/tree/create_directory_spec.rb @@ -47,7 +47,9 @@ describe 'Multi-file editor new directory', :js do fill_in('commit-message', with: 'commit message ide') - click_button('Commit') + page.within '.multi-file-commit-form' do + click_button('Commit') + end find('.js-ide-edit-mode').click diff --git a/spec/features/projects/tree/create_file_spec.rb b/spec/features/projects/tree/create_file_spec.rb index 9f5524da8e9..8623b10562d 100644 --- a/spec/features/projects/tree/create_file_spec.rb +++ b/spec/features/projects/tree/create_file_spec.rb @@ -39,7 +39,9 @@ describe 'Multi-file editor new file', :js do fill_in('commit-message', with: 'commit message ide') - click_button('Commit') + page.within '.multi-file-commit-form' do + click_button('Commit') + end expect(page).to have_content('file name') end diff --git a/spec/support/capybara.rb b/spec/support/capybara.rb index 56ac208a025..60990879fe2 100644 --- a/spec/support/capybara.rb +++ b/spec/support/capybara.rb @@ -58,6 +58,7 @@ Capybara.javascript_driver = :chrome Capybara.default_max_wait_time = timeout Capybara.ignore_hidden_elements = true Capybara.default_normalize_ws = true +Capybara.enable_aria_label = true # Keep only the screenshots generated from the last failing test suite Capybara::Screenshot.prune_strategy = :keep_last_run |