Add latest changes from gitlab-org/gitlab@15-3-stable-eev15.3.0-rc42

3 files changed, 27 insertions, 12 deletions

diff --git a/spec/support/shared_examples/requests/api/discussions_shared_examples.rb b/spec/support/shared_examples/requests/api/discussions_shared_examples.rb
index a12cb24a513..32562aef8d2 100644
--- a/spec/support/shared_examples/requests/api/discussions_shared_examples.rb
+++ b/spec/support/shared_examples/requests/api/discussions_shared_examples.rb
@@ -128,10 +128,10 @@ RSpec.shared_examples 'discussions API' do |parent_type, noteable_type, id_name,
         stub_feature_flags(notes_create_service_tracking: false)
       end
 
-      it 'does not track any events', :snowplow do
+      it 'does not track Notes::CreateService events', :snowplow do
         post api("/#{parent_type}/#{parent.id}/#{noteable_type}/#{noteable[id_name]}/discussions"), params: { body: 'hi!' }
 
-        expect_no_snowplow_event
+        expect_no_snowplow_event(category: 'Notes::CreateService', action: 'execute')
       end
     end
 
diff --git a/spec/support/shared_examples/requests/api/notes_shared_examples.rb b/spec/support/shared_examples/requests/api/notes_shared_examples.rb
index a59235486ec..8479493911b 100644
--- a/spec/support/shared_examples/requests/api/notes_shared_examples.rb
+++ b/spec/support/shared_examples/requests/api/notes_shared_examples.rb
@@ -376,13 +376,28 @@ RSpec.shared_examples 'noteable API with confidential notes' do |parent_type, no
       post api("/#{parent_type}/#{parent.id}/#{noteable_type}/#{noteable[id_name]}/notes", user), params: params
     end
 
-    it "creates a confidential note if confidential is set to true" do
-      post api("/#{parent_type}/#{parent.id}/#{noteable_type}/#{noteable[id_name]}/notes", user), params: params.merge(confidential: true)
+    context 'with internal param' do
+      it "creates a confidential note if internal is set to true" do
+        post api("/#{parent_type}/#{parent.id}/#{noteable_type}/#{noteable[id_name]}/notes", user), params: params.merge(internal: true)
 
-      expect(response).to have_gitlab_http_status(:created)
-      expect(json_response['body']).to eq('hi!')
-      expect(json_response['confidential']).to be_truthy
-      expect(json_response['author']['username']).to eq(user.username)
+        expect(response).to have_gitlab_http_status(:created)
+        expect(json_response['body']).to eq('hi!')
+        expect(json_response['confidential']).to be_truthy
+        expect(json_response['internal']).to be_truthy
+        expect(json_response['author']['username']).to eq(user.username)
+      end
+    end
+
+    context 'with deprecated confidential param' do
+      it "creates a confidential note if confidential is set to true" do
+        post api("/#{parent_type}/#{parent.id}/#{noteable_type}/#{noteable[id_name]}/notes", user), params: params.merge(confidential: true)
+
+        expect(response).to have_gitlab_http_status(:created)
+        expect(json_response['body']).to eq('hi!')
+        expect(json_response['confidential']).to be_truthy
+        expect(json_response['internal']).to be_truthy
+        expect(json_response['author']['username']).to eq(user.username)
+      end
     end
   end
 end
diff --git a/spec/support/shared_examples/requests/api/npm_packages_shared_examples.rb b/spec/support/shared_examples/requests/api/npm_packages_shared_examples.rb
index 8d6d85732be..b651ffc8996 100644
--- a/spec/support/shared_examples/requests/api/npm_packages_shared_examples.rb
+++ b/spec/support/shared_examples/requests/api/npm_packages_shared_examples.rb
@@ -244,7 +244,7 @@ RSpec.shared_examples 'handling get metadata requests' do |scope: :project|
       let(:headers) do
         case auth
         when :oauth
-          build_token_auth_header(token.token)
+          build_token_auth_header(token.plaintext_token)
         when :personal_access_token
           build_token_auth_header(personal_access_token.token)
         when :job_token
@@ -404,7 +404,7 @@ RSpec.shared_examples 'handling get dist tags requests' do |scope: :project|
 
   shared_examples 'handling all conditions' do
     context 'with oauth token' do
-      let(:headers) { build_token_auth_header(token.token) }
+      let(:headers) { build_token_auth_header(token.plaintext_token) }
 
       it_behaves_like 'handling different package names, visibilities and user roles'
     end
@@ -514,7 +514,7 @@ RSpec.shared_examples 'handling create dist tag requests' do |scope: :project|
 
   shared_examples 'handling all conditions' do
     context 'with oauth token' do
-      let(:headers) { build_token_auth_header(token.token) }
+      let(:headers) { build_token_auth_header(token.plaintext_token) }
 
       it_behaves_like 'handling different package names, visibilities and user roles'
     end
@@ -622,7 +622,7 @@ RSpec.shared_examples 'handling delete dist tag requests' do |scope: :project|
 
   shared_examples 'handling all conditions' do
     context 'with oauth token' do
-      let(:headers) { build_token_auth_header(token.token) }
+      let(:headers) { build_token_auth_header(token.plaintext_token) }
 
       it_behaves_like 'handling different package names, visibilities and user roles'
     end