efbd68efef
http://eslint.org/docs/rules/comma-dangle http://eslint.org/docs/rules/object-curly-spacing Given that we currently have quite inconsistent object formatting, fixing this in *one* big patch probably wouldn't be feasible (since I cannot imagine anyone wanting to review that); hence I've opted to try and do this piecewise instead. Please note: This patch was created automatically, using the ESLint `--fix` command line option. In a couple of places this caused lines to become too long, and I've fixed those manually; please refer to the interdiff below for the only hand-edits in this patch. ```diff diff --git a/test/chromium/test-telemetry.js b/test/chromium/test-telemetry.js index cc412a31..2e5bdfa1 100755 --- a/test/chromium/test-telemetry.js +++ b/test/chromium/test-telemetry.js @@ -324,7 +324,7 @@ var tests = [ var window = createExtensionGlobal(); telemetryScript.runInNewContext(window); window.chrome.runtime.getManifest = function() { - return { version: '1.0.1', }; + return { version: '1.0.1', }; }; window.Date.test_now_value += 12 * 36E5; telemetryScript.runInNewContext(window); diff --git a/test/unit/api_spec.js b/test/unit/api_spec.js index 1f00747a..f22988e7 100644 --- a/test/unit/api_spec.js +++ b/test/unit/api_spec.js @@ -503,8 +503,9 @@ describe('api', function() { it('gets destinations, from /Dests dictionary', function(done) { var promise = doc.getDestinations(); promise.then(function(data) { - expect(data).toEqual({ chapter1: [{ gen: 0, num: 17, }, { name: 'XYZ', }, - 0, 841.89, null], }); + expect(data).toEqual({ + chapter1: [{ gen: 0, num: 17, }, { name: 'XYZ', }, 0, 841.89, null], + }); done(); }).catch(function (reason) { done.fail(reason); diff --git a/test/unit/function_spec.js b/test/unit/function_spec.js index 66441212..62127eb9 100644 --- a/test/unit/function_spec.js +++ b/test/unit/function_spec.js @@ -492,9 +492,11 @@ describe('function', function() { it('check compiled mul', function() { check([0.25, 0.5, 'mul'], [], [0, 1], [{ input: [], output: [0.125], }]); check([0, 'mul'], [0, 1], [0, 1], [{ input: [0.25], output: [0], }]); - check([0.5, 'mul'], [0, 1], [0, 1], [{ input: [0.25], output: [0.125], }]); + check([0.5, 'mul'], [0, 1], [0, 1], + [{ input: [0.25], output: [0.125], }]); check([1, 'mul'], [0, 1], [0, 1], [{ input: [0.25], output: [0.25], }]); - check([0, 'exch', 'mul'], [0, 1], [0, 1], [{ input: [0.25], output: [0], }]); + check([0, 'exch', 'mul'], [0, 1], [0, 1], + [{ input: [0.25], output: [0], }]); check([0.5, 'exch', 'mul'], [0, 1], [0, 1], [{ input: [0.25], output: [0.125], }]); check([1, 'exch', 'mul'], [0, 1], [0, 1], ```
168 lines
5.3 KiB
JavaScript
168 lines
5.3 KiB
JavaScript
/* Copyright 2016 Mozilla Foundation
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
/*
|
|
Copyright (c) 2008-2016 Pivotal Labs
|
|
|
|
Permission is hereby granted, free of charge, to any person obtaining
|
|
a copy of this software and associated documentation files (the
|
|
"Software"), to deal in the Software without restriction, including
|
|
without limitation the rights to use, copy, modify, merge, publish,
|
|
distribute, sublicense, and/or sell copies of the Software, and to
|
|
permit persons to whom the Software is furnished to do so, subject to
|
|
the following conditions:
|
|
|
|
The above copyright notice and this permission notice shall be
|
|
included in all copies or substantial portions of the Software.
|
|
|
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
|
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
|
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
|
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
|
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
|
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|
*/
|
|
/* globals jasmineRequire, TestReporter */
|
|
|
|
// Modified jasmine's boot.js file to load PDF.js libraries async.
|
|
|
|
'use strict';
|
|
|
|
function initializePDFJS(callback) {
|
|
Promise.all([SystemJS.import('pdfjs/core/fonts'),
|
|
SystemJS.import('pdfjs/core/stream'),
|
|
SystemJS.import('pdfjs/core/primitives'),
|
|
SystemJS.import('pdfjs/core/cmap')])
|
|
.then(function (modules) {
|
|
var fonts = modules[0], stream = modules[1],
|
|
primitives = modules[2], cmap = modules[3];
|
|
// Expose some of the PDFJS members to global scope for tests.
|
|
window.Font = fonts.Font;
|
|
window.ToUnicodeMap = fonts.ToUnicodeMap;
|
|
window.Stream = stream.Stream;
|
|
window.Name = primitives.Name;
|
|
window.CMapFactory = cmap.CMapFactory;
|
|
|
|
callback();
|
|
});
|
|
}
|
|
|
|
(function() {
|
|
window.jasmine = jasmineRequire.core(jasmineRequire);
|
|
|
|
jasmineRequire.html(jasmine);
|
|
|
|
var env = jasmine.getEnv();
|
|
|
|
var jasmineInterface = jasmineRequire.interface(jasmine, env);
|
|
extend(window, jasmineInterface);
|
|
|
|
// Runner Parameters
|
|
var queryString = new jasmine.QueryString({
|
|
getWindowLocation() {
|
|
return window.location;
|
|
},
|
|
});
|
|
|
|
var catchingExceptions = queryString.getParam('catch');
|
|
env.catchExceptions(typeof catchingExceptions === 'undefined' ?
|
|
true : catchingExceptions);
|
|
|
|
var throwingExpectationFailures = queryString.getParam('throwFailures');
|
|
env.throwOnExpectationFailure(throwingExpectationFailures);
|
|
|
|
var random = queryString.getParam('random');
|
|
env.randomizeTests(random);
|
|
|
|
var seed = queryString.getParam('seed');
|
|
if (seed) {
|
|
env.seed(seed);
|
|
}
|
|
|
|
// Reporters
|
|
var htmlReporter = new jasmine.HtmlReporter({
|
|
env,
|
|
onRaiseExceptionsClick() {
|
|
queryString.navigateWithNewParam('catch', !env.catchingExceptions());
|
|
},
|
|
onThrowExpectationsClick() {
|
|
queryString.navigateWithNewParam('throwFailures',
|
|
!env.throwingExpectationFailures());
|
|
},
|
|
onRandomClick() {
|
|
queryString.navigateWithNewParam('random', !env.randomTests());
|
|
},
|
|
addToExistingQueryString(key, value) {
|
|
return queryString.fullStringWithNewParam(key, value);
|
|
},
|
|
getContainer() {
|
|
return document.body;
|
|
},
|
|
createElement() {
|
|
return document.createElement.apply(document, arguments);
|
|
},
|
|
createTextNode() {
|
|
return document.createTextNode.apply(document, arguments);
|
|
},
|
|
timer: new jasmine.Timer(),
|
|
});
|
|
|
|
env.addReporter(htmlReporter);
|
|
|
|
if (queryString.getParam('browser')) {
|
|
var testReporter = new TestReporter(queryString.getParam('browser'),
|
|
queryString.getParam('path'));
|
|
env.addReporter(testReporter);
|
|
}
|
|
|
|
// Filter which specs will be run by matching the start of the full name
|
|
// against the `spec` query param.
|
|
var specFilter = new jasmine.HtmlSpecFilter({
|
|
filterString() {
|
|
return queryString.getParam('spec');
|
|
},
|
|
});
|
|
|
|
env.specFilter = function(spec) {
|
|
return specFilter.matches(spec.getFullName());
|
|
};
|
|
|
|
// Sets longer timeout.
|
|
jasmine.DEFAULT_TIMEOUT_INTERVAL = 30000;
|
|
|
|
// Replace the browser window's `onload`, ensure it's called, and then run
|
|
// all of the loaded specs. This includes initializing the `HtmlReporter`
|
|
// instance and then executing the loaded Jasmine environment.
|
|
var currentWindowOnload = window.onload;
|
|
|
|
window.onload = function() {
|
|
if (currentWindowOnload) {
|
|
currentWindowOnload();
|
|
}
|
|
|
|
initializePDFJS(function () {
|
|
htmlReporter.initialize();
|
|
env.execute();
|
|
});
|
|
};
|
|
|
|
function extend(destination, source) {
|
|
for (var property in source) {
|
|
destination[property] = source[property];
|
|
}
|
|
return destination;
|
|
}
|
|
}());
|