Add latest changes from gitlab-org/gitlab@master

2 files changed, 25 insertions, 10 deletions

diff --git a/spec/services/audit_event_service_spec.rb b/spec/services/audit_event_service_spec.rb
index 2654ea1ac22..ce7b43972da 100644
--- a/spec/services/audit_event_service_spec.rb
+++ b/spec/services/audit_event_service_spec.rb
@@ -79,15 +79,14 @@ RSpec.describe AuditEventService do
       context 'with IP address', :request_store do
         using RSpec::Parameterized::TableSyntax
 
-        where(:from_caller, :from_context, :from_author_sign_in, :output) do
-          '192.168.0.1' | '192.168.0.2' | '192.168.0.3' | '192.168.0.1'
-          nil           | '192.168.0.2' | '192.168.0.3' | '192.168.0.2'
-          nil           | nil           | '192.168.0.3' | '192.168.0.3'
+        where(:from_context, :from_author_sign_in, :output) do
+          '192.168.0.2' | '192.168.0.3' | '192.168.0.2'
+          nil           | '192.168.0.3' | '192.168.0.3'
         end
 
         with_them do
           let(:user) { create(:user, current_sign_in_ip: from_author_sign_in) }
-          let(:audit_service) { described_class.new(user, user, with: 'standard', ip_address: from_caller) }
+          let(:audit_service) { described_class.new(user, user, with: 'standard') }
 
           before do
             allow(Gitlab::RequestContext.instance).to receive(:client_ip).and_return(from_context)
diff --git a/spec/services/resource_access_tokens/create_service_spec.rb b/spec/services/resource_access_tokens/create_service_spec.rb
index bd7c44c6e03..11069dc1bb8 100644
--- a/spec/services/resource_access_tokens/create_service_spec.rb
+++ b/spec/services/resource_access_tokens/create_service_spec.rb
@@ -88,12 +88,28 @@ RSpec.describe ResourceAccessTokens::CreateService do
         end
       end
 
-      it 'adds the bot user as a maintainer in the resource' do
-        response = subject
-        access_token = response.payload[:access_token]
-        bot_user = access_token.user
+      context 'access level' do
+        context 'when user does not specify an access level' do
+          it 'adds the bot user as a maintainer in the resource' do
+            response = subject
+            access_token = response.payload[:access_token]
+            bot_user = access_token.user
+
+            expect(resource.members.maintainers.map(&:user_id)).to include(bot_user.id)
+          end
+        end
 
-        expect(resource.members.maintainers.map(&:user_id)).to include(bot_user.id)
+        context 'when user specifies an access level' do
+          let_it_be(:params) { { access_level: Gitlab::Access::DEVELOPER } }
+
+          it 'adds the bot user with the specified access level in the resource' do
+            response = subject
+            access_token = response.payload[:access_token]
+            bot_user = access_token.user
+
+            expect(resource.members.developers.map(&:user_id)).to include(bot_user.id)
+          end
+        end
       end
 
       context 'personal access token' do