diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-24 01:43:31 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-24 01:43:31 +0000 |
commit | e20a1cde5d740fbc9f4d033786a8cd5ad7eb8b4d (patch) | |
tree | cf76b0527f1909eaf1ecac057a4ccc7591cce4f6 /spec/support | |
parent | 5fc725def41e6973e92bc32095774edd60fd154f (diff) | |
download | gitlab-ce-e20a1cde5d740fbc9f4d033786a8cd5ad7eb8b4d.tar.gz |
Add latest changes from gitlab-org/gitlab@12-10-stable-ee
Diffstat (limited to 'spec/support')
3 files changed, 11 insertions, 6 deletions
diff --git a/spec/support/helpers/features/web_ide_spec_helpers.rb b/spec/support/helpers/features/web_ide_spec_helpers.rb index 37c8345a4e5..123bd9b5070 100644 --- a/spec/support/helpers/features/web_ide_spec_helpers.rb +++ b/spec/support/helpers/features/web_ide_spec_helpers.rb @@ -32,6 +32,10 @@ module WebIdeSpecHelpers page.find('.ide-tree-actions') end + def ide_tab_selector(mode) + ".js-ide-#{mode}-mode" + end + def ide_file_row_open?(row) row.matches_css?('.is-open') end @@ -106,16 +110,16 @@ module WebIdeSpecHelpers evaluate_script("monaco.editor.getModel('#{uri}').getValue()") end + def ide_commit_tab_selector + ide_tab_selector('commit') + end + def ide_commit - ide_switch_mode('commit') + find(ide_commit_tab_selector).click commit_to_current_branch end - def ide_switch_mode(mode) - find(".js-ide-#{mode}-mode").click - end - private def file_row_container(row) diff --git a/spec/support/shared_contexts/navbar_structure_context.rb b/spec/support/shared_contexts/navbar_structure_context.rb index e4bc44c9d32..4606608866a 100644 --- a/spec/support/shared_contexts/navbar_structure_context.rb +++ b/spec/support/shared_contexts/navbar_structure_context.rb @@ -111,6 +111,7 @@ RSpec.shared_context 'group navbar structure' do nav_sub_items: [ _('General'), _('Projects'), + _('Repository'), _('CI / CD'), _('Integrations'), _('Webhooks'), diff --git a/spec/support/shared_examples/features/deploy_token_shared_examples.rb b/spec/support/shared_examples/features/deploy_token_shared_examples.rb index f358615ee9e..fd77297a490 100644 --- a/spec/support/shared_examples/features/deploy_token_shared_examples.rb +++ b/spec/support/shared_examples/features/deploy_token_shared_examples.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -RSpec.shared_examples 'a deploy token in ci/cd settings' do +RSpec.shared_examples 'a deploy token in settings' do it 'view deploy tokens' do within('.deploy-tokens') do expect(page).to have_content(deploy_token.name) |