Permalink
Browse files

chore(deps): update eslint-plugin-sorting to 0.4.0

  • Loading branch information...
philbooth committed Feb 11, 2019
1 parent bf3991b commit 69167ee1ecb7494adb1d3610010fdbfb7cbacb5f
@@ -17,7 +17,7 @@ rules:
no-console: 0
no-multi-str: 2
no-useless-escape: 0
sorting/sort-object-props: [ 2, { "ignoreCase": true, "ignoreMethods": true, "ignoreObjectsWithMethods": true, "ignorePrivate": true } ]
sorting/sort-object-props: [ 2, { "ignoreCase": true, "ignoreMethods": true, "ignoreMethodSiblings": true, "ignorePrivate": true } ]
space-infix-ops: 2
space-unary-ops: [2, {"nonwords": false, "overrides": {"~": true, "!": true}}]
strict: 0
@@ -11,11 +11,11 @@ define(function (require, exports, module) {
ENTER: 13,
ESCAPE: 27,
LEFT_ARROW: 37,
NUMPAD_0: 96,
NUMPAD_9: 105,
NUM_0: 48,
NUM_1: 49,
NUM_9: 57,
NUMPAD_0: 96,
NUMPAD_9: 105,
PERIOD: 190,
RIGHT_ARROW: 39,
TAB: 9,
@@ -8,9 +8,9 @@ import UserAgent from '../../../lib/user-agent';
export default function setRemoteMetaData(remoteMetaData) {
const userAgent = new UserAgent(remoteMetaData.ua);
const remoteMetaDataWithOSInfo = assign(pick(remoteMetaData, 'city', 'country', 'ipAddress', 'region', 'ua'), {
OS: userAgent.genericOSName(),
deviceType: userAgent.genericDeviceType(),
family: userAgent.browser.name,
OS: userAgent.genericOSName(),
});

this.set({remoteMetaData: remoteMetaDataWithOSInfo});
@@ -32,8 +32,8 @@ var SIGNIN_SIGNUP_QUERY_PARAM_SCHEMA = {
keys_jwk: Vat.keysJwk().renameTo('keysJwk'),
login_hint: Vat.email().renameTo('loginHint'),
prompt: Vat.prompt(),
redirectTo: Vat.url(),
redirect_uri: Vat.url().allow(Constants.DEVICE_PAIRING_AUTHORITY_REDIRECT_URI).renameTo('redirectUri'),
redirectTo: Vat.url(),
scope: Vat.string().required().min(1),
state: Vat.string()
};
@@ -174,9 +174,9 @@ define(function (require, exports, module) {
isOther,
isOtherAndroid,
isOtherIos,
isSignedIn,
isSignIn,
isSignUp,
isSignedIn,
showSuccessMessage
});
}
@@ -376,6 +376,12 @@ describe('lib/user-agent', () => {
patch: 0
},

'Mozilla/5.0 (iPhone; CPU iPhone OS 8_3 like Mac OS X) AppleWebKit/600.1.4 (KHTML, like Gecko) FxiOS/6.1 Mobile/12F69 Safari/600.1.4': {
major: 6,
minor: 1,
patch: 0
},

'Mozilla/5.0 (Linux; Android 4.0.4; Galaxy Nexus Build/IMM76B) AppleWebKit/535.19 (KHTML, like Gecko) Chrome/18.0.1025.133 Mobile Safari/535.19': {
major: 18,
minor: 0,
@@ -388,12 +394,6 @@ describe('lib/user-agent', () => {
patch: 0
},

'Mozilla/5.0 (iPhone; CPU iPhone OS 8_3 like Mac OS X) AppleWebKit/600.1.4 (KHTML, like Gecko) FxiOS/6.1 Mobile/12F69 Safari/600.1.4': {
major: 6,
minor: 1,
patch: 0
},

'word': {
major: 0,
minor: 0,
@@ -425,18 +425,18 @@ describe('lib/user-agent', () => {
patch: 0
},

'Mozilla/5.0 (Linux; Android 4.0.4; Galaxy Nexus Build/IMM76B) AppleWebKit/535.19 (KHTML, like Gecko) Chrome/18.0.1025.133 Mobile Safari/535.19': {
major: 4,
minor: 0,
patch: 4
},

'Mozilla/5.0 (iPhone; CPU iPhone OS 8_3 like Mac OS X) AppleWebKit/600.1.4 (KHTML, like Gecko) FxiOS/6.1 Mobile/12F69 Safari/600.1.4': {
major: 8,
minor: 3,
patch: 0
},

'Mozilla/5.0 (Linux; Android 4.0.4; Galaxy Nexus Build/IMM76B) AppleWebKit/535.19 (KHTML, like Gecko) Chrome/18.0.1025.133 Mobile Safari/535.19': {
major: 4,
minor: 0,
patch: 4
},

'word': {
major: 0,
minor: 0,
@@ -75,12 +75,12 @@ describe('models/auth_brokers/pairing/authority', function () {
assert.isTrue(broker.getSupplicantMetadata.calledOnce);
assert.isTrue(broker.startHeartbeat.calledOnce);
assert.deepEqual(broker.get('remoteMetaData'), {
OS: 'Unknown',
city: 'Toronto',
country: 'Canada',
deviceType: 'desktop',
family: undefined,
ipAddress: '1.1.1.1',
OS: 'Unknown',
region: 'Ontario',
ua: 'Firefox 1.0',
});
@@ -42,9 +42,9 @@ describe('models/auth_brokers/pairing/remote-metadata', function () {
});

assert.deepEqual(broker.get('remoteMetaData'), {
OS: 'macOS',
deviceType: 'desktop',
family: 'Firefox',
OS: 'macOS',
ua: UA,
});
});
@@ -67,9 +67,9 @@ define(function (require, exports, module) {
translator = new Translator('en-US', ['en-US']);
translator.set({
'another message': 'another translated message',
[HTML_MESSAGE]: UNESCAPED_HTML_TRANSLATION,
'the error message': 'a translated error message',
'the success message': 'a translated success message',
[HTML_MESSAGE]: UNESCAPED_HTML_TRANSLATION,
[UNSAFE_INTERPOLATION_VARIABLE]: UNSAFE_INTERPOLATION_VARIABLE
});

@@ -12,12 +12,12 @@ import User from 'models/user';
import View from 'views/pair/auth_allow';

const REMOTE_METADATA = {
OS: 'Windows',
city: 'Toronto',
country: 'Canada',
deviceType: 'desktop',
family: 'Firefox',
ipAddress: '1.1.1.1',
OS: 'Windows',
region: 'Ontario',
ua: 'Firefox 1.0',
};
@@ -11,12 +11,12 @@ import User from 'models/user';
import View from 'views/pair/auth_complete';

const REMOTE_METADATA = {
OS: 'Windows',
city: 'Toronto',
country: 'Canada',
deviceType: 'desktop',
family: 'Firefox',
ipAddress: '1.1.1.1',
OS: 'Windows',
region: 'Ontario',
ua: 'Firefox 1.0',
};
@@ -11,12 +11,12 @@ import User from 'models/user';
import View from 'views/pair/auth_wait_for_supp';

const REMOTE_METADATA = {
OS: 'Windows',
city: 'Toronto',
country: 'Canada',
deviceType: 'desktop',
family: 'Firefox',
ipAddress: '1.1.1.1',
OS: 'Windows',
region: 'Ontario',
ua: 'Firefox 1.0',
};
@@ -10,12 +10,12 @@ import DeviceBeingPairedMixin from 'views/pair/device-being-paired-mixin';
import TestTemplate from 'templates/test_template.mustache';

const REMOTE_METADATA = {
OS: 'Windows',
city: 'Toronto',
country: 'Canada',
deviceType: 'desktop',
family: 'Firefox',
ipAddress: '1.1.1.1',
OS: 'Windows',
region: 'Ontario',
ua: 'Firefox 1.0',
};
@@ -54,10 +54,10 @@ describe('views/pair/device-being-paired-mixin', () => {
it('renders the template with location unknown', () => {
const broker = new Broker();
broker.set('remoteMetaData', {
OS: 'Windows',
deviceType: 'desktop',
family: 'Firefox',
ipAddress: '1.1.1.1',
OS: 'Windows',
ua: 'Firefox 1.0',
});
view = new PairingView({
@@ -12,12 +12,12 @@ import SupplicantBroker from 'models/auth_brokers/pairing/supplicant';
import View from 'views/pair/supp_allow';

const REMOTE_METADATA = {
OS: 'Windows',
city: 'Toronto',
country: 'Canada',
deviceType: 'desktop',
family: 'Firefox',
ipAddress: '1.1.1.1',
OS: 'Windows',
region: 'Ontario',
ua: 'Firefox 1.0',
};
@@ -13,12 +13,12 @@ import User from 'models/user';
import View from 'views/pair/supp_wait_for_auth';

const REMOTE_METADATA = {
OS: 'Windows',
city: 'Toronto',
country: 'Canada',
deviceType: 'desktop',
family: 'Firefox',
ipAddress: '1.1.1.1',
OS: 'Windows',
region: 'Ontario',
ua: 'Firefox 1.0',
};
Oops, something went wrong.

0 comments on commit 69167ee

Please sign in to comment.