diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-12 18:09:37 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-12 18:09:37 +0300 |
commit | 2c89e169769ead722394a79ed67fcd08e96863dd (patch) | |
tree | 0dadb576846c484475b895f75fab41f71cdb952e /spec/models/pages_domain_spec.rb | |
parent | bd497e352ebd279536ae11855871162e82a3f88c (diff) |
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 | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/spec/models/pages_domain_spec.rb b/spec/models/pages_domain_spec.rb index a88db3b87af..99b7c4f148a 100644 --- a/spec/models/pages_domain_spec.rb +++ b/spec/models/pages_domain_spec.rb @@ -352,9 +352,9 @@ describe PagesDomain do end context 'configuration updates when attributes change' do - set(:project1) { create(:project) } - set(:project2) { create(:project) } - set(:domain) { create(:pages_domain) } + let_it_be(:project1) { create(:project) } + let_it_be(:project2) { create(:project) } + let_it_be(:domain) { create(:pages_domain) } where(:attribute, :old_value, :new_value, :update_expected) do now = Time.now @@ -402,8 +402,8 @@ describe PagesDomain do end context 'TLS configuration' do - set(:domain_without_tls) { create(:pages_domain, :without_certificate, :without_key) } - set(:domain) { create(:pages_domain) } + let_it_be(:domain_without_tls) { create(:pages_domain, :without_certificate, :without_key) } + let_it_be(:domain) { create(:pages_domain) } let(:cert1) { domain.certificate } let(:cert2) { cert1 + ' ' } |