Merge pull request #34302 from nullaus/bug1260897

Merge pull request #34290 from gregarndt/patch-1
mozilla-b2g · May 11, 2016 · d042309 · d042309
2 parents 6c9800d + db36f3e
commit d042309
Show file tree

Hide file tree

Showing 33 changed files with 28 additions and 6,434 deletions.
diff --git a/apps/homescreen/test/marionette/app_appcache_pending_test.js b/apps/homescreen/test/marionette/app_appcache_pending_test.js
diff --git a/apps/homescreen/test/marionette/app_blacklist_test.js b/apps/homescreen/test/marionette/app_blacklist_test.js
diff --git a/apps/homescreen/test/marionette/app_default_order_test.js b/apps/homescreen/test/marionette/app_default_order_test.js
@@ -17,27 +17,7 @@ marionette('Homescreen - Default app order', function() {
 
   test('Default app order is respected', function() {
     var expectedOrder = [
-      'Phone',
-      'Messages',
-      'Contacts',
-      'E-Mail',
-      'Browser',
-      'Camera',
-      'Gallery',
-      'Music',
-      'Video',
-      'Marketplace',
-      'Calendar',
-      'Clock',
-      'Settings',
-      'FM Radio',
-      'BuddyUp',
-      'Bugzilla Lite',
-      'Facebook',
-      'Twitter',
-      'Notes',
-      'Calculator',
-      'Usage'
+      // No icons expected at this time.
     ];
     var length = expectedOrder.length;
 

diff --git a/apps/homescreen/test/marionette/app_hosted_failed_icon_fetch_test.js b/apps/homescreen/test/marionette/app_hosted_failed_icon_fetch_test.js
diff --git a/apps/homescreen/test/marionette/app_hosted_install_test.js b/apps/homescreen/test/marionette/app_hosted_install_test.js
diff --git a/apps/homescreen/test/marionette/app_hosted_retry_icon_fetch_test.js b/apps/homescreen/test/marionette/app_hosted_retry_icon_fetch_test.js