Add latest changes from gitlab-org/gitlab@master

3 files changed, 25 insertions, 4 deletions

diff --git a/spec/requests/api/graphql/mutations/namespace/package_settings/update_spec.rb b/spec/requests/api/graphql/mutations/namespace/package_settings/update_spec.rb
index 738dc3078e7..05c1a2d96d9 100644
--- a/spec/requests/api/graphql/mutations/namespace/package_settings/update_spec.rb
+++ b/spec/requests/api/graphql/mutations/namespace/package_settings/update_spec.rb
@@ -22,7 +22,8 @@ RSpec.describe 'Updating the package settings', feature_category: :package_regis
       npm_package_requests_forwarding: true,
       lock_npm_package_requests_forwarding: true,
       pypi_package_requests_forwarding: true,
-      lock_pypi_package_requests_forwarding: true
+      lock_pypi_package_requests_forwarding: true,
+      nuget_symbol_server_enabled: true
     }
   end
 
@@ -42,6 +43,7 @@ RSpec.describe 'Updating the package settings', feature_category: :package_regis
           lockNpmPackageRequestsForwarding
           pypiPackageRequestsForwarding
           lockPypiPackageRequestsForwarding
+          nugetSymbolServerEnabled
         }
         errors
       QL
@@ -70,6 +72,7 @@ RSpec.describe 'Updating the package settings', feature_category: :package_regis
       expect(package_settings_response['lockPypiPackageRequestsForwarding']).to eq(params[:lock_pypi_package_requests_forwarding])
       expect(package_settings_response['npmPackageRequestsForwarding']).to eq(params[:npm_package_requests_forwarding])
       expect(package_settings_response['lockNpmPackageRequestsForwarding']).to eq(params[:lock_npm_package_requests_forwarding])
+      expect(package_settings_response['nugetSymbolServerEnabled']).to eq(params[:nuget_symbol_server_enabled])
     end
   end
 
@@ -111,7 +114,8 @@ RSpec.describe 'Updating the package settings', feature_category: :package_regis
         npm_package_requests_forwarding: nil,
         lock_npm_package_requests_forwarding: false,
         pypi_package_requests_forwarding: nil,
-        lock_pypi_package_requests_forwarding: false
+        lock_pypi_package_requests_forwarding: false,
+        nuget_symbol_server_enabled: false
       }, to: {
         maven_duplicates_allowed: false,
         maven_duplicate_exception_regex: 'foo-.*',
@@ -124,7 +128,8 @@ RSpec.describe 'Updating the package settings', feature_category: :package_regis
         npm_package_requests_forwarding: true,
         lock_npm_package_requests_forwarding: true,
         pypi_package_requests_forwarding: true,
-        lock_pypi_package_requests_forwarding: true
+        lock_pypi_package_requests_forwarding: true,
+        nuget_symbol_server_enabled: true
       }
 
     it_behaves_like 'returning a success'
diff --git a/spec/requests/legacy_routes_spec.rb b/spec/requests/legacy_routes_spec.rb
index f1e93be5ce3..537ad4054a1 100644
--- a/spec/requests/legacy_routes_spec.rb
+++ b/spec/requests/legacy_routes_spec.rb
@@ -37,4 +37,20 @@ RSpec.describe "Legacy routes", type: :request, feature_category: :system_access
     get "/-/profile/applications"
     expect(response).to redirect_to('/-/user_settings/applications')
   end
+
+  it "/-/profile/password/new" do
+    get "/-/profile/password/new"
+    expect(response).to redirect_to('/-/user_settings/password/new')
+
+    get "/-/profile/password/new?abc=xyz"
+    expect(response).to redirect_to('/-/user_settings/password/new?abc=xyz')
+  end
+
+  it "/-/profile/password/edit" do
+    get "/-/profile/password/edit"
+    expect(response).to redirect_to('/-/user_settings/password/edit')
+
+    get "/-/profile/password/edit?abc=xyz"
+    expect(response).to redirect_to('/-/user_settings/password/edit?abc=xyz')
+  end
 end
diff --git a/spec/requests/well_known_spec.rb b/spec/requests/well_known_spec.rb
index 9db1f63690f..6236acac3ab 100644
--- a/spec/requests/well_known_spec.rb
+++ b/spec/requests/well_known_spec.rb
@@ -7,7 +7,7 @@ RSpec.describe 'well-known URLs', feature_category: :shared do
     it 'redirects to edit profile password path' do
       get('/.well-known/change-password')
 
-      expect(response).to redirect_to(edit_profile_password_path)
+      expect(response).to redirect_to(edit_user_settings_password_path)
     end
   end