Add latest changes from gitlab-org/gitlab@master

1 files changed, 9 insertions, 2 deletions

diff --git a/spec/views/layouts/_head.html.haml_spec.rb b/spec/views/layouts/_head.html.haml_spec.rb
index 59406bca813..7011fa23327 100644
--- a/spec/views/layouts/_head.html.haml_spec.rb
+++ b/spec/views/layouts/_head.html.haml_spec.rb
@@ -64,18 +64,25 @@ describe 'layouts/_head' do
 
   context 'when an asset_host is set and snowplow url is set' do
     let(:asset_host) { 'http://test.host' }
+    let(:snowplow_collector_hostname) { 'www.snow.plow' }
 
     before do
       allow(ActionController::Base).to receive(:asset_host).and_return(asset_host)
       allow(Gitlab::CurrentSettings).to receive(:snowplow_enabled?).and_return(true)
-      allow(Gitlab::CurrentSettings).to receive(:snowplow_collector_hostname).and_return('www.snow.plow')
+      allow(Gitlab::CurrentSettings).to receive(:snowplow_collector_hostname).and_return(snowplow_collector_hostname)
     end
 
     it 'adds a snowplow script tag with asset host' do
       render
       expect(rendered).to match('http://test.host/assets/snowplow/')
       expect(rendered).to match('window.snowplow')
-      expect(rendered).to match('www.snow.plow')
+      expect(rendered).to match(snowplow_collector_hostname)
+    end
+
+    it 'adds a link preconnect tag' do
+      render
+
+      expect(rendered).to match(%Q(<link crossorigin="" href="#{snowplow_collector_hostname}" rel="preconnect">))
     end
   end