diff options
author | Nick Thomas <nick@gitlab.com> | 2017-03-08 16:45:59 +0000 |
---|---|---|
committer | Nick Thomas <nick@gitlab.com> | 2017-03-08 16:46:02 +0000 |
commit | 75e78f108f850fe6c70c04a13747d2c40a511774 (patch) | |
tree | 884aae4d94707a90e81dc95ce329ffda15b832ca /features | |
parent | d34300e310eca8b02c2b3956cd7c321edb3a5d0d (diff) | |
download | gitlab-ce-75e78f108f850fe6c70c04a13747d2c40a511774.tar.gz |
The GitLab Pages external-http and external-https arguments can be specified multiple times
Diffstat (limited to 'features')
-rw-r--r-- | features/steps/project/pages.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/features/steps/project/pages.rb b/features/steps/project/pages.rb index c80c6273807..4045955a8b9 100644 --- a/features/steps/project/pages.rb +++ b/features/steps/project/pages.rb @@ -53,13 +53,13 @@ class Spinach::Features::ProjectPages < Spinach::FeatureSteps end step 'pages are exposed on external HTTP address' do - allow(Gitlab.config.pages).to receive(:external_http).and_return('1.1.1.1:80') + allow(Gitlab.config.pages).to receive(:external_http).and_return(['1.1.1.1:80']) allow(Gitlab.config.pages).to receive(:external_https).and_return(nil) end step 'pages are exposed on external HTTPS address' do - allow(Gitlab.config.pages).to receive(:external_http).and_return('1.1.1.1:80') - allow(Gitlab.config.pages).to receive(:external_https).and_return('1.1.1.1:443') + allow(Gitlab.config.pages).to receive(:external_http).and_return(['1.1.1.1:80']) + allow(Gitlab.config.pages).to receive(:external_https).and_return(['1.1.1.1:443']) end step 'I should be able to add a New Domain' do |