Add latest changes from gitlab-org/gitlab@master

1 files changed, 31 insertions, 0 deletions

diff --git a/spec/routing/routing_spec.rb b/spec/routing/routing_spec.rb
index ff002469e3c..61599f0876f 100644
--- a/spec/routing/routing_spec.rb
+++ b/spec/routing/routing_spec.rb
@@ -313,3 +313,34 @@ describe HealthCheckController, 'routing' do
     expect(get('/health_check/email')).to route_to('health_check#index', checks: 'email')
   end
 end
+
+describe InvitesController, 'routing' do
+  let_it_be(:member) { create(:project_member, :invited) }
+
+  it 'to #show' do
+    expect(get("/-/invites/#{member.invite_token}")).to route_to('invites#show', id: member.invite_token)
+  end
+
+  it 'to legacy route' do
+    expect(get("/invites/#{member.invite_token}")).to route_to('invites#show', id: member.invite_token)
+  end
+end
+
+describe AbuseReportsController, 'routing' do
+  let_it_be(:user) { create(:user) }
+
+  it 'to #new' do
+    expect(get("/-/abuse_reports/new?user_id=#{user.id}")).to route_to('abuse_reports#new', user_id: user.id.to_s)
+  end
+
+  it 'to legacy route' do
+    expect(get("/abuse_reports/new?user_id=#{user.id}")).to route_to('abuse_reports#new', user_id: user.id.to_s)
+  end
+end
+
+describe SentNotificationsController, 'routing' do
+  it 'to #unsubscribe' do
+    expect(get("/-/sent_notifications/4bee17d4a63ed60cf5db53417e9aeb4c/unsubscribe"))
+      .to route_to('sent_notifications#unsubscribe', id: '4bee17d4a63ed60cf5db53417e9aeb4c')
+  end
+end