Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 21:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge m-c to inbound. a=merge

Browse Source 
CLOSED TREE

--HG--
rename : browser/devtools/performance/test/browser_perf-aaa-run-first-leaktest.js => browser/devtools/performance/test/browser_aaa-run-first-leaktest.js
extra : rebase_source : bf83892460e8f9a98a8e08220593f9815cfecffb
This commit is contained in:
Ryan VanderMeulen 2015-05-22 14:18:25 -04:00
commit d29552d114
265 changed files with 1741 additions and 7622 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
b2g/chrome/content/shell.js
View File

@ -641,6 +641,7 @@ var shell = {
},
handleCmdLine: function shell_handleCmdLine() {
#ifndef MOZ_WIDGET_GONK
let b2gcmds = Cc["@mozilla.org/commandlinehandler/general-startup;1?type=b2gcmds"]
.getService(Ci.nsISupports);
let args = b2gcmds.wrappedJSObject.cmdLine;
@ -654,6 +655,7 @@ var shell = {
} catch(e) {
// Throws if -url is present with no params
}
#endif
},
};

2
b2g/config/aries/sources.xml
View File

@ -15,7 +15,7 @@
<project name="platform_build" path="build" remote="b2g" revision="e862ab9177af664f00b4522e2350f4cb13866d73">
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="gaia" path="gaia" remote="mozillaorg" revision="1126d8bee559f7cde675df2fcc6c196da9cfeba1"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="f4486f7c7785b66e8dbfc775677d1b6386718e96"/>
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="fffc68521ebb1501d6b015c6d1c4a17a04fdb2e2"/>
<project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>

2
b2g/config/dolphin/sources.xml
View File

@ -15,7 +15,7 @@
<project name="platform_build" path="build" remote="b2g" revision="e862ab9177af664f00b4522e2350f4cb13866d73">
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="gaia" path="gaia" remote="mozillaorg" revision="1126d8bee559f7cde675df2fcc6c196da9cfeba1"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="f4486f7c7785b66e8dbfc775677d1b6386718e96"/>
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="fffc68521ebb1501d6b015c6d1c4a17a04fdb2e2"/>
<project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>

2
b2g/config/emulator-ics/sources.xml
View File

@ -19,7 +19,7 @@
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="1126d8bee559f7cde675df2fcc6c196da9cfeba1"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="f4486f7c7785b66e8dbfc775677d1b6386718e96"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="fffc68521ebb1501d6b015c6d1c4a17a04fdb2e2"/>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
<project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="22664edc4c73e5fe8f5095ff1d5549db78a2bc10"/>

2
b2g/config/emulator-jb/sources.xml
View File

@ -17,7 +17,7 @@
</project>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="1126d8bee559f7cde675df2fcc6c196da9cfeba1"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="f4486f7c7785b66e8dbfc775677d1b6386718e96"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="fffc68521ebb1501d6b015c6d1c4a17a04fdb2e2"/>
<project name="moztt" path="external/moztt" remote="b2g" revision="46da1a05ac04157669685246d70ac59d48699c9e"/>
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="53517af1f57810bef745f03602f407161a475d76"/>

2
b2g/config/emulator-kk/sources.xml
View File

@ -15,7 +15,7 @@
<project name="platform_build" path="build" remote="b2g" revision="e862ab9177af664f00b4522e2350f4cb13866d73">
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="gaia" path="gaia" remote="mozillaorg" revision="1126d8bee559f7cde675df2fcc6c196da9cfeba1"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="f4486f7c7785b66e8dbfc775677d1b6386718e96"/>
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="fffc68521ebb1501d6b015c6d1c4a17a04fdb2e2"/>
<project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>

2
b2g/config/emulator-l/sources.xml
View File

@ -15,7 +15,7 @@
<project name="platform_build" path="build" remote="b2g" revision="61e82f99bb8bc78d52b5717e9a2481ec7267fa33">
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="gaia" path="gaia" remote="mozillaorg" revision="1126d8bee559f7cde675df2fcc6c196da9cfeba1"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="f4486f7c7785b66e8dbfc775677d1b6386718e96"/>
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="fffc68521ebb1501d6b015c6d1c4a17a04fdb2e2"/>
<project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>

2
b2g/config/emulator/sources.xml
View File

@ -19,7 +19,7 @@
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="1126d8bee559f7cde675df2fcc6c196da9cfeba1"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="f4486f7c7785b66e8dbfc775677d1b6386718e96"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="fffc68521ebb1501d6b015c6d1c4a17a04fdb2e2"/>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
<project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="22664edc4c73e5fe8f5095ff1d5549db78a2bc10"/>

2
b2g/config/flame-kk/sources.xml
View File

@ -15,7 +15,7 @@
<project name="platform_build" path="build" remote="b2g" revision="e862ab9177af664f00b4522e2350f4cb13866d73">
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="gaia" path="gaia" remote="mozillaorg" revision="1126d8bee559f7cde675df2fcc6c196da9cfeba1"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="f4486f7c7785b66e8dbfc775677d1b6386718e96"/>
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="fffc68521ebb1501d6b015c6d1c4a17a04fdb2e2"/>
<project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>

4
b2g/config/gaia.json
View File

