diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-08-15 12:10:30 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-08-15 12:10:30 +0300 |
commit | cd5f4619db234c00d0c01ed63bb92df6c10b0fd3 (patch) | |
tree | 09ef12a2231c616d4f747b9d5b83597ae179bb06 /spec/features | |
parent | 024f77efd68833bb78540ff9b4c7b4ec4b9dfe39 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/features')
-rw-r--r-- | spec/features/issues/service_desk_spec.rb | 2 | ||||
-rw-r--r-- | spec/features/projects/settings/user_interacts_with_deploy_keys_spec.rb | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/spec/features/issues/service_desk_spec.rb b/spec/features/issues/service_desk_spec.rb index 6aa7788b8e1..1b99c8b39d3 100644 --- a/spec/features/issues/service_desk_spec.rb +++ b/spec/features/issues/service_desk_spec.rb @@ -233,7 +233,7 @@ RSpec.describe 'Service Desk Issue Tracker', :js, feature_category: :service_des it 'displays the small info box, documentation, a button to configure service desk, and the address' do aggregate_failures do - expect(page).to have_link('Learn more about Service Desk', href: help_page_path('user/project/service_desk')) + expect(page).to have_link('Learn more about Service Desk', href: help_page_path('user/project/service_desk/index')) expect(page).not_to have_link('Enable Service Desk') expect(page).to have_content(project.service_desk_address) end diff --git a/spec/features/projects/settings/user_interacts_with_deploy_keys_spec.rb b/spec/features/projects/settings/user_interacts_with_deploy_keys_spec.rb index 0006762a971..4e8f42ae792 100644 --- a/spec/features/projects/settings/user_interacts_with_deploy_keys_spec.rb +++ b/spec/features/projects/settings/user_interacts_with_deploy_keys_spec.rb @@ -91,6 +91,7 @@ RSpec.describe "User interacts with deploy keys", :js, feature_category: :groups deploy_key_title = attributes_for(:key)[:title] deploy_key_body = attributes_for(:key)[:key] + click_button("Add new key") fill_in("deploy_key_title", with: deploy_key_title) fill_in("deploy_key_key", with: deploy_key_body) @@ -102,6 +103,16 @@ RSpec.describe "User interacts with deploy keys", :js, feature_category: :groups expect(page).to have_content(deploy_key_title) end end + + it "click on cancel hides the form" do + click_button("Add new key") + + expect(page).to have_css('.gl-new-card-add-form') + + click_button("Cancel") + + expect(page).not_to have_css('.gl-new-card-add-form') + end end context "attaching existing keys" do |