author Brian Grinstead <bgrinstead@mozilla.com>

Tue, 09 Feb 2016 16:18:38 -0800

changeset 329911 c57ab462b69e37407aa2b5d9e1d15b0a3c65920d

parent 329876 0e2df20590bdee51dbd978b350f050459d040bb7

child 514071 105c730608b7b44f1e934191b39c2f1621c22de6

push id 10645

push user bgrinstead@mozilla.com

push date Wed, 10 Feb 2016 00:18:45 +0000

reviewers MattN

bugs 1246843

milestone 47.0a1

browser/tools/mozscreenshots/mozscreenshots/extension/TestRunner.jsm file | annotate | diff | comparison | revisions

browser/tools/mozscreenshots/mozscreenshots/extension/bootstrap.js file | annotate | diff | comparison | revisions

browser/tools/mozscreenshots/mozscreenshots/extension/jar.mn file | annotate | diff | comparison | revisions

browser/tools/mozscreenshots/mozscreenshots/extension/lib/mozscreenshots-script.js file | annotate | diff | comparison | revisions

browser/tools/mozscreenshots/mozscreenshots/extension/lib/mozscreenshots-style.css file | annotate | diff | comparison | revisions

browser/tools/mozscreenshots/mozscreenshots/extension/lib/mozscreenshots.html file | annotate | diff | comparison | revisions

browser/tools/mozscreenshots/mozscreenshots/extension/lib/robot.png file | annotate | diff | comparison | revisions
--- a/browser/tools/mozscreenshots/mozscreenshots/extension/TestRunner.jsm
+++ b/browser/tools/mozscreenshots/mozscreenshots/extension/TestRunner.jsm
@@ -5,25 +5,28 @@
 "use strict";
 
 this.EXPORTED_SYMBOLS = ["TestRunner"];
 
 const {classes: Cc, interfaces: Ci, utils: Cu} = Components;
 const defaultSetNames = ["TabsInTitlebar", "Tabs", "WindowSize", "Toolbars", "LightweightThemes"];
 const env = Cc["@mozilla.org/process/environment;1"].getService(Ci.nsIEnvironment);
 
+Cu.import("resource://testing-common/BrowserTestUtils.jsm");
 Cu.import("resource://gre/modules/FileUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/Task.jsm");
 Cu.import("resource://gre/modules/Timer.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/osfile.jsm");
 
 Cu.import("chrome://mozscreenshots/content/Screenshot.jsm");
 
