diff options
author | Dylan Griffith <dyl.griffith@gmail.com> | 2018-04-20 07:17:00 +0300 |
---|---|---|
committer | Dylan Griffith <dyl.griffith@gmail.com> | 2018-05-15 11:36:57 +0300 |
commit | 46eeaafc255f9cc037f2656fcace67085519bf29 (patch) | |
tree | 54c5d5056925e90d2e54d9192ffff6be95ef26f9 /spec | |
parent | 416a5450e4d8598e87f96f9edc57983502b42397 (diff) |
Display help text below auto devops domain with nip.io domain name (#45561)
Diffstat (limited to 'spec')
-rw-r--r-- | spec/features/projects/settings/pipelines_settings_spec.rb | 23 | ||||
-rw-r--r-- | spec/lib/gitlab/import_export/all_models.yml | 1 |
2 files changed, 24 insertions, 0 deletions
diff --git a/spec/features/projects/settings/pipelines_settings_spec.rb b/spec/features/projects/settings/pipelines_settings_spec.rb index e875a88a52b..cfdae246c09 100644 --- a/spec/features/projects/settings/pipelines_settings_spec.rb +++ b/spec/features/projects/settings/pipelines_settings_spec.rb @@ -75,6 +75,29 @@ describe "Projects > Settings > Pipelines settings" do expect(project.auto_devops).not_to be_enabled expect(project.auto_devops.domain).to eq('test.com') end + + context 'when there is a cluster with ingress and external_ip' do + before do + cluster = create(:cluster, projects: [project]) + cluster.create_application_ingress!(external_ip: '192.168.1.100') + end + + it 'shows the help text with the nip.io domain as an alternative to custom domain' do + visit project_settings_ci_cd_path(project) + expect(page).to have_content('192.168.1.100.nip.io can be used as an alternative to a custom domain') + end + end + + context 'when there is no ingress' do + before do + create(:cluster, projects: [project]) + end + + it 'alternative to custom domain is not shown' do + visit project_settings_ci_cd_path(project) + expect(page).not_to have_content('can be used as an alternative to a custom domain') + end + end end end end diff --git a/spec/lib/gitlab/import_export/all_models.yml b/spec/lib/gitlab/import_export/all_models.yml index ad76adcc2e5..8b46b04b8b5 100644 --- a/spec/lib/gitlab/import_export/all_models.yml +++ b/spec/lib/gitlab/import_export/all_models.yml @@ -185,6 +185,7 @@ project: - cluster - clusters - cluster_project +- cluster_ingresses - creator - group - namespace |