Merge pull request #4538 from adobe/nj/issue-4535

For #4535, show error message but not 'remove' link for bad extension in dev folder
adobe · Jul 22, 2013 · 31fdaba · 31fdaba
2 parents d4b6731 + da1ec18
commit 31fdaba
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/htmlContent/extension-manager-view-item.html b/src/htmlContent/extension-manager-view-item.html
@@ -54,7 +54,7 @@
             {{/removalAllowed}}
             {{#failedToStart}}
                 {{^isMarkedForRemoval}}
-                    {{Strings.EXTENSION_ERROR}} (<a class="remove" data-extension-id="{{metadata.name}}">{{Strings.REMOVE}}</a>)
+                    {{Strings.EXTENSION_ERROR}} {{#allowRemove}}(<a class="remove" data-extension-id="{{metadata.name}}">{{Strings.REMOVE}}</a>){{/allowRemove}}
                 {{/isMarkedForRemoval}}
             {{/failedToStart}}
             {{#isMarkedForRemoval}}

diff --git a/test/spec/ExtensionManager-test.js b/test/spec/ExtensionManager-test.js
@@ -920,6 +920,16 @@ define(function (require, exports, module) {
                     });
                 });
 
+                it("should not have a 'remove' link for extensions in the dev folder that failed to load", function () {
+                    mockLoadExtensions(["dev/mock-failed-in-dev-folder"], true);
+                    setupViewWithMockData(ExtensionManagerViewModel.InstalledViewModel);
+                    runs(function () {
+                        expect(view).toHaveText("mock-failed-in-dev-folder");
+                        var $removeLink = $("a.remove[data-extension-id=mock-failed-in-dev-folder]", view.$el);
+                        expect($removeLink.length).toBe(0);
+                    });
+                });
+
                 it("should disable the Remove button for extensions in the dev folder", function () {
                     mockLoadExtensions(["dev/mock-extension-2"]);
                     setupViewWithMockData(ExtensionManagerViewModel.InstalledViewModel);