corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 912763 - Disable background thumbnails on Beta. r=markh

Browse Source
This commit is contained in:
Drew Willcoxon
2013-09-09 19:58:57 -07:00
parent b0f762fae0
commit 2b2f6c4bb7
8 changed files with 85 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
toolkit/components/thumbnails/test/Makefile.in
View File

@@ -3,8 +3,6 @@
# You can obtain one at http://mozilla.org/MPL/2.0/.
MOCHITEST_BROWSER_FILES := \
browser_thumbnails_background.js \
browser_thumbnails_background_crash.js \
browser_thumbnails_capture.js \
browser_thumbnails_expiration.js \
browser_thumbnails_privacy.js \
@@ -14,13 +12,20 @@ MOCHITEST_BROWSER_FILES := \
browser_thumbnails_bug726727.js \
browser_thumbnails_bug727765.js \
browser_thumbnails_bug818225.js \
browser_thumbnails_update.js \
head.js \
background_red.html \
background_red_scroll.html \
background_red_redirect.sjs \
privacy_cache_control.sjs \
$(NULL)
ifndef RELEASE_BUILD
MOCHITEST_BROWSER_FILES += \
browser_thumbnails_background.js \
browser_thumbnails_background_crash.js \
browser_thumbnails_update.js \
thumbnails_background.sjs \
thumbnails_crash_content_helper.js \
thumbnails_update.sjs \
$(NULL)
endif

21
toolkit/components/thumbnails/test/browser_thumbnails_update.js
View File

@@ -2,9 +2,16 @@
http://creativecommons.org/publicdomain/zero/1.0/ */
/**
* These tests check the auto-update facility of the thumbnail service.
* These tests check the auto-update facility of the background thumbnail
* service.
*/
const imports = {};
Cu.import("resource://gre/modules/BackgroundPageThumbs.jsm", imports);
registerCleanupFunction(function () {
imports.BackgroundPageThumbs._destroy();
});
function runTests() {
// A "trampoline" - a generator that iterates over sub-iterators
let tests = [
@@ -68,12 +75,12 @@ function simpleCaptureTest() {
is(numNotifications, 1, "got notification of item being created.");
// The capture is now "fresh" - so requesting the URL should not cause
// a new capture.
PageThumbs.captureIfStale(URL);
imports.BackgroundPageThumbs.captureIfStale(URL);
is(numNotifications, 1, "still only 1 notification of item being created.");
ensureThumbnailStale(URL);
// Ask for it to be updated.
PageThumbs.captureIfStale(URL);
imports.BackgroundPageThumbs.captureIfStale(URL);
// But it's async, so wait - our observer above will call next() when
// the notification comes.
});
@@ -99,13 +106,13 @@ function errorResponseUpdateTest() {
// As we set the thumbnail very stale, allowing 1 second of "slop" here
// works around this while still keeping the test valid.
let now = Date.now() - 1000 ;
PageThumbs.captureIfStale(URL).then(() => {
imports.BackgroundPageThumbs.captureIfStale(URL, { onDone: () => {
ok(getThumbnailModifiedTime(URL) >= now, "modified time should be >= now");
retrieveImageDataForURL(URL, function ([r, g, b]) {
is("" + [r,g,b], "" + [0, 255, 0], "thumbnail is still green");
next();
});
}).then(null, err => {ok(false, "Error in captureIfStale: " + err)});
}});
yield undefined; // wait for callback to call 'next'...
}
@@ -127,7 +134,7 @@ function goodResponseUpdateTest() {
// As we set the thumbnail very stale, allowing 1 second of "slop" here
// works around this while still keeping the test valid.
let now = Date.now() - 1000 ;
PageThumbs.captureIfStale(URL).then(() => {
imports.BackgroundPageThumbs.captureIfStale(URL, { onDone: () => {
ok(getThumbnailModifiedTime(URL) >= now, "modified time should be >= now");
// the captureIfStale request saw a 200 response with the red body, so we
// expect to see the red version here.
@@ -135,7 +142,7 @@ function goodResponseUpdateTest() {
is("" + [r,g,b], "" + [255, 0, 0], "thumbnail is now red");
next();
});
}).then(null, err => {ok(false, "Error in captureIfStale: " + err)});
}});
yield undefined; // wait for callback to call 'next'...
}