Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2019-02-26 15:32:45 +0300
committerFilipa Lacerda <filipa@gitlab.com>2019-02-26 15:32:45 +0300
commitaa868886437cfe6b2110cb5fe927bb90078a081e (patch)
tree78dd5902a206d38063c60455b50de1f2048fdb56 /spec
parentcb567131679be52d1d41da6ff580f1530242b72e (diff)
parentf31489204e402216483b1829cb1fdc9c8b0f2fc0 (diff)
Merge branch 'patch-45' into 'master'
Fix incorrect checkbox description. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/56519 Closes #56519 See merge request gitlab-org/gitlab-ce!25392
Diffstat (limited to 'spec')
-rw-r--r--spec/features/projects/pages_spec.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/features/projects/pages_spec.rb b/spec/features/projects/pages_spec.rb
index 72faeba92ee..f564ae34f11 100644
--- a/spec/features/projects/pages_spec.rb
+++ b/spec/features/projects/pages_spec.rb
@@ -212,7 +212,7 @@ describe 'Pages' do
it 'tries to change the setting' do
visit project_pages_path(project)
- expect(page).to have_content("Force domains with SSL certificates to use HTTPS")
+ expect(page).to have_content("Force HTTPS (requires valid certificates)")
uncheck :project_pages_https_only
@@ -261,7 +261,7 @@ describe 'Pages' do
visit project_pages_path(project)
expect(page).not_to have_field(:project_pages_https_only)
- expect(page).not_to have_content('Force domains with SSL certificates to use HTTPS')
+ expect(page).not_to have_content('Force HTTPS (requires valid certificates)')
expect(page).not_to have_button('Save')
end
end