diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-01 00:08:41 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-01 00:08:41 +0000 |
commit | 72817fd7c07d1b812623f8d5e27fc7bcecb4eed5 (patch) | |
tree | 2e81b28a062212375bf17d1da0ff836d6b021469 /spec/models/pages_domain_spec.rb | |
parent | 9db503ef9888c984b287af44d009d884e835ce04 (diff) | |
download | gitlab-ce-72817fd7c07d1b812623f8d5e27fc7bcecb4eed5.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/models/pages_domain_spec.rb')
-rw-r--r-- | spec/models/pages_domain_spec.rb | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/spec/models/pages_domain_spec.rb b/spec/models/pages_domain_spec.rb index b1df13e8c2a..a88db3b87af 100644 --- a/spec/models/pages_domain_spec.rb +++ b/spec/models/pages_domain_spec.rb @@ -180,8 +180,12 @@ describe PagesDomain do expect(subject.wildcard).to eq(false) end - it 'defaults domain_type to project' do - expect(subject.domain_type).to eq('project') + it 'defaults scope to project' do + expect(subject.scope).to eq('project') + end + + it 'defaults usage to pages' do + expect(subject.usage).to eq('pages') end end @@ -315,11 +319,11 @@ describe PagesDomain do end describe '#update_daemon' do - context 'when domain_type is instance' do - it 'does nothing' do + context 'when usage is serverless' do + it 'does not call the UpdatePagesConfigurationService' do expect(Projects::UpdatePagesConfigurationService).not_to receive(:new) - create(:pages_domain, domain_type: :instance) + create(:pages_domain, usage: :serverless) end end |