Add latest changes from gitlab-org/gitlab@master

3 files changed, 27 insertions, 37 deletions

diff --git a/spec/requests/api/debian_group_packages_spec.rb b/spec/requests/api/debian_group_packages_spec.rb
index 8a05d20fb33..9d63d675a02 100644
--- a/spec/requests/api/debian_group_packages_spec.rb
+++ b/spec/requests/api/debian_group_packages_spec.rb
@@ -6,32 +6,32 @@ RSpec.describe API::DebianGroupPackages do
   include WorkhorseHelpers
 
   include_context 'Debian repository shared context', :group do
-    describe 'GET groups/:id/-/packages/debian/dists/*distribution/Release.gpg' do
-      let(:url) { "/groups/#{group.id}/-/packages/debian/dists/#{distribution}/Release.gpg" }
+    describe 'GET groups/:id/packages/debian/dists/*distribution/Release.gpg' do
+      let(:url) { "/groups/#{group.id}/packages/debian/dists/#{distribution}/Release.gpg" }
 
       it_behaves_like 'Debian group repository GET endpoint', :not_found, nil
     end
 
-    describe 'GET groups/:id/-/packages/debian/dists/*distribution/Release' do
-      let(:url) { "/groups/#{group.id}/-/packages/debian/dists/#{distribution}/Release" }
+    describe 'GET groups/:id/packages/debian/dists/*distribution/Release' do
+      let(:url) { "/groups/#{group.id}/packages/debian/dists/#{distribution}/Release" }
 
       it_behaves_like 'Debian group repository GET endpoint', :success, 'TODO Release'
     end
 
-    describe 'GET groups/:id/-/packages/debian/dists/*distribution/InRelease' do
-      let(:url) { "/groups/#{group.id}/-/packages/debian/dists/#{distribution}/InRelease" }
+    describe 'GET groups/:id/packages/debian/dists/*distribution/InRelease' do
+      let(:url) { "/groups/#{group.id}/packages/debian/dists/#{distribution}/InRelease" }
 
       it_behaves_like 'Debian group repository GET endpoint', :not_found, nil
     end
 
-    describe 'GET groups/:id/-/packages/debian/dists/*distribution/:component/binary-:architecture/Packages' do
-      let(:url) { "/groups/#{group.id}/-/packages/debian/dists/#{distribution}/#{component}/binary-#{architecture}/Packages" }
+    describe 'GET groups/:id/packages/debian/dists/*distribution/:component/binary-:architecture/Packages' do
+      let(:url) { "/groups/#{group.id}/packages/debian/dists/#{distribution}/#{component}/binary-#{architecture}/Packages" }
 
       it_behaves_like 'Debian group repository GET endpoint', :success, 'TODO Packages'
     end
 
-    describe 'GET groups/:id/-/packages/debian/pool/:component/:letter/:source_package/:file_name' do
-      let(:url) { "/groups/#{group.id}/-/packages/debian/pool/#{component}/#{letter}/#{source_package}/#{package_name}_#{package_version}_#{architecture}.deb" }
+    describe 'GET groups/:id/packages/debian/pool/:component/:letter/:source_package/:file_name' do
+      let(:url) { "/groups/#{group.id}/packages/debian/pool/#{component}/#{letter}/#{source_package}/#{package_name}_#{package_version}_#{architecture}.deb" }
 
       it_behaves_like 'Debian group repository GET endpoint', :success, 'TODO File'
     end
diff --git a/spec/requests/api/debian_project_packages_spec.rb b/spec/requests/api/debian_project_packages_spec.rb
index 663b69b1b76..4941f2a77f4 100644
--- a/spec/requests/api/debian_project_packages_spec.rb
+++ b/spec/requests/api/debian_project_packages_spec.rb
@@ -6,46 +6,46 @@ RSpec.describe API::DebianProjectPackages do
   include WorkhorseHelpers
 
   include_context 'Debian repository shared context', :project do
-    describe 'GET projects/:id/-/packages/debian/dists/*distribution/Release.gpg' do
-      let(:url) { "/projects/#{project.id}/-/packages/debian/dists/#{distribution}/Release.gpg" }
+    describe 'GET projects/:id/packages/debian/dists/*distribution/Release.gpg' do
+      let(:url) { "/projects/#{project.id}/packages/debian/dists/#{distribution}/Release.gpg" }
 
       it_behaves_like 'Debian project repository GET endpoint', :not_found, nil
     end
 
-    describe 'GET projects/:id/-/packages/debian/dists/*distribution/Release' do
-      let(:url) { "/projects/#{project.id}/-/packages/debian/dists/#{distribution}/Release" }
+    describe 'GET projects/:id/packages/debian/dists/*distribution/Release' do
+      let(:url) { "/projects/#{project.id}/packages/debian/dists/#{distribution}/Release" }
 
       it_behaves_like 'Debian project repository GET endpoint', :success, 'TODO Release'
     end
 
