Browse Source

Match tslint rules (#264)

pull/265/head
Matt Gibson 5 years ago committed by GitHub
parent
commit
2730e04a05
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      spec/common/importers/onepasswordMacCsvImporter.spec.ts
  2. 6
      spec/common/importers/onepasswordWinCsvImporter.spec.ts
  3. 2
      spec/common/services/consoleLog.service.spec.ts
  4. 4
      spec/common/services/export.service.spec.ts
  5. 2
      src/angular/components/sso.component.ts
  6. 12
      tslint.json

2
spec/common/importers/onepasswordMacCsvImporter.spec.ts

@ -17,7 +17,7 @@ function expectIdentity(cipher: CipherView) { @@ -17,7 +17,7 @@ function expectIdentity(cipher: CipherView) {
username: 'userNam3',
company: 'bitwarden',
phone: '8005555555',
email: 'email@bitwarden.com'
email: 'email@bitwarden.com',
}));
expect(cipher.notes).toContain('address\ncity state zip\nUnited States');

6
spec/common/importers/onepasswordWinCsvImporter.spec.ts

@ -18,15 +18,15 @@ function expectIdentity(cipher: CipherView) { @@ -18,15 +18,15 @@ function expectIdentity(cipher: CipherView) {
username: 'userNam3',
company: 'bitwarden',
phone: '8005555555',
email: 'email@bitwarden.com'
email: 'email@bitwarden.com',
}));
expect(cipher.fields).toEqual(jasmine.arrayContaining([
Object.assign(new FieldView(), {
type: FieldType.Text,
name: 'address',
value: 'address city state zip us'
})
value: 'address city state zip us',
}),
]));
}

2
spec/common/services/consoleLog.service.spec.ts

@ -18,7 +18,7 @@ export function interceptConsole(interceptions: any): object { @@ -18,7 +18,7 @@ export function interceptConsole(interceptions: any): object {
// tslint:disable-next-line
error: function () {
interceptions.error = arguments;
}
},
};
return interceptions;
}

4
spec/common/services/export.service.spec.ts

@ -20,13 +20,13 @@ import { BuildTestObject, GetUniqueString } from '../../utils'; @@ -20,13 +20,13 @@ import { BuildTestObject, GetUniqueString } from '../../utils';
const UserCipherViews = [
generateCipherView(false),
generateCipherView(false),
generateCipherView(true)
generateCipherView(true),
];
const UserCipherDomains = [
generateCipherDomain(false),
generateCipherDomain(false),
generateCipherDomain(true)
generateCipherDomain(true),
];
function generateCipherView(deleted: boolean) {

2
src/angular/components/sso.component.ts

@ -145,7 +145,7 @@ export class SsoComponent { @@ -145,7 +145,7 @@ export class SsoComponent {
this.router.navigate([this.twoFactorRoute], {
queryParams: {
identifier: orgIdFromState,
sso: 'true'
sso: 'true',
},
});
}

12
tslint.json

@ -59,6 +59,18 @@ @@ -59,6 +59,18 @@
"semicolon": [
true,
"always"
],
"trailing-comma": [
true,
{
"multiline": {
"objects": "always",
"arrays": "always",
"functions": "ignore",
"typeLiterals": "ignore"
},
"singleline": "never"
}
]
}
}

Loading…
Cancel
Save