@ -1,9 +1,9 @@
{
"git": {
"git_revision": "1126d8bee559f7cde675df2fcc6c196da9cfeba1",
"git_revision": "f4486f7c7785b66e8dbfc775677d1b6386718e96",
"remote": "https://git.mozilla.org/releases/gaia.git",
"branch": ""
},
"revision": "d61a9645397139d188f61d977b5c677399a35518",
"revision": "667627b8fc148996b1a51155b4c123d63cf27c59",
"repo_path": "integration/gaia-central"
}

2
b2g/config/nexus-4/sources.xml
View File

@ -17,7 +17,7 @@
</project>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="1126d8bee559f7cde675df2fcc6c196da9cfeba1"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="f4486f7c7785b66e8dbfc775677d1b6386718e96"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="fffc68521ebb1501d6b015c6d1c4a17a04fdb2e2"/>
<project name="moztt" path="external/moztt" remote="b2g" revision="46da1a05ac04157669685246d70ac59d48699c9e"/>
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="53517af1f57810bef745f03602f407161a475d76"/>

2
b2g/config/nexus-5-l/sources.xml
View File

@ -15,7 +15,7 @@
<project name="platform_build" path="build" remote="b2g" revision="61e82f99bb8bc78d52b5717e9a2481ec7267fa33">
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="gaia" path="gaia" remote="mozillaorg" revision="1126d8bee559f7cde675df2fcc6c196da9cfeba1"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="f4486f7c7785b66e8dbfc775677d1b6386718e96"/>
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="fffc68521ebb1501d6b015c6d1c4a17a04fdb2e2"/>
<project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>

12
browser/base/content/abouthome/aboutHome.js
View File

