summaryrefslogtreecommitdiff
path: root/spec/views
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-05-15 15:49:40 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-05-15 15:49:40 +0000
commitb04b1e12c5847f7d366e08af47115d985b73e185 (patch)
tree5077e33eedbf1e99b9ef9b87395f9acce844b234 /spec/views
parenta5b9fb9abc2b83304f45392642801b28f52b3f48 (diff)
downloadgitlab-ce-b04b1e12c5847f7d366e08af47115d985b73e185.tar.gz
Add latest changes from gitlab-org/gitlab@12-10-stable-ee
Diffstat (limited to 'spec/views')
-rw-r--r--spec/views/projects/pages_domains/show.html.haml_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/views/projects/pages_domains/show.html.haml_spec.rb b/spec/views/projects/pages_domains/show.html.haml_spec.rb
index 7d502e74d10..2de82a63560 100644
--- a/spec/views/projects/pages_domains/show.html.haml_spec.rb
+++ b/spec/views/projects/pages_domains/show.html.haml_spec.rb
@@ -7,7 +7,7 @@ describe 'projects/pages_domains/show' do
before do
assign(:project, project)
- assign(:domain, domain.present)
+ allow(view).to receive(:domain_presenter).and_return(domain.present)
stub_pages_setting(external_https: true)
end