add test

jasonLaster · jasonLaster · commit e85ab31fb52f · 2017-10-18T12:09:46.000-04:00
diff --git a/bin/ci/run-tests.sh b/bin/ci/run-tests.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
 
 node ./bin/copy-assets.js --mc firefox
-yarn mochi
+./node_modules/.bin/mochii --mc ./firefox --default-test-path devtools/client/debugger/new
 exit $?
diff --git a/package.json b/package.json
@@ -30,7 +30,7 @@
       "remark -u devtools-linters/markdown/preset -qf *.md src configs docs",
     "lint-fix": "yarn lint-js -- --fix",
     "mochi":
-      "mochii --mc ./firefox --default-test-path devtools/client/debugger/new",
+      "mochii --mc ./firefox --interactive --default-test-path devtools/client/debugger/new",
     "mochid": "yarn mochi -- --jsdebugger --",
     "mochir": "yarn mochi -- --repeat 10 --",
     "mochih": "yarn mochi -- --setenv MOZ_HEADLESS=1 --",
diff --git a/src/components/App.js b/src/components/App.js
@@ -190,10 +190,11 @@ class App extends Component {
   }
 
   onLayoutChange() {
+    const orientation = verticalLayoutBreakpoint.matches
+      ? "horizontal"
+      : "vertical";
     if (isVisible()) {
-      this.props.setOrientation(
-        verticalLayoutBreakpoint.matches ? "horizontal" : "vertical"
-      );
+      this.props.setOrientation(orientation);
     }
   }
 
diff --git a/src/test/mochitest/browser.ini b/src/test/mochitest/browser.ini
@@ -85,6 +85,7 @@ skip-if = debug # bug 1374187
 [browser_dbg_keyboard_navigation.js]
 [browser_dbg_keyboard-shortcuts.js]
 skip-if = os == "linux" # bug 1351952
+[browser_dbg-layout-changes.js]
 [browser_dbg-pause-exceptions.js]
 skip-if = true # Bug 1393121
 [browser_dbg-navigation.js]
diff --git a/src/test/mochitest/browser_dbg-layout-changes.js b/src/test/mochitest/browser_dbg-layout-changes.js
@@ -0,0 +1,78 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/**
+ * This if the debugger's layout is correctly modified when the toolbox's
+ * host changes.
+ */
+
+"use strict";
+
+var gDefaultHostType = Services.prefs.getCharPref("devtools.toolbox.host");
+
+add_task(async function() {
+  // test is too slow on some platforms due to the number of test cases
+  requestLongerTimeout(2);
+
+  const dbg = await initDebugger("doc-iframes.html");
+
+  const layouts = [
+    ["horizontal", "bottom"],
+    ["vertical", "side"],
+    ["horizontal", "window:big"],
+    ["vertical", "window:small"]
+  ]
+
+  for (let layout of layouts) {
+    const [orientation, host] = layout;
+    await testLayout(dbg, orientation, host)
+  }
+
+  ok(true, "Orientations are correct")
+});
+
+async function testLayout(dbg, orientation, host) {
+  const { panel, toolbox } = dbg;
+  info(`Switching to ${host} ${orientation}.`);
+
+  await switchHost(dbg, host);
+  await resizeToolboxWindow(dbg, host);
+  return waitForState(dbg, state => dbg.selectors.getOrientation(state) == orientation)
+}
+
+function getHost(host) {
+  if (host.indexOf("window") == 0) {
+    return "window";
+  }
+  return host;
+}
+
+async function switchHost(dbg, hostType) {
+  const { toolbox } = dbg;
+  await toolbox.switchHost(getHost(hostType));
+}
+
+function resizeToolboxWindow(dbg, host) {
+  const { panel, toolbox } = dbg;
+  let sizeOption = host.split(":")[1];
+  let win = toolbox.win.parent;
+
+  let breakpoint = 700;
+  if (sizeOption == "big" && win.outerWidth <= breakpoint) {
+    return resizeWindow(dbg, breakpoint + 300);
+  } else if (sizeOption == "small" && win.outerWidth >= breakpoint) {
+    return resizeWindow(dbg, breakpoint - 300);
+  }
+}
+
+function resizeWindow(dbg, width) {
+  const { panel, toolbox } = dbg;
+  let win = toolbox.win.parent;
+  const currentWidth = win.screen.width;
+  win.resizeTo(width, window.screen.availHeight);
+}
+
+registerCleanupFunction(function() {
+  Services.prefs.setCharPref("devtools.toolbox.host", gDefaultHostType);
+  gDefaultHostType = null;
+});

Original file line number	Diff line number	Diff line change
`@@ -190,10 +190,11 @@ class App extends Component {`
`190`	`190`	`}`
`191`	`191`
`192`	`192`	`onLayoutChange() {`
	`193`	`+ const orientation = verticalLayoutBreakpoint.matches`
	`194`	`+ ? "horizontal"`
	`195`	`+ : "vertical";`
`193`	`196`	`if (isVisible()) {`
`194`		`- this.props.setOrientation(`
`195`		`- verticalLayoutBreakpoint.matches ? "horizontal" : "vertical"`
`196`		`- );`
	`197`	`+ this.props.setOrientation(orientation);`
`197`	`198`	`}`
`198`	`199`	`}`
`199`	`200`