Bug 1310894 - Remove tags from default Nightly bookmarks. r=dolske
authorDão Gottwald <dao@mozilla.com>
Wed, 19 Oct 2016 10:50:15 +0200
changeset 318529 e3a51d041edde9eb1bd890b2091040a59558c515
parent 318528 37e81a1c152caf44764e670986be0fe160525314
child 318530 39eb040a44e6032ff65c2b367b7a57960a6192b1
push id82953
push userdgottwald@mozilla.com
push dateWed, 19 Oct 2016 08:53:24 +0000
treeherdermozilla-inbound@e3a51d041edd [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdolske
bugs1310894
milestone52.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1310894 - Remove tags from default Nightly bookmarks. r=dolske
browser/components/places/tests/browser/browser_410196_paste_into_tags.js
browser/components/places/tests/browser/browser_423515.js
browser/components/places/tests/browser/browser_bookmarkProperties_editTagContainer.js
browser/components/places/tests/browser/browser_library_commands.js
browser/locales/generic/profile/bookmarks.html.in
--- a/browser/components/places/tests/browser/browser_410196_paste_into_tags.js
+++ b/browser/components/places/tests/browser/browser_410196_paste_into_tags.js
@@ -88,19 +88,17 @@ add_task(function* () {
 
 function focusTag(PlacesOrganizer) {
   PlacesOrganizer.selectLeftPaneQuery("Tags");
   let tags = PlacesOrganizer._places.selectedNode;
   tags.containerOpen = true;
   let fooTag = tags.getChild(0);
   let tagNode = fooTag;
   PlacesOrganizer._places.selectNode(fooTag);
-  // Bug 1283076: Nightly has a default 'bug' tag already set
-  let tagValue = AppConstants.NIGHTLY_BUILD ? 'bug' : 'foo';
-  is(tagNode.title, tagValue, "tagNode title is " + tagValue);
+  is(tagNode.title, 'foo', "tagNode title is foo");
   let ip = PlacesOrganizer._places.insertionPoint;
   ok(ip.isTag, "IP is a tag");
 }
 
 function copyHistNode(PlacesOrganizer, ContentTree) {
   // focus the history object
   PlacesOrganizer.selectLeftPaneQuery("History");
   let histContainer = PlacesOrganizer._places.selectedNode;
--- a/browser/components/places/tests/browser/browser_423515.js
+++ b/browser/components/places/tests/browser/browser_423515.js
@@ -147,19 +147,17 @@ function test() {
     validate: function() {
       // get tag root
       var query = PlacesUtils.history.getNewQuery();
       var options = PlacesUtils.history.getNewQueryOptions();
       options.resultType = Ci.nsINavHistoryQueryOptions.RESULTS_AS_TAG_QUERY;
       var tagsNode = PlacesUtils.history.executeQuery(query, options).root;
 
       tagsNode.containerOpen = true;
-      // Bug 1283076: Nightly already has 7 tags set
-      let tagsCount = AppConstants.NIGHTLY_BUILD ? 8 : 1;
-      is(tagsNode.childCount, tagsCount, "has new tag");
+      is(tagsNode.childCount, 1, "has new tag");
 
       var tagNode = tagsNode.getChild(0);
 
       is(PlacesControllerDragHelper.canMoveNode(tagNode),
          false, "should not be able to move tag container node");
       tagsNode.containerOpen = false;
     }
   });
--- a/browser/components/places/tests/browser/browser_bookmarkProperties_editTagContainer.js
+++ b/browser/components/places/tests/browser/browser_bookmarkProperties_editTagContainer.js
@@ -18,20 +18,19 @@ add_task(function* () {
   registerCleanupFunction(function* () {
     yield promiseLibraryClosed(library);
   });
 
   PlacesOrganizer.selectLeftPaneQuery("Tags");
   let tree = PlacesOrganizer._places;
   let tagsContainer = tree.selectedNode;
   tagsContainer.containerOpen = true;
-  // Bug 1283076: Nightly already has several tags set, position changes
-  let tagPosition = AppConstants.NIGHTLY_BUILD ? 7 : 0;
-  let tagNode = tagsContainer.getChild(tagPosition);
-  tree.selectNode(tagNode);
+  let fooTag = tagsContainer.getChild(0);
+  let tagNode = fooTag;
+  tree.selectNode(fooTag);
   is(tagNode.title, 'tag1', "tagNode title is correct");
 
   ok(tree.controller.isCommandEnabled("placesCmd_show:info"),
      "'placesCmd_show:info' on current selected node is enabled");
 
   yield withBookmarksDialog(
     true,
     function openDialog() {
--- a/browser/components/places/tests/browser/browser_library_commands.js
+++ b/browser/components/places/tests/browser/browser_library_commands.js
@@ -200,19 +200,18 @@ add_task(function* test_tags() {
      "Copy command is enabled");
   ok(!PO._places.controller.isCommandEnabled("cmd_cut"),
      "Cut command is disabled");
   ok(!PO._places.controller.isCommandEnabled("cmd_delete"),
      "Delete command is disabled");
 
   // Now select the tag.
   PlacesUtils.asContainer(tagsNode).containerOpen = true;
-  // Bug 1283076: Nightly already has several tags set, position changes
-  let tagPosition = AppConstants.NIGHTLY_BUILD ? 7 : 0;
-  PO._places.selectNode(tagsNode.getChild(tagPosition));
+  let tag = tagsNode.getChild(0);
+  PO._places.selectNode(tag);
   is(PO._places.selectedNode.title, "test",
      "The created tag has been properly selected");
 
   // Check that cut is disabled but delete is enabled.
   ok(PO._places.controller.isCommandEnabled("cmd_copy"),
      "Copy command is enabled");
   ok(!PO._places.controller.isCommandEnabled("cmd_cut"),
      "Cut command is disabled");
--- a/browser/locales/generic/profile/bookmarks.html.in
+++ b/browser/locales/generic/profile/bookmarks.html.in
@@ -40,17 +40,17 @@
         </dl>
 #else
         <dl>
             <p><dt><a href="https://www.mozilla.org/@AB_CD@/contribute/" icon="@mozilla_icon@">@firefox_community@</a>
         </dl>
     <p><dt><h3>@nightly_heading@</h3></dt>
         <dl><p>
             <dt><a href="https://blog.nightly.mozilla.org/" icon="@nightly_icon@">@nightly_blog@</a>
-            <dt><a href="https://bugzilla.mozilla.org/" icon="@bugzilla_icon@" shortcuturl="bz" tags="bug,issue">@bugzilla@</a>
+            <dt><a href="https://bugzilla.mozilla.org/" icon="@bugzilla_icon@" shortcuturl="bz">@bugzilla@</a>
             <dt><a href="https://developer.mozilla.org/" icon="@mdn_icon@" shortcuturl="mdn">@mdn@</a>
             <dt><a href="https://addons.mozilla.org/@AB_CD@/firefox/addon/nightly-tester-tools/" icon="@addon_icon@">@nightly_tester_tools@</a>
-            <dt><a href="about:crashes" icon="@mozilla_icon@" tags="crash">@crashes@</a>
-            <dt><a href="https://mibbit.com/?server=irc.mozilla.org&channel=%23nightly" icon="@mozilla_icon@" tags="chat,irc">@irc@</a>
-            <dt><a href="https://planet.mozilla.org/" icon="@mozilla_icon@" tags="planet,news">@planet@</a>
+            <dt><a href="about:crashes" icon="@mozilla_icon@">@crashes@</a>
+            <dt><a href="https://mibbit.com/?server=irc.mozilla.org&channel=%23nightly" icon="@mozilla_icon@">@irc@</a>
+            <dt><a href="https://planet.mozilla.org/" icon="@mozilla_icon@">@planet@</a>
         </dl>
 #endif
 </dl>