@ -307,11 +307,19 @@ function onSearchSubmit(aEvent)
if (engineName && searchTerms.length > 0) {
// Send an event that will perform a search and Firefox Health Report will
// record that a search from about:home has occurred.
let useNewTab = aEvent && aEvent.button == 1;
let eventData = {
engineName: engineName,
searchTerms: searchTerms,
useNewTab: useNewTab,
originalEvent: {
target: {
ownerDocument: null
},
shiftKey: aEvent.shiftKey,
ctrlKey: aEvent.ctrlKey,
metaKey: aEvent.metaKey,
altKey: aEvent.altKey,
button: aEvent.button,
},
};
if (searchText.hasAttribute("selection-index")) {

3
browser/base/content/newtab/intro.js
View File

@ -192,7 +192,8 @@ let gIntro = {
for (let i = 1; i <= MAX_PARAGRAPH_ID; i++) {
try {
this._paragraphs.push(newTabString("intro.paragraph" + i, substringMappings[i]));
let name = "intro.paragraph" + i + (i == 4 ? ".2" : "");
this._paragraphs.push(newTabString(name, substringMappings[i]));
} catch (ex) {
// Paragraph with this ID doesn't exist so continue
}

11
browser/base/content/newtab/search.js
View File

@ -54,7 +54,16 @@ let gSearch = {
engineName: this.currentEngineName,
searchString: searchStr,
whence: "newtab",
useNewTab: useNewTab,
originalEvent: {
target: {
ownerDocument: null
},
shiftKey: event.shiftKey,
ctrlKey: event.ctrlKey,
metaKey: event.metaKey,
altKey: event.altKey,
button: event.button,
},
}
if (searchText.hasAttribute("selection-index")) {

8
browser/components/loop/.eslintrc
View File

@ -19,9 +19,11 @@
"chai": false,
"console": false,
"jQuery": false,
"loop": false,
"loop": true,
"MozActivity": false,
"mozRTCSessionDescription": false,
"OT": false,
"performance": false,
"Promise": false,
"React": false,
"sinon": false
@ -35,9 +37,11 @@
// Eslint built-in rules are documented at <http://eslint.org/docs/rules/>
"camelcase": 0, // TODO: Remove (use default)
"consistent-return": 0, // TODO: Remove (use default)
dot-location: 0, // [2, property],
"eqeqeq": 0, // TBD. Might need to be separate for content & chrome
"global-strict": 0, // Leave as zero (this will be unsupported in eslint 1.0.0)
"key-spacing": 0, // TODO: Remove (use default)
"linebreak-style": [2, "unix"],
"new-cap": 0, // TODO: Remove (use default)
"no-catch-shadow": 0, // TODO: Remove (use default)
"no-console": 0, // Leave as 0. We use console logging in content code.
@ -50,8 +54,8 @@
"no-return-assign": 0, // TODO: Remove (use default)
"no-shadow": 0, // TODO: Remove (use default)
"no-spaced-func": 0, // TODO: Remove (use default)
"no-undef": 0, // TODO: Remove (use default)
"no-underscore-dangle": 0, // Leave as 0. Commonly used for private variables.
"no-unneeded-ternary": 2,
"no-unused-expressions": 0, // TODO: Remove (use default)
"no-unused-vars": 0, // TODO: Remove (use default)
"no-use-before-define": 0, // TODO: Remove (use default)

64
browser/components/loop/.eslintrc-gecko Normal file
View File

@ -0,0 +1,64 @@
// This file defines additional items and rules specific for gecko files.
// This is applied on top of the basic .eslintrc for gecko specific directories
// e.g. the modules directory.
{
"ecmaFeatures": {
"arrowFunctions": true,
"blockBindings": true,
"destructuring": true,
"generators": true,
"restParams": true,
"spread": true,
"objectLiteralShorthandMethods": true,
},
"globals": {
// Gecko + Loop Globals.
"CardDavImporter": true,
"Chat": false,
"ChromeWorker": false,
"CommonUtils": false,
"Components": false,
"convertToRTCStatsReport": false,
"CustomizableUI": false,
"deriveHawkCredentials": false,
"eventEmitter": false,
"FxAccountsOAuthClient": false,
"FxAccountsProfileClient": false,
"gBrowser": false,
"gDNSService": false,
"gLoopBundle": false,
"GoogleImporter": true,
"gWM": false,
"HawkClient": false,
"injectLoopAPI": true,
"Iterator": false,
"Log": false,
"log": true,
"LOOP_SESSION_TYPE": true,
"LoopCalls": true,
"LoopContacts": true,
"loopCrypto": false,
"LoopRooms": true,
"LoopRoomsCache": true,
"LoopStorage": true,
"MozLoopPushHandler": true,
"MozLoopService": true,
"OS": false,
"roomsPushNotification": true,
"Services": false,
"Social": false,
"SocialShare": false,
"Task": false,
"UITour": false,
"XPCOMUtils": false,
"uuidgen": true,
// Test Related
"Assert": false,
},
"rules": {
"generator-star-spacing": [2, "after"],
// We should fix the errors and enable this (set to 2)
"no-var": 0,
"strict": [2, "global"]
}
}

3
browser/components/loop/content/js/client.js
View File

@ -2,9 +2,6 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
/* jshint esnext:true */
/* global loop:true, hawk, deriveHawkCredentials */
var loop = loop || {};
loop.Client = (function($) {
"use strict";

5
browser/components/loop/content/js/contacts.js
View File

@ -1,12 +1,7 @@
/** @jsx React.DOM */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
/*jshint newcap:false*/
/*global loop:true, React */
var loop = loop || {};
loop.contacts = (function(_, mozL10n) {
"use strict";

5
browser/components/loop/content/js/contacts.jsx
View File

@ -1,12 +1,7 @@
/** @jsx React.DOM */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
/*jshint newcap:false*/
/*global loop:true, React */
var loop = loop || {};
loop.contacts = (function(_, mozL10n) {
"use strict";

5
browser/components/loop/content/js/conversation.js
View File

@ -1,12 +1,7 @@
/** @jsx React.DOM */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
/* jshint newcap:false, esnext:true */
/* global loop:true, React */
var loop = loop || {};
loop.conversation = (function(mozL10n) {
"use strict";

5
browser/components/loop/content/js/conversation.jsx
View File

@ -1,12 +1,7 @@
/** @jsx React.DOM */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
/* jshint newcap:false, esnext:true */
/* global loop:true, React */
var loop = loop || {};
loop.conversation = (function(mozL10n) {
"use strict";

2
browser/components/loop/content/js/conversationAppStore.js
View File

@ -2,8 +2,6 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
/* global loop:true */
var loop = loop || {};
loop.store = loop.store || {};

4
browser/components/loop/content/js/conversationViews.js
View File

@ -1,11 +1,7 @@
/** @jsx React.DOM */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
/* global loop:true, React */
var loop = loop || {};
loop.conversationViews = (function(mozL10n) {

4
browser/components/loop/content/js/conversationViews.jsx
View File

@ -1,11 +1,7 @@
/** @jsx React.DOM */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
/* global loop:true, React */
var loop = loop || {};
loop.conversationViews = (function(mozL10n) {

5
browser/components/loop/content/js/panel.js
View File

@ -1,12 +1,7 @@
/** @jsx React.DOM */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
/*jshint newcap:false*/
/*global loop:true, React */
var loop = loop || {};
loop.panel = (function(_, mozL10n) {
"use strict";

5
browser/components/loop/content/js/panel.jsx
View File

@ -1,12 +1,7 @@
/** @jsx React.DOM */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
/*jshint newcap:false*/
/*global loop:true, React */
var loop = loop || {};
loop.panel = (function(_, mozL10n) {
"use strict";

2
browser/components/loop/content/js/roomStore.js
View File

@ -2,8 +2,6 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
/* global loop:true */
var loop = loop || {};
loop.store = loop.store || {};

5
browser/components/loop/content/js/roomViews.js
View File

@ -1,12 +1,7 @@
/** @jsx React.DOM */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
/* jshint newcap:false */
/* global loop:true, React */
var loop = loop || {};
loop.roomViews = (function(mozL10n) {
"use strict";

5
browser/components/loop/content/js/roomViews.jsx
View File

@ -1,12 +1,7 @@
/** @jsx React.DOM */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
/* jshint newcap:false */
/* global loop:true, React */
var loop = loop || {};
loop.roomViews = (function(mozL10n) {
"use strict";

2
browser/components/loop/content/shared/js/actions.js
View File

@ -2,8 +2,6 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
/* global loop:true */
var loop = loop || {};
loop.shared = loop.shared || {};
loop.shared.actions = (function() {

2
browser/components/loop/content/shared/js/activeRoomStore.js
View File

@ -2,8 +2,6 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
/* global loop:true */
var loop = loop || {};
loop.store = loop.store || {};

2
browser/components/loop/content/shared/js/conversationStore.js
View File

@ -2,8 +2,6 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
/* global loop:true */
var loop = loop || {};
loop.store = loop.store || {};

2
browser/components/loop/content/shared/js/crypto.js
View File

@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
/* global loop:true */
/* global Components */
var loop = loop || {};
var inChrome = typeof Components != "undefined" && "utils" in Components;

2
browser/components/loop/content/shared/js/dispatcher.js
View File

@ -2,8 +2,6 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
/* global loop:true */
/**
* The dispatcher for actions. This dispatches actions to stores registered
* for those actions.

2
browser/components/loop/content/shared/js/feedbackApiClient.js
View File

@ -2,8 +2,6 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
/* global loop:true */
var loop = loop || {};
loop.FeedbackAPIClient = (function($, _) {
"use strict";

2
browser/components/loop/content/shared/js/feedbackStore.js
View File

@ -2,8 +2,6 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
/* global loop:true */
var loop = loop || {};
loop.store = loop.store || {};

4
browser/components/loop/content/shared/js/feedbackViews.js
View File

@ -1,11 +1,7 @@
/** @jsx React.DOM */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
/* jshint newcap:false */
/* global loop:true, React */
var loop = loop || {};
loop.shared = loop.shared || {};
loop.shared.views = loop.shared.views || {};

4
browser/components/loop/content/shared/js/feedbackViews.jsx
View File

@ -1,11 +1,7 @@
/** @jsx React.DOM */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
/* jshint newcap:false */
/* global loop:true, React */
var loop = loop || {};
loop.shared = loop.shared || {};
loop.shared.views = loop.shared.views || {};

2
browser/components/loop/content/shared/js/fxOSActiveRoomStore.js
View File

@ -2,8 +2,6 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
/* global loop:true */
var loop = loop || {};
loop.store = loop.store || {};

2
browser/components/loop/content/shared/js/mixins.js
View File

@ -2,8 +2,6 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
/* global loop:true */
var loop = loop || {};
loop.shared = loop.shared || {};
loop.shared.mixins = (function() {

2
browser/components/loop/content/shared/js/models.js
View File

@ -2,8 +2,6 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
/* global loop:true */
var loop = loop || {};
loop.shared = loop.shared || {};
loop.shared.models = (function(l10n) {

2
browser/components/loop/content/shared/js/otSdkDriver.js
View File

@ -2,8 +2,6 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
/* global loop:true */
var loop = loop || {};
loop.OTSdkDriver = (function() {

2
browser/components/loop/content/shared/js/roomStates.js
View File

@ -2,8 +2,6 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
/* global loop:true */
var loop = loop || {};
loop.store = loop.store || {};

2
browser/components/loop/content/shared/js/store.js
View File

@ -2,8 +2,6 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
/* global loop:true */
var loop = loop || {};
loop.store = loop.store || {};

2
browser/components/loop/content/shared/js/utils.js
View File

@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
/* global loop:true */
/* global Components */
var loop = loop || {};
loop.shared = loop.shared || {};

2
browser/components/loop/content/shared/js/validate.js
View File

@ -2,8 +2,6 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
/* jshint unused:false */
var loop = loop || {};
loop.validate = (function() {
"use strict";

4
browser/components/loop/content/shared/js/views.js
View File

@ -1,11 +1,7 @@
/** @jsx React.DOM */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
/* jshint newcap:false */
/* global loop:true, React */
var loop = loop || {};
loop.shared = loop.shared || {};
loop.shared.views = (function(_, l10n) {

4
browser/components/loop/content/shared/js/views.jsx
View File

@ -1,11 +1,7 @@
/** @jsx React.DOM */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
/* jshint newcap:false */
/* global loop:true, React */
var loop = loop || {};
loop.shared = loop.shared || {};
loop.shared.views = (function(_, l10n) {

2
browser/components/loop/content/shared/js/websocket.js
View File

@ -2,8 +2,6 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
/* global loop:true */
var loop = loop || {};
loop.CallConnectionWebSocket = (function() {
"use strict";

16
browser/components/loop/modules/.eslintrc
View File

@ -1,17 +1,3 @@
{
"ecmaFeatures": {
"arrowFunctions": true,
"blockBindings": true,
"destructuring": true,
"generators": true,
"restParams": true,
"spread": true,
"objectLiteralShorthandMethods": true,
},
"rules": {
"generator-star-spacing": [2, "after"],
// We should fix the errors and enable this (set to 2)
"no-var": 0,
"strict": [2, "global"]
}
"extends": "../.eslintrc-gecko"
}

1
browser/components/loop/modules/MozLoopService.jsm
View File

@ -190,7 +190,6 @@ let MozLoopServiceInternal = {
// Default to 5 seconds
return 5000;
}
return initialDelay;
},
/**

4
browser/components/loop/standalone/content/js/fxOSMarketplace.js
View File

@ -1,4 +1,6 @@
/** @jsx React.DOM */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
var loop = loop || {};
loop.fxOSMarketplaceViews = (function() {

4
browser/components/loop/standalone/content/js/fxOSMarketplace.jsx
View File

@ -1,4 +1,6 @@
/** @jsx React.DOM */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
var loop = loop || {};
loop.fxOSMarketplaceViews = (function() {

1
browser/components/loop/standalone/content/js/multiplexGum.js
View File

@ -2,7 +2,6 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
var loop = loop || {};
/**

2
browser/components/loop/standalone/content/js/standaloneAppStore.js
View File

@ -2,8 +2,6 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
/* global loop:true */
var loop = loop || {};
loop.store = loop.store || {};

2
browser/components/loop/standalone/content/js/standaloneClient.js
View File

@ -2,8 +2,6 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
/* global loop:true */
var loop = loop || {};
loop.StandaloneClient = (function($) {
"use strict";

2
browser/components/loop/standalone/content/js/standaloneMozLoop.js
View File

@ -2,8 +2,6 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
/* global loop:true */
/**
* The StandaloneMozLoop implementation reflects that of the mozLoop API for Loop
* in the desktop code. Not all functions are implemented.

5
browser/components/loop/standalone/content/js/standaloneRoomViews.js
View File

@ -1,12 +1,7 @@
/** @jsx React.DOM */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
/* global loop:true, React */
/* jshint newcap:false, maxlen:false */
var loop = loop || {};
loop.standaloneRoomViews = (function(mozL10n) {
"use strict";

5
browser/components/loop/standalone/content/js/standaloneRoomViews.jsx
View File

@ -1,12 +1,7 @@
/** @jsx React.DOM */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
/* global loop:true, React */
/* jshint newcap:false, maxlen:false */
var loop = loop || {};
loop.standaloneRoomViews = (function(mozL10n) {
"use strict";

5
browser/components/loop/standalone/content/js/webapp.js
View File

@ -1,12 +1,7 @@
/** @jsx React.DOM */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
/* global loop:true, React, MozActivity */
/* jshint newcap:false, maxlen:false */
var loop = loop || {};
loop.webapp = (function($, _, OT, mozL10n) {
"use strict";

5
browser/components/loop/standalone/content/js/webapp.jsx
View File

@ -1,12 +1,7 @@
/** @jsx React.DOM */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
/* global loop:true, React, MozActivity */
/* jshint newcap:false, maxlen:false */
var loop = loop || {};
loop.webapp = (function($, _, OT, mozL10n) {
"use strict";

4
browser/components/loop/standalone/package.json
View File

@ -12,8 +12,8 @@
},
"dependencies": {},
"devDependencies": {
"eslint": "0.20.x",
"eslint-plugin-react": "2.2.x",
"eslint": "0.21.x",
"eslint-plugin-react": "2.3.x",
"express": "4.x"
},
"scripts": {

5
browser/components/loop/test/desktop-local/client_test.js
View File

@ -2,13 +2,10 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
/*global loop, sinon, it, beforeEach, afterEach, describe */
var expect = chai.expect;
describe("loop.Client", function() {
"use strict";
var expect = chai.expect;
var sandbox,
callback,
client,

9
browser/components/loop/test/desktop-local/contacts_test.js
View File

@ -2,15 +2,12 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
/*jshint newcap:false*/
/*global loop, sinon */
var expect = chai.expect;
var TestUtils = React.addons.TestUtils;
describe("loop.contacts", function() {
"use strict";
var expect = chai.expect;
var TestUtils = React.addons.TestUtils;
var fakeAddContactButtonText = "Fake Add Contact";
var fakeEditContactButtonText = "Fake Edit Contact";
var fakeDoneButtonText = "Fake Done";

3
browser/components/loop/test/desktop-local/conversationAppStore_test.js
View File

@ -1,10 +1,9 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
var expect = chai.expect;
describe("loop.store.ConversationAppStore", function () {
var expect = chai.expect;
var sharedActions = loop.shared.actions;
var sandbox, dispatcher;

5
browser/components/loop/test/desktop-local/conversationViews_test.js
View File

@ -1,11 +1,12 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
var expect = chai.expect;
describe("loop.conversationViews", function () {
"use strict";
var expect = chai.expect;
var TestUtils = React.addons.TestUtils;
var sharedActions = loop.shared.actions;
var sharedUtils = loop.shared.utils;
var sharedView = loop.shared.views;
var sandbox, view, dispatcher, contact, fakeAudioXHR;

6
browser/components/loop/test/desktop-local/conversation_test.js
View File

@ -2,13 +2,11 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
/* global loop, sinon, React, TestUtils */
var expect = chai.expect;
describe("loop.conversation", function() {
"use strict";
var expect = chai.expect;
var TestUtils = React.addons.TestUtils;
var sharedModels = loop.shared.models,
fakeWindow,
sandbox;

2
browser/components/loop/test/desktop-local/index.html
View File

@ -82,7 +82,7 @@
describe("Uncaught Error Check", function() {
it("should load the tests without errors", function() {
expect(uncaughtError && uncaughtError.message).to.be.undefined;
chai.expect(uncaughtError && uncaughtError.message).to.be.undefined;
});
});

25
browser/components/loop/test/desktop-local/panel_test.js
View File

@ -2,17 +2,14 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
/*jshint newcap:false*/
/*global loop, sinon */
var expect = chai.expect;
var TestUtils = React.addons.TestUtils;
var sharedActions = loop.shared.actions;
var sharedUtils = loop.shared.utils;
describe("loop.panel", function() {
"use strict";
var expect = chai.expect;
var TestUtils = React.addons.TestUtils;
var sharedActions = loop.shared.actions;
var sharedUtils = loop.shared.utils;
var sandbox, notifications;
var fakeXHR, fakeWindow, fakeMozLoop;
var requests = [];
@ -925,8 +922,7 @@ describe("loop.panel", function() {
TestUtils.findRenderedDOMComponentWithClass(view, "terms-service");
});
it("should not render when the value of loop.seenToS is set to 'seen'",
function(done) {
it("should not render when the value of loop.seenToS is set to 'seen'", function() {
navigator.mozLoop.getLoopPref = function(key) {
return {
"gettingStarted.seen": true,
@ -934,11 +930,12 @@ describe("loop.panel", function() {
}[key];
};
try {
var view = TestUtils.renderIntoDocument(
React.createElement(loop.panel.ToSView));
expect(function() {
TestUtils.findRenderedDOMComponentWithClass(view, "terms-service");
} catch (err) {
done();
}
}).to.Throw(/not find/);
});
it("should render when the value of loop.gettingStarted.seen is false",

9
browser/components/loop/test/desktop-local/roomViews_test.js
View File

@ -1,10 +1,13 @@
var expect = chai.expect;
/* jshint newcap:false */
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
describe("loop.roomViews", function () {
"use strict";
var expect = chai.expect;
var TestUtils = React.addons.TestUtils;
var sharedActions = loop.shared.actions;
var sharedUtils = loop.shared.utils;
var ROOM_STATES = loop.store.ROOM_STATES;
var SCREEN_SHARE_STATES = loop.shared.utils.SCREEN_SHARE_STATES;

46
browser/components/loop/test/mochitest/.eslintrc
View File

@ -1,17 +1,35 @@
{
"ecmaFeatures": {
"arrowFunctions": true,
"blockBindings": true,
"destructuring": true,
"generators": true,
"restParams": true,
"spread": true,
"objectLiteralShorthandMethods": true,
},
"rules": {
"generator-star-spacing": [2, "after"],
// We should fix the errors and enable this (set to 2)
"no-var": 0,
"strict": [2, "global"]
"extends": "../../.eslintrc-gecko",
"globals": {
// General test items.
"add_task": false,
"Cc": true,
"Ci": true,
"Cr": true,
"Cu": true,
"is": false,
"info": false,
"ok": false,
"registerCleanupFunction": false,
// head.js items
"HAWK_TOKEN_LENGTH": true,
"checkLoggedOutState": false,
"checkFxAOAuthTokenData": false,
"loadLoopPanel": false,
"getLoopString": false,
"gMozLoopAPI": true,
"mockDb": true,
"mockPushHandler": true,
"promiseDeletedOAuthParams": false,
"promiseOAuthGetRegistration": false,
"promiseOAuthParamsSetup": false,
"promiseObserverNotified": false,
"promiseTabLoadEvent": false,
"promiseWaitForCondition": false,
"resetFxA": true,
// Loop specific items
"MozLoopServiceInternal": true,
"LoopRoomsInternal": true,
"LoopUI": false,
}
}

2
browser/components/loop/test/mochitest/head.js
View File

@ -351,7 +351,7 @@ const mockDb = {
callback(null);
},
promise: function(method, ...params) {
return new Promise(resolve => {
return new Promise((resolve, reject) => {
this[method](...params, (err, res) => err ? reject(err) : resolve(res));
});
}

8
browser/components/loop/test/shared/activeRoomStore_test.js
View File

@ -1,11 +1,11 @@
/* global chai, loop */
var expect = chai.expect;
var sharedActions = loop.shared.actions;
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
describe("loop.store.ActiveRoomStore", function () {
"use strict";
var expect = chai.expect;
var sharedActions = loop.shared.actions;
var REST_ERRNOS = loop.shared.utils.REST_ERRNOS;
var ROOM_STATES = loop.store.ROOM_STATES;
var FAILURE_DETAILS = loop.shared.utils.FAILURE_DETAILS;

3
browser/components/loop/test/shared/conversationStore_test.js
View File

@ -1,11 +1,10 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
var expect = chai.expect;
describe("loop.store.ConversationStore", function () {
"use strict";
var expect = chai.expect;
var CALL_STATES = loop.store.CALL_STATES;
var WS_STATES = loop.store.WS_STATES;
var CALL_TYPES = loop.shared.utils.CALL_TYPES;

5
browser/components/loop/test/shared/crypto_test.js
View File

@ -2,13 +2,10 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
/* global loop, sinon */
var expect = chai.expect;
describe("loop.crypto", function() {
"use strict";
var expect = chai.expect;
var sandbox, oldCrypto;
beforeEach(function() {

3
browser/components/loop/test/shared/dispatcher_test.js
View File

@ -1,11 +1,10 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
var expect = chai.expect;
describe("loop.Dispatcher", function () {
"use strict";
var expect = chai.expect;
var sharedActions = loop.shared.actions;
var dispatcher, sandbox;

5
browser/components/loop/test/shared/feedbackApiClient_test.js
View File

@ -2,13 +2,10 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
/*global loop, sinon, it, beforeEach, afterEach, describe */
var expect = chai.expect;
describe("loop.FeedbackAPIClient", function() {
"use strict";
var expect = chai.expect;
var sandbox,
fakeXHR,
requests = [];

8
browser/components/loop/test/shared/feedbackStore_test.js
View File

@ -1,11 +1,11 @@
/* global chai, loop */
var expect = chai.expect;
var sharedActions = loop.shared.actions;
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
describe("loop.store.FeedbackStore", function () {
"use strict";
var expect = chai.expect;
var sharedActions = loop.shared.actions;
var FEEDBACK_STATES = loop.store.FEEDBACK_STATES;
var sandbox, dispatcher, store, feedbackClient;

18
browser/components/loop/test/shared/feedbackViews_test.js
View File

@ -2,20 +2,16 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
/*global loop, sinon, React */
/* jshint newcap:false */
var expect = chai.expect;
var l10n = navigator.mozL10n || document.mozL10n;
var TestUtils = React.addons.TestUtils;
var sharedActions = loop.shared.actions;
var sharedViews = loop.shared.views;
var FEEDBACK_STATES = loop.store.FEEDBACK_STATES;
describe("loop.shared.views.FeedbackView", function() {
"use strict";
var expect = chai.expect;
var l10n = navigator.mozL10n || document.mozL10n;
var TestUtils = React.addons.TestUtils;
var sharedActions = loop.shared.actions;
var sharedViews = loop.shared.views;
var FEEDBACK_STATES = loop.store.FEEDBACK_STATES;
var sandbox, comp, dispatcher, fakeFeedbackClient, feedbackStore;
beforeEach(function() {

9
browser/components/loop/test/shared/fxOSActiveRoomStore_test.js
View File

@ -1,13 +1,12 @@
/* global chai, loop */
var expect = chai.expect;
var sharedActions = loop.shared.actions;
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
describe("loop.store.FxOSActiveRoomStore", function () {
"use strict";
var ROOM_STATES = loop.store.ROOM_STATES;
var expect = chai.expect;
var sharedActions = loop.shared.actions;
var sandbox;
var dispatcher;
var fakeMozLoop;

2
browser/components/loop/test/shared/index.html
View File

@ -79,7 +79,7 @@
<script>
describe("Uncaught Error Check", function() {
it("should load the tests without errors", function() {
expect(uncaughtError && uncaughtError.message).to.be.undefined;
chai.expect(uncaughtError && uncaughtError.message).to.be.undefined;
});
});

7
browser/components/loop/test/shared/mixins_test.js
View File

@ -2,16 +2,13 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
/* global loop, sinon */
/* jshint newcap:false */
var expect = chai.expect;
describe("loop.shared.mixins", function() {
"use strict";
var expect = chai.expect;
var sandbox;
var sharedMixins = loop.shared.mixins;
var TestUtils = React.addons.TestUtils;
var ROOM_STATES = loop.store.ROOM_STATES;
beforeEach(function() {

6
browser/components/loop/test/shared/models_test.js
View File

@ -2,13 +2,11 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
/* global loop, sinon */
var expect = chai.expect;
describe("loop.shared.models", function() {
"use strict";
var expect = chai.expect;
var l10n = navigator.mozL10n || document.mozL10n;
var sharedModels = loop.shared.models, sandbox, fakeXHR,
requests = [], fakeSDK, fakeMozLoop, fakeSession, fakeSessionData;

3
browser/components/loop/test/shared/otSdkDriver_test.js
View File

@ -1,11 +1,10 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
var expect = chai.expect;
describe("loop.OTSdkDriver", function () {
"use strict";
var expect = chai.expect;
var sharedActions = loop.shared.actions;
var FAILURE_DETAILS = loop.shared.utils.FAILURE_DETAILS;
var STREAM_PROPERTIES = loop.shared.utils.STREAM_PROPERTIES;

4
browser/components/loop/test/shared/store_test.js
View File

@ -2,14 +2,14 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
var expect = chai.expect;
describe("loop.store", function () {
"use strict";
var expect = chai.expect;
var dispatcher;
var sandbox;
var sharedActions = loop.shared.actions;
var TestUtils = React.addons.TestUtils;
beforeEach(function() {
sandbox = sinon.sandbox.create();

6
browser/components/loop/test/shared/utils_test.js
View File

@ -2,14 +2,10 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
/* global loop, sinon */
/* jshint newcap:false */
var expect = chai.expect;
describe("loop.shared.utils", function() {
"use strict";
var expect = chai.expect;
var sandbox;
var sharedUtils = loop.shared.utils;

6
browser/components/loop/test/shared/validate_test.js
View File

@ -1,13 +1,11 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
/*global chai, validate */
var expect = chai.expect;
describe("Validator", function() {
"use strict";
var expect = chai.expect;
// test helpers
function create(dependencies, values) {
var validator = new loop.validate.Validator(dependencies);

11
browser/components/loop/test/shared/views_test.js
View File

@ -2,16 +2,13 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
/*global loop, sinon, React */
/* jshint newcap:false */
var expect = chai.expect;
var l10n = navigator.mozL10n || document.mozL10n;
var TestUtils = React.addons.TestUtils;
describe("loop.shared.views", function() {
"use strict";
var expect = chai.expect;
var l10n = navigator.mozL10n || document.mozL10n;
var TestUtils = React.addons.TestUtils;
var sharedActions = loop.shared.actions;
var sharedModels = loop.shared.models;
var sharedViews = loop.shared.views;
var SCREEN_SHARE_STATES = loop.shared.utils.SCREEN_SHARE_STATES;

6
browser/components/loop/test/shared/websocket_test.js
View File

@ -2,14 +2,10 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
/*global loop, sinon, it, beforeEach, afterEach, describe */
var expect = chai.expect;
describe("loop.CallConnectionWebSocket", function() {
"use strict";
var expect = chai.expect;
var WEBSOCKET_REASONS = loop.shared.utils.WEBSOCKET_REASONS;
var sandbox,

2
browser/components/loop/test/standalone/index.html
View File

@ -73,7 +73,7 @@
<script>
describe("Uncaught Error Check", function() {
it("should load the tests without errors", function() {
expect(uncaughtError && uncaughtError.message).to.be.undefined;
chai.expect(uncaughtError && uncaughtError.message).to.be.undefined;
});
});

7
browser/components/loop/test/standalone/multiplexGum_test.js
View File

@ -2,18 +2,15 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
/*global loop, sinon, it, beforeEach, afterEach, describe*/
var expect = chai.expect;
describe("loop.standaloneMedia._MultiplexGum", function() {
"use strict";
var expect = chai.expect;
var defaultGum =
navigator.getUserMedia ||
navigator.mozGetUserMedia ||
navigator.webkitGetUserMedia ||
(window.TBPlugin && TBPlugin.getUserMedia);
(window.TBPlugin && window.TBPlugin.getUserMedia);
var sandbox;
var multiplexGum;

3
browser/components/loop/test/standalone/standaloneAppStore_test.js
View File

@ -1,9 +1,8 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
var expect = chai.expect;
describe("loop.store.StandaloneAppStore", function () {
var expect = chai.expect;
var sharedActions = loop.shared.actions;
var sharedUtils = loop.shared.utils;
var sandbox, dispatcher;

3
browser/components/loop/test/standalone/standaloneMetricsStore_test.js
View File

@ -2,11 +2,10 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
var expect = chai.expect;
describe("loop.store.StandaloneMetricsStore", function() {
"use strict";
var expect = chai.expect;
var sandbox, dispatcher, store, fakeActiveRoomStore;
var sharedActions = loop.shared.actions;

3
browser/components/loop/test/standalone/standaloneMozLoop_test.js
View File

@ -2,11 +2,10 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
var expect = chai.expect;
describe("loop.StandaloneMozLoop", function() {
"use strict";
var expect = chai.expect;
var sandbox, fakeXHR, requests, callback, mozLoop;
var fakeToken, fakeBaseServerUrl, fakeServerErrorDescription;

7
browser/components/loop/test/standalone/standaloneRoomViews_test.js
View File

@ -2,13 +2,12 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
/* global loop, sinon */
var expect = chai.expect;
describe("loop.standaloneRoomViews", function() {
"use strict";
var expect = chai.expect;
var TestUtils = React.addons.TestUtils;
var ROOM_STATES = loop.store.ROOM_STATES;
var FEEDBACK_STATES = loop.store.FEEDBACK_STATES;
var ROOM_INFO_FAILURES = loop.shared.utils.ROOM_INFO_FAILURES;

5
browser/components/loop/test/standalone/standalone_client_test.js
View File

@ -2,13 +2,10 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
/*global loop, sinon, it, beforeEach, afterEach, describe, hawk */
var expect = chai.expect;
describe("loop.StandaloneClient", function() {
"use strict";
var expect = chai.expect;
var sandbox,
fakeXHR,
requests = [],

7
browser/components/loop/test/standalone/webapp_test.js
View File

@ -2,14 +2,11 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
/* global loop, sinon */
var expect = chai.expect;
var TestUtils = React.addons.TestUtils;
describe("loop.webapp", function() {
"use strict";
var expect = chai.expect;
var TestUtils = React.addons.TestUtils;
var sharedActions = loop.shared.actions;
var sharedModels = loop.shared.models,
sharedViews = loop.shared.views,

47
browser/components/loop/test/xpcshell/.eslintrc
View File

@ -1,17 +1,36 @@
{
"ecmaFeatures": {
"arrowFunctions": true,
"blockBindings": true,
"destructuring": true,
"generators": true,
"restParams": true,
"spread": true,
"objectLiteralShorthandMethods": true,
},
"rules": {
"generator-star-spacing": [2, "after"],
// We should fix the errors and enable this (set to 2)
"no-var": 0,
"strict": [2, "global"]
"extends": "../../.eslintrc-gecko",
"globals": {
// General xpcshell-test functions
"HttpServer": false,
"add_task": false,
"add_test": false,
"Ci": true,
"Cu": true,
"do_check_true": false,
"do_check_false": false,
"do_check_eq": false,
"do_get_profile": false,
"do_print": false,
"do_register_cleanup": false,
"do_throw": false,
"do_timeout": false,
"run_next_test": false,
// head.js items.
"MockWebSocketChannel": false,
"extend": true,
"getLoopString": false,
"kServerPushUrl": true,
"kEndPointUrl": true,
"loopCrypto": true,
"loopServer": true,
"mockPushHandler": true,
"setupFakeFxAUserProfile": false,
"setupFakeLoopServer": false,
"timerHandlers",
"waitForCondition": true,
// Loop specific items
"MozLoopServiceInternal": true,
"LoopRoomsInternal": true,
}
}

4
browser/components/loop/test/xpcshell/test_looprooms_encryption_in_fxa.js
View File

@ -126,7 +126,9 @@ add_task(function* setup_server() {
});
function returnRoomDetails(res, roomName) {
roomDetail.roomName = roomName;
var roomDetail = {
roomName: roomName
};
res.setStatusLine(null, 200, "OK");
res.write(JSON.stringify(roomDetail));
res.processAsync();

Some files were not shown because too many files have changed in this diff Show More