-    describe 'GET projects/:id/-/packages/debian/dists/*distribution/InRelease' do
-      let(:url) { "/projects/#{project.id}/-/packages/debian/dists/#{distribution}/InRelease" }
+    describe 'GET projects/:id/packages/debian/dists/*distribution/InRelease' do
+      let(:url) { "/projects/#{project.id}/packages/debian/dists/#{distribution}/InRelease" }
 
       it_behaves_like 'Debian project repository GET endpoint', :not_found, nil
     end
 
-    describe 'GET projects/:id/-/packages/debian/dists/*distribution/:component/binary-:architecture/Packages' do
-      let(:url) { "/projects/#{project.id}/-/packages/debian/dists/#{distribution}/#{component}/binary-#{architecture}/Packages" }
+    describe 'GET projects/:id/packages/debian/dists/*distribution/:component/binary-:architecture/Packages' do
+      let(:url) { "/projects/#{project.id}/packages/debian/dists/#{distribution}/#{component}/binary-#{architecture}/Packages" }
 
       it_behaves_like 'Debian project repository GET endpoint', :success, 'TODO Packages'
     end
 
-    describe 'GET projects/:id/-/packages/debian/pool/:component/:letter/:source_package/:file_name' do
-      let(:url) { "/projects/#{project.id}/-/packages/debian/pool/#{component}/#{letter}/#{source_package}/#{package_name}_#{package_version}_#{architecture}.deb" }
+    describe 'GET projects/:id/packages/debian/pool/:component/:letter/:source_package/:file_name' do
+      let(:url) { "/projects/#{project.id}/packages/debian/pool/#{component}/#{letter}/#{source_package}/#{package_name}_#{package_version}_#{architecture}.deb" }
 
       it_behaves_like 'Debian project repository GET endpoint', :success, 'TODO File'
     end
 
-    describe 'PUT projects/:id/-/packages/debian/incoming/:file_name' do
+    describe 'PUT projects/:id/packages/debian/:file_name' do
       let(:method) { :put }
-      let(:url) { "/projects/#{project.id}/-/packages/debian/incoming/#{file_name}" }
+      let(:url) { "/projects/#{project.id}/packages/debian/#{file_name}" }
 
       it_behaves_like 'Debian project repository PUT endpoint', :created, nil
     end
 
-    describe 'PUT projects/:id/-/packages/debian/incoming/:file_name/authorize' do
+    describe 'PUT projects/:id/packages/debian/:file_name/authorize' do
       let(:method) { :put }
-      let(:url) { "/projects/#{project.id}/-/packages/debian/incoming/#{file_name}/authorize" }
+      let(:url) { "/projects/#{project.id}/packages/debian/#{file_name}/authorize" }
 
       it_behaves_like 'Debian project repository PUT endpoint', :created, nil, is_authorize: true
     end
diff --git a/spec/requests/api/graphql/mutations/alert_management/http_integration/update_spec.rb b/spec/requests/api/graphql/mutations/alert_management/http_integration/update_spec.rb
index bf7eb3d980c..18cbb7d8b00 100644
--- a/spec/requests/api/graphql/mutations/alert_management/http_integration/update_spec.rb
+++ b/spec/requests/api/graphql/mutations/alert_management/http_integration/update_spec.rb
@@ -5,7 +5,7 @@ require 'spec_helper'
 RSpec.describe 'Updating an existing HTTP Integration' do
   include GraphqlHelpers
 
-  let_it_be(:user) { create(:user) }
+  let_it_be(:current_user) { create(:user) }
   let_it_be(:project) { create(:project) }
   let_it_be(:integration) { create(:alert_management_http_integration, project: project) }
 
@@ -32,18 +32,8 @@ RSpec.describe 'Updating an existing HTTP Integration' do
   let(:mutation_response) { graphql_mutation_response(:http_integration_update) }
 
   before do
-    project.add_maintainer(user)
+    project.add_maintainer(current_user)
   end
 
-  it 'updates the integration' do
-    post_graphql_mutation(mutation, current_user: user)
-
-    integration_response = mutation_response['integration']
-
-    expect(response).to have_gitlab_http_status(:success)
-    expect(integration_response['id']).to eq(GitlabSchema.id_from_object(integration).to_s)
-    expect(integration_response['name']).to eq('Modified Name')
-    expect(integration_response['active']).to be_falsey
-    expect(integration_response['url']).to include('modified-name')
-  end
+  it_behaves_like 'updating an existing HTTP integration'
 end