From f1b60f799b4d8bcfa0fb46b2dee890144a4239ad Mon Sep 17 00:00:00 2001
From: Kumar McMillan <kumar.mcmillan@gmail.com>
Date: Mon, 13 Mar 2017 11:54:47 -0500
Subject: [PATCH] Revert "Force all /users/ URLs to be served by addons-server
 (#2034)"

This reverts commit f42934e542ae7383a8302296d85ac7255238177c because a 500 is going to be more helpful until we have implementations of these pages.
---
 src/amo/routes.js             |  6 +-----
 tests/server/amo/TestViews.js | 20 --------------------
 2 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/src/amo/routes.js b/src/amo/routes.js
index 71c95eba9f1..fff800d107d 100644
--- a/src/amo/routes.js
+++ b/src/amo/routes.js
@@ -29,11 +29,7 @@ export default (
     <IndexRoute component={Home} />
     <Route path="addon/:slug/" component={DetailPage} />
     <Route path="addon/:addonSlug/reviews/" component={AddonReviewList} />
-    {/* These user routes are to make the proxy serve each URL from */}
-    {/* addons-server until we can fix the :visibleAddonType route below. */}
-    {/* https://github.com/mozilla/addons-frontend/issues/2029 */}
-    {/* We are mimicing these URLs: https://github.com/mozilla/addons-server/blob/master/src/olympia/users/urls.py#L20 */}
-    <Route path="users/:userAction/" component={NotFound} />
+    {/* Hack to make the proxy serve this URL from addons-server */}
     {/* https://github.com/mozilla/addons-frontend/issues/1975 */}
     <Route path="user/:user/" component={NotFound} />
     <Route path=":visibleAddonType/categories/" component={CategoryList} />
diff --git a/tests/server/amo/TestViews.js b/tests/server/amo/TestViews.js
index 7f368db806a..ce545f95802 100644
--- a/tests/server/amo/TestViews.js
+++ b/tests/server/amo/TestViews.js
@@ -66,24 +66,4 @@ describe('AMO GET Requests', () => {
   it('should respond with a 404 to user pages', () => request(app)
     .get('/en-US/firefox/user/some-user/')
     .expect(404));
-
-  it('should respond with a 404 to the user edit page', () => request(app)
-    .get('/en-US/firefox/users/edit/')
-    .expect(404));
-
-  it('should respond with a 404 to a specific user edit', () => request(app)
-    .get('/en-US/firefox/users/edit/1234/')
-    .expect(404));
-
-  it('should respond with a 404 to user unsubscribe actions', () => request(app)
-    .get('/en-US/firefox/users/unsubscribe/token/signature/permission/')
-    .expect(404));
-
-  it('should respond with a 404 to deleting a user photo', () => request(app)
-    .get('/en-US/firefox/users/delete_photo/1234/')
-    .expect(404));
-
-  it('should respond with a 404 to any user action', () => request(app)
-    .get('/en-US/firefox/users/login/')
-    .expect(404));
 });