Add latest changes from gitlab-org/gitlab@master

2 files changed, 6 insertions, 3 deletions

diff --git a/spec/controllers/concerns/redis_tracking_spec.rb b/spec/controllers/concerns/redis_tracking_spec.rb
index 4077f4f5cce..178684ae2d0 100644
--- a/spec/controllers/concerns/redis_tracking_spec.rb
+++ b/spec/controllers/concerns/redis_tracking_spec.rb
@@ -3,6 +3,8 @@
 require "spec_helper"
 
 RSpec.describe RedisTracking do
+  include TrackingHelpers
+
   let(:user) { create(:user) }
 
   controller(ApplicationController) do
@@ -60,7 +62,7 @@ RSpec.describe RedisTracking do
     end
 
     it 'tracks the event if DNT is not enabled' do
-      request.headers['DNT'] = '0'
+      stub_do_not_track('0')
 
       expect_tracking
 
@@ -68,7 +70,7 @@ RSpec.describe RedisTracking do
     end
 
     it 'does not track the event if DNT is enabled' do
-      request.headers['DNT'] = '1'
+      stub_do_not_track('1')
 
       expect_no_tracking
 
diff --git a/spec/controllers/projects/merge_requests/diffs_controller_spec.rb b/spec/controllers/projects/merge_requests/diffs_controller_spec.rb
index 71030b5b01c..3d7636b1f30 100644
--- a/spec/controllers/projects/merge_requests/diffs_controller_spec.rb
+++ b/spec/controllers/projects/merge_requests/diffs_controller_spec.rb
@@ -4,6 +4,7 @@ require 'spec_helper'
 
 RSpec.describe Projects::MergeRequests::DiffsController do
   include ProjectForksHelper
+  include TrackingHelpers
 
   shared_examples '404 for unexistent diffable' do
     context 'when diffable does not exists' do
@@ -447,7 +448,7 @@ RSpec.describe Projects::MergeRequests::DiffsController do
 
       context 'when DNT is enabled' do
         before do
-          request.headers['DNT'] = '1'
+          stub_do_not_track('1')
         end
 
         it 'does not track any mr_diffs event' do