+const HOME_PAGE = "chrome://mozscreenshots/content/lib/mozscreenshots.html";
+
 // Create a new instance of the ConsoleAPI so we can control the maxLogLevel with a pref.
 // See LOG_LEVELS in Console.jsm. Common examples: "All", "Info", "Warn", & "Error".
 const PREF_LOG_LEVEL = "extensions.mozscreenshots@mozilla.org.loglevel";
 XPCOMUtils.defineLazyGetter(this, "log", () => {
   let ConsoleAPI = Cu.import("resource://gre/modules/Console.jsm", {}).ConsoleAPI;
   let consoleOptions = {
     maxLogLevel: "info",
     maxLogLevelPref: PREF_LOG_LEVEL,
@@ -41,17 +44,17 @@ this.TestRunner = {
 
   init(extensionPath) {
     this._extensionPath = extensionPath;
   },
 
   /**
    * Load specified sets, execute all combinations of them, and capture screenshots.
    */
-  start(setNames = null) {
+  start: Task.async(function*(setNames = null) {
     setNames = setNames || defaultSetNames;
 
     let subDirs = ["mozscreenshots",
                    (new Date()).toISOString().replace(/:/g, "-") + "_" + Services.appinfo.OS];
     let screenshotPath = FileUtils.getFile("TmpD", subDirs).path;
 
     const MOZ_UPLOAD_DIR = env.get("MOZ_UPLOAD_DIR");
     if (MOZ_UPLOAD_DIR) {
@@ -78,28 +81,30 @@ this.TestRunner = {
 
     // Setup some prefs
     Services.prefs.setCharPref("browser.aboutHomeSnippets.updateUrl",
                                "data:text/html;charset=utf-8,Generated by mozscreenshots");
     Services.prefs.setCharPref("extensions.ui.lastCategory", "addons://list/extension");
     // Don't let the caret blink since it causes false positives for image diffs
     Services.prefs.setIntPref("ui.caretBlinkTime", -1);
 
-    return Task.spawn(function* doStart() {
-      for (let i = 0; i < this.combos.length;
-           i++){
-        this.currentComboIndex = i;
-        yield* this._performCombo(this.combos.item(this.currentComboIndex));
-      }
+    let browserWindow = Services.wm.getMostRecentWindow("navigator:browser");
+    let selectedBrowser = browserWindow.gBrowser.selectedBrowser;
+    yield BrowserTestUtils.loadURI(selectedBrowser, HOME_PAGE);
+    yield BrowserTestUtils.browserLoaded(selectedBrowser);
 
-      log.info("Done: Completed " + this.completedCombos + " out of " +
-               this.combos.length + " configurations.");
-      this.cleanup();
-    }.bind(this));
-  },
+    for (let i = 0; i < this.combos.length; i++){
+      this.currentComboIndex = i;
+      yield this._performCombo(this.combos.item(this.currentComboIndex));
+    }
+
+    log.info("Done: Completed " + this.completedCombos + " out of " +
+             this.combos.length + " configurations.");
+    this.cleanup();
+  }),
 
   /**
    * Load sets of configurations from JSMs.
    * @param {String[]} setNames - array of set names (e.g. ["Tabs", "WindowSize"].
    * @return {Object[]} Array of sets containing `name` and `configurations` properties.
    */
   loadSets(setNames) {
     let sets = [];
--- a/browser/tools/mozscreenshots/mozscreenshots/extension/bootstrap.js
+++ b/browser/tools/mozscreenshots/mozscreenshots/extension/bootstrap.js
@@ -57,16 +57,8 @@ function isAppSupported() {
   return true;
 }
 
 function uninstallExtension(data) {
   AddonManager.getAddonByID(data.id, function(addon) {
     addon.uninstall();
   });
 }
-
-function startRun() {
-  let env = Cc["@mozilla.org/process/environment;1"]
-              .getService(Ci.nsIEnvironment);
-  let setsEnv = env.get("MOZSCREENSHOTS_SETS");
-  let sets = setsEnv ? setsEnv.split(",") : null;
-  TestRunner.start(sets);
-}
--- a/browser/tools/mozscreenshots/mozscreenshots/extension/jar.mn
+++ b/browser/tools/mozscreenshots/mozscreenshots/extension/jar.mn
@@ -1,6 +1,6 @@
 mozscreenshots.jar:
 % content mozscreenshots chrome/mozscreenshots/
   Screenshot.jsm
   TestRunner.jsm
   configurations/ (configurations/*.jsm)
-  lib/            (lib/*.png)
+  lib/            (lib/*)
new file mode 100644
--- /dev/null
+++ b/browser/tools/mozscreenshots/mozscreenshots/extension/lib/mozscreenshots-script.js
@@ -0,0 +1,10 @@
+
+console.log(document, document.body);
+console.assert(false, "Failing mozscreenshots assertion");
+
+console.group("Grouped Message");
+console.log("group message 1");
+console.groupEnd("Grouped Message");
+
+console.count("counter");
+console.count("counter");
new file mode 100644
--- /dev/null
+++ b/browser/tools/mozscreenshots/mozscreenshots/extension/lib/mozscreenshots-style.css
@@ -0,0 +1,25 @@
+
+body {
+  --background-color: #f3f3f3;
+  background: tomato;
+}
+
+body {
+  background: var(--background-color);
+  color: #222;
+  padding: 0 10px;
+  margin: 0;
+}
+
+header {
+  background: #eee;
+  border-bottom: solid 2px #ccc;
+  margin: 0 -10px;
+  margin-bottom: 5px;
+  padding: 4px;
+}
+
+header h1 {
+  margin: 0;
+  padding: 0;
+}
new file mode 100644
--- /dev/null
+++ b/browser/tools/mozscreenshots/mozscreenshots/extension/lib/mozscreenshots.html
@@ -0,0 +1,33 @@
+<!doctype html>
+<html>
+  <head>
+    <meta charset="UTF-8">
+    <title>mozscreenshots</title>
+    <link rel="stylesheet" href="mozscreenshots-style.css" />
+    <script>console.info("This page was generated by mozscreenshots");</script>
+  </head>
+
+<body>
+  <header><h1>mozscreenshots</h1></header>
+
+  <p>
+  This page was generated by mozscreenshots
+  </p>
+
+  <img src="robot.png" />
+
+  <p>Welcome Humans! We invite others to keep the Manifesto’s principles; use the creation delivery and commitment. Advancing the Manifesto. We have shiny metal posteriors which <strong>should not be bitten</strong>. And they have distilled a public benefit is committed to use Mozilla project one basic and communities of modern life.</p>
+
+  <p>Robots have <mark>distilled a balance between commercial aspects of life</mark>.</p>
+
+  <p>Robots may not they have shown in education communication collaboration business entertainment and other people to pursue; speak to continue; and opportunity are many different ways to benefit the public benefit the Manifesto’s principles; build and motivate us and trademarks infrastructure funds and trademarks infrastructure funds and enable open-source technologies and provide a whole. </p>
+
+  <p>And they have seen things you people who believe that Mozilla Manifesto. We are to: articulate a vision of individual human being to benefit the lives of these efforts we will: build and promote models for creating economic value for the Internet. We create world-class open and anticipate the Mozilla Manifesto <strong>There are Your Plastic Pal Who's Fun To Be With</strong></p>
+
+  <p>Some Foundation to advance this vision of individual human being or not deeply involved in groups and promote models for the Manifesto principles will not come to support the Mozilla Foundation Pledge The Mozilla Manifesto in its activities.  People are to: articulate a set of consumer products that support <mark>the Internet is a human being</mark> or not be treated as individuals working together in the development of the Internet open and with goodwill!Specifically we believe that we will: build and society as a public good as a result of the lives of collaborative activities. Specifically we have seen things you people acting as optional. Individuals must not come to continue to develop new ways of the Internet are fundamental and with us to ensure that openness innovation and very effective way that the Manifesto There are many benefits; a global public benefit; and society as optional.</p>
+
+  <p><strong>We have metal posteriors which should not deeply involved in a reality.</strong> Individuals must remain open source software promotes the Internet is a balance between commercial profit and within the Mozilla Corporation. Invitation The Internet are key to join us to life on their own.  The Internet a whole. The Internet as a vision of the Mozilla contributors proud of time attention and motivate us and provide a reality.</p>
+
+  <script src="mozscreenshots-script.js"></script>
+</body>
+</html>
author	Brian Grinstead <bgrinstead@mozilla.com>
	Tue, 09 Feb 2016 16:18:38 -0800
changeset 329911	c57ab462b69e37407aa2b5d9e1d15b0a3c65920d
parent 329876	0e2df20590bdee51dbd978b350f050459d040bb7
child 514071	105c730608b7b44f1e934191b39c2f1621c22de6
push id	10645
push user	bgrinstead@mozilla.com
push date	Wed, 10 Feb 2016 00:18:45 +0000
reviewers	MattN
bugs	1246843
milestone	47.0a1
browser/tools/mozscreenshots/mozscreenshots/extension/TestRunner.jsm		file \| annotate \| diff \| comparison \| revisions
browser/tools/mozscreenshots/mozscreenshots/extension/bootstrap.js		file \| annotate \| diff \| comparison \| revisions
browser/tools/mozscreenshots/mozscreenshots/extension/jar.mn		file \| annotate \| diff \| comparison \| revisions
browser/tools/mozscreenshots/mozscreenshots/extension/lib/mozscreenshots-script.js		file \| annotate \| diff \| comparison \| revisions
browser/tools/mozscreenshots/mozscreenshots/extension/lib/mozscreenshots-style.css		file \| annotate \| diff \| comparison \| revisions
browser/tools/mozscreenshots/mozscreenshots/extension/lib/mozscreenshots.html		file \| annotate \| diff \| comparison \| revisions
browser/tools/mozscreenshots/mozscreenshots/extension/lib/robot.png		file \| annotate \| diff \| comparison \| revisions