Add latest changes from gitlab-org/gitlab@master

spec/support/shared_examples/requests/rack_attack_shared_examples.rb

@@ -8,6 +8,14 @@
 # * period_in_seconds
 # * period
 shared_examples_for 'rate-limited token-authenticated requests' do
+  let(:throttle_types) do
+    {
+      "throttle_protected_paths" => "throttle_authenticated_protected_paths_api",
+      "throttle_authenticated_api" => "throttle_authenticated_api",
+      "throttle_authenticated_web" => "throttle_authenticated_web"
+    }
+  end
+
   before do
     # Set low limits
     settings_to_set[:"#{throttle_setting_prefix}_requests_per_period"] = requests_per_period
@@ -84,7 +92,8 @@ shared_examples_for 'rate-limited token-authenticated requests' do
         request_method: 'GET',
         path: get_args.first,
         user_id: user.id,
-        username: user.username
+        username: user.username,
+        throttle_type: throttle_types[throttle_setting_prefix]
       }
       expect(Gitlab::AuthLogger).to receive(:error).with(arguments).once
@@ -116,6 +125,13 @@ end
 # * period_in_seconds
 # * period
 shared_examples_for 'rate-limited web authenticated requests' do
+  let(:throttle_types) do
+    {
+      "throttle_protected_paths" => "throttle_authenticated_protected_paths_web",
+      "throttle_authenticated_web" => "throttle_authenticated_web"
+    }
+  end
+
   before do
     login_as(user)
@@ -196,7 +212,8 @@ shared_examples_for 'rate-limited web authenticated requests' do
         request_method: 'GET',
         path: '/dashboard/snippets',
         user_id: user.id,
-        username: user.username
+        username: user.username,
+        throttle_type: throttle_types[throttle_setting_prefix]
       }
       expect(Gitlab::AuthLogger).to receive(:error).with(arguments).once

spec/support/shared_examples/trackable_shared_examples.rb

+# frozen_string_literal: true
+
+shared_examples 'a Trackable Controller' do
+  describe '#track_event' do
+    before do
+      sign_in user
+    end
+
+    context 'with no params' do
+      controller(described_class) do
+        def index
+          track_event
+          head :ok
+        end
+      end
+
+      it 'tracks the action name' do
+        expect(Gitlab::Tracking).to receive(:event).with('AnonymousController', 'index', {})
+        get :index
+      end
+    end
+
+    context 'with params' do
+      controller(described_class) do
+        def index
+          track_event('some_event', category: 'SomeCategory', label: 'errorlabel')
+          head :ok
+        end
+      end
+
+      it 'tracks with the specified param' do
+        expect(Gitlab::Tracking).to receive(:event).with('SomeCategory', 'some_event', label: 'errorlabel')
+        get :index
+      end
+    end
+  end
+end