From 17e76acdb274c9842658acb8786caded78fbdc87 Mon Sep 17 00:00:00 2001
From: Zachary Carter <zack.carter@gmail.com>
Date: Wed, 10 Sep 2014 12:10:03 -0700
Subject: [PATCH] fix(avatars): disable remote URL option

---
 app/scripts/router.js                                 | 3 ---
 app/scripts/templates/settings/avatar_change.mustache | 1 -
 app/tests/test_start.js                               | 3 ++-
 server/lib/configuration.js                           | 3 ++-
 server/lib/routes.js                                  | 1 -
 tests/functional/pages.js                             | 1 -
 tests/server/routes.js                                | 1 -
 7 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/app/scripts/router.js b/app/scripts/router.js
index 235b9e95b7..8d6838bd21 100644
--- a/app/scripts/router.js
+++ b/app/scripts/router.js
@@ -28,7 +28,6 @@ define([
   'views/settings/avatar',
   'views/settings/avatar_change',
   'views/settings/avatar_crop',
-  'views/settings/avatar_url',
   'views/settings/avatar_gravatar',
   'views/settings/avatar_camera',
   'views/change_password',
@@ -61,7 +60,6 @@ function (
   AvatarView,
   AvatarChangeView,
   AvatarCropView,
-  AvatarURLView,
   AvatarGravatarView,
   AvatarCameraView,
   ChangePasswordView,
@@ -103,7 +101,6 @@ function (
       'settings/avatar(/)': showView(AvatarView),
       'settings/avatar/change(/)': showView(AvatarChangeView),
       'settings/avatar/crop(/)': showView(AvatarCropView),
-      'settings/avatar/url(/)': showView(AvatarURLView),
       'settings/avatar/gravatar(/)': showView(AvatarGravatarView),
       'settings/avatar/camera(/)': showView(AvatarCameraView),
       'change_password(/)': showView(ChangePasswordView),
diff --git a/app/scripts/templates/settings/avatar_change.mustache b/app/scripts/templates/settings/avatar_change.mustache
index 6e9c14c4cf..eae25934a4 100644
--- a/app/scripts/templates/settings/avatar_change.mustache
+++ b/app/scripts/templates/settings/avatar_change.mustache
@@ -25,7 +25,6 @@
     <nav id="avatar-options">
       <input type="file" id="imageLoader" name="imageLoader" accept="image/png, image/jpeg"/>
       <a href="#" id="file"><span class="icon-plus"></span>{{#t}}Upload{{/t}}</a>
-      <a href="/settings/avatar/url" id="url"><span class="icon-link"></span>{{#t}}URL{{/t}}</a>
       <a href="/settings/avatar/camera" id="camera"><span class="icon-camera-alt"></span>{{#t}}Camera{{/t}}</a>
       <a href="/settings/avatar/gravatar" id="gravatar"><span class="gravatar-logo"></span>{{#t}}Gravatar{{/t}}</a>
     </nav>
diff --git a/app/tests/test_start.js b/app/tests/test_start.js
index e0b6c87039..7aca34d949 100644
--- a/app/tests/test_start.js
+++ b/app/tests/test_start.js
@@ -47,7 +47,8 @@ function (Translator, Session, FxaClientWrapper) {
     '../tests/spec/views/settings/avatar_change',
     '../tests/spec/views/settings/avatar_crop',
     '../tests/spec/views/settings/avatar_gravatar',
-    '../tests/spec/views/settings/avatar_url',
+    // Disabled until #1581
+    //'../tests/spec/views/settings/avatar_url',
     '../tests/spec/views/settings/avatar_camera',
     '../tests/spec/views/change_password',
     '../tests/spec/views/delete_account',
diff --git a/server/lib/configuration.js b/server/lib/configuration.js
index 2a3be8b7b7..67082f5bd1 100644
--- a/server/lib/configuration.js
+++ b/server/lib/configuration.js
@@ -152,7 +152,8 @@ var conf = module.exports = convict({
     coverage: {
       globalThreshold: 90,
       threshold: 50,
-      excludeFiles: ['/scripts/../tests/', '/scripts/vendor/', '/scripts/../bower_components/', 'require_config']
+      // Avatar tests are disabled until #1581 is resolved
+      excludeFiles: ['/scripts/../tests/', '/scripts/vendor/', '/scripts/../bower_components/', 'require_config', 'avatar_url']
     }
   },
   i18n: {
diff --git a/server/lib/routes.js b/server/lib/routes.js
index 7de16eb30a..d79fb0fe31 100644
--- a/server/lib/routes.js
+++ b/server/lib/routes.js
@@ -79,7 +79,6 @@ module.exports = function (config, templates, i18n) {
       '/settings/avatar',
       '/settings/avatar/change',
       '/settings/avatar/crop',
-      '/settings/avatar/url',
       '/settings/avatar/gravatar',
       '/settings/avatar/camera',
       '/change_password',
diff --git a/tests/functional/pages.js b/tests/functional/pages.js
index 9b78a8f126..7525d24124 100644
--- a/tests/functional/pages.js
+++ b/tests/functional/pages.js
@@ -25,7 +25,6 @@ define([
     'settings',
     'settings/avatar',
     'settings/avatar/change',
-    'settings/avatar/url',
     'settings/avatar/gravatar',
     'settings/avatar/camera',
     'settings/avatar/crop',
diff --git a/tests/server/routes.js b/tests/server/routes.js
index 50c1f2128c..b87cb39228 100644
--- a/tests/server/routes.js
+++ b/tests/server/routes.js
@@ -34,7 +34,6 @@ define([
     '/settings': { statusCode: 200 },
     '/settings/avatar': { statusCode: 200 },
     '/settings/avatar/change': { statusCode: 200 },
-    '/settings/avatar/url': { statusCode: 200 },
     '/settings/avatar/gravatar': { statusCode: 200 },
     '/settings/avatar/camera': { statusCode: 200 },
     '/settings/avatar/crop': { statusCode: 200 },