From ae93b284016c07a8a4b47e2510789253d14870f3 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 14 Apr 2020 21:09:52 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- spec/features/dashboard/shortcuts_spec.rb | 4 ++++ spec/features/projects/pages_lets_encrypt_spec.rb | 16 ++++++++++++++++ 2 files changed, 20 insertions(+) (limited to 'spec/features') diff --git a/spec/features/dashboard/shortcuts_spec.rb b/spec/features/dashboard/shortcuts_spec.rb index 2cd9cbc4471..6907c681417 100644 --- a/spec/features/dashboard/shortcuts_spec.rb +++ b/spec/features/dashboard/shortcuts_spec.rb @@ -26,6 +26,10 @@ describe 'Dashboard shortcuts', :js do check_page_title('To-Do List') + find('body').send_keys([:shift, 'G']) + + check_page_title('Groups') + find('body').send_keys([:shift, 'P']) check_page_title('Projects') diff --git a/spec/features/projects/pages_lets_encrypt_spec.rb b/spec/features/projects/pages_lets_encrypt_spec.rb index 4f9c1903344..da9b191271a 100644 --- a/spec/features/projects/pages_lets_encrypt_spec.rb +++ b/spec/features/projects/pages_lets_encrypt_spec.rb @@ -85,6 +85,22 @@ describe "Pages with Let's Encrypt", :https_pages_enabled do end end + context "when we failed to obtain Let's Encrypt certificate", :js do + let(:domain) do + create(:pages_domain, auto_ssl_enabled: true, auto_ssl_failed: true, project: project) + end + + it 'user can retry obtaining certificate' do + visit project_pages_domain_path(project, domain) + + expect(page).to have_text("Something went wrong while obtaining the Let's Encrypt certificate.") + + click_on('Retry') + + expect(page).to have_text("GitLab is obtaining a Let's Encrypt SSL certificate for this domain. This process can take some time. Please try again later.") + end + end + shared_examples 'user sees private keys only for user provided certificate' do shared_examples 'user do not see private key' do it 'user do not see private key' do -- cgit v1.2.1