Bug 1240804 - Fix JSON errors in RDM test file. r=me
authorJ. Ryan Stinnett <jryans@gmail.com>
Mon, 28 Mar 2016 09:16:23 -0500
changeset 291309 c6faa92b435d084736b2856cf9fbb0cb50abfdfd
parent 291308 6a17a3d359fffd1408c068bf03812df8677c29bd
child 291310 57e1fe3dfc6da778da6ac4b3349d5e0293a214f3
push id74545
push userkwierso@gmail.com
push dateFri, 01 Apr 2016 23:05:42 +0000
treeherdermozilla-inbound@c410d4e20586 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme
bugs1240804
milestone48.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 1240804 - Fix JSON errors in RDM test file. r=me MozReview-Commit-ID: FITgnNCjq2p
devtools/client/responsive.html/test/browser/browser.ini
devtools/client/responsive.html/test/browser/browser_devices.json
devtools/client/responsive.html/test/browser/devices.json
devtools/client/responsive.html/test/browser/head.js
--- a/devtools/client/responsive.html/test/browser/browser.ini
+++ b/devtools/client/responsive.html/test/browser/browser.ini
@@ -1,9 +1,9 @@
 [DEFAULT]
 tags = devtools
 subsuite = devtools
 support-files =
-  browser_devices.json
+  devices.json
   head.js
 
 [browser_exit_button.js]
 [browser_viewport_basics.js]
deleted file mode 100644
--- a/devtools/client/responsive.html/test/browser/browser_devices.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "TYPES": [ "phones" ],
-  "phones": [
-    {
-      "name": "Firefox OS Flame",
-      "width": 320,
-      "height": 570,
-      "pixelRatio": 1.5,
-      "userAgent": "Mozilla/5.0 (Mobile; rv:39.0) Gecko/39.0 Firefox/39.0",
-      "touch": true,
-      "firefoxOS": true,
-      "os": "fxos"
-    },
-    {
-      "name": "Alcatel One Touch Fire",
-      "width": 320,
-      "height": 480,
-      "pixelRatio": 1,
-      "userAgent": "Mozilla/5.0 (Mobile; ALCATELOneTouch4012X; rv:28.0) Gecko/28.0 Firefox/28.0",
-      "touch": true,
-      "firefoxOS": true,
-      "os": "fxos"
-    },
-  ],
-}
new file mode 100644
--- /dev/null
+++ b/devtools/client/responsive.html/test/browser/devices.json
@@ -0,0 +1,25 @@
+{
+  "TYPES": [ "phones" ],
+  "phones": [
+    {
+      "name": "Firefox OS Flame",
+      "width": 320,
+      "height": 570,
+      "pixelRatio": 1.5,
+      "userAgent": "Mozilla/5.0 (Mobile; rv:39.0) Gecko/39.0 Firefox/39.0",
+      "touch": true,
+      "firefoxOS": true,
+      "os": "fxos"
+    },
+    {
+      "name": "Alcatel One Touch Fire",
+      "width": 320,
+      "height": 480,
+      "pixelRatio": 1,
+      "userAgent": "Mozilla/5.0 (Mobile; ALCATELOneTouch4012X; rv:28.0) Gecko/28.0 Firefox/28.0",
+      "touch": true,
+      "firefoxOS": true,
+      "os": "fxos"
+    }
+  ]
+}
--- a/devtools/client/responsive.html/test/browser/head.js
+++ b/devtools/client/responsive.html/test/browser/head.js
@@ -13,17 +13,17 @@ Services.scriptloader.loadSubScript(
 Services.scriptloader.loadSubScript(
   "chrome://mochitests/content/browser/devtools/client/framework/test/shared-redux-head.js",
   this);
 
 const TEST_URI_ROOT = "http://example.com/browser/devtools/client/responsive.html/test/browser/";
 
 DevToolsUtils.testing = true;
 Services.prefs.setCharPref("devtools.devices.url",
-  TEST_URI_ROOT + "browser_devices.json");
+  TEST_URI_ROOT + "devices.json");
 Services.prefs.setBoolPref("devtools.responsive.html.enabled", true);
 
 registerCleanupFunction(() => {
   DevToolsUtils.testing = false;
   Services.prefs.clearUserPref("devtools.devices.url");
   Services.prefs.clearUserPref("devtools.responsive.html.enabled");
 });
 const { ResponsiveUIManager } = Cu.import("resource://devtools/client/responsivedesign/responsivedesign.jsm", {});