Add latest changes from gitlab-org/gitlab@master

2 files changed, 25 insertions, 5 deletions

diff --git a/spec/lib/gitlab/auth/auth_finders_spec.rb b/spec/lib/gitlab/auth/auth_finders_spec.rb
index 1a1e165c50a..e5e93fa5cc1 100644
--- a/spec/lib/gitlab/auth/auth_finders_spec.rb
+++ b/spec/lib/gitlab/auth/auth_finders_spec.rb
@@ -516,12 +516,32 @@ RSpec.describe Gitlab::Auth::AuthFinders, feature_category: :system_access do
           set_bearer_token(token_3.token)
         end
 
-        it 'revokes the latest rotated token' do
-          expect(token_1).not_to be_revoked
+        context 'with url related to access tokens' do
+          before do
+            set_header('SCRIPT_NAME', "/personal_access_tokens/#{token_3.id}/rotate")
+          end
+
+          it 'revokes the latest rotated token' do
+            expect(token_1).not_to be_revoked
+
+            expect { find_user_from_access_token }.to raise_error(Gitlab::Auth::RevokedError)
+
+            expect(token_1.reload).to be_revoked
+          end
+        end
 
-          expect { find_user_from_access_token }.to raise_error(Gitlab::Auth::RevokedError)
+        context 'with url not related to access tokens' do
+          before do
+            set_header('SCRIPT_NAME', '/epics/1')
+          end
+
+          it 'does not revoke the latest rotated token' do
+            expect(token_1).not_to be_revoked
 
-          expect(token_1.reload).to be_revoked
+            expect { find_user_from_access_token }.to raise_error(Gitlab::Auth::RevokedError)
+
+            expect(token_1.reload).not_to be_revoked
+          end
         end
 
         context 'when the feature flag is disabled' do
diff --git a/spec/lib/gitlab/import_export/project/relation_tree_restorer_spec.rb b/spec/lib/gitlab/import_export/project/relation_tree_restorer_spec.rb
index 180a6b6ff0a..0f4f2eb573c 100644
--- a/spec/lib/gitlab/import_export/project/relation_tree_restorer_spec.rb
+++ b/spec/lib/gitlab/import_export/project/relation_tree_restorer_spec.rb
@@ -60,7 +60,7 @@ RSpec.describe Gitlab::ImportExport::Project::RelationTreeRestorer, feature_cate
     let(:relation_reader) { Gitlab::ImportExport::Json::NdjsonReader.new(path) }
 
     let_it_be(:group) do
-      create(:group, :disabled_and_unoverridable).tap { |g| g.add_maintainer(user) }
+      create(:group, :shared_runners_disabled_and_unoverridable).tap { |g| g.add_maintainer(user) }
     end
 
     before do