Skip to content

Commit

Permalink
Merge pull request #767 from tony-ho/style-conformance
Browse files Browse the repository at this point in the history
Add conformance to style standards
  • Loading branch information
thinkingserious authored Oct 22, 2018
2 parents ad57a0c + 6653da8 commit 7026ae5
Show file tree
Hide file tree
Showing 8 changed files with 242 additions and 223 deletions.
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
node_modules
examples
test
coverage
6 changes: 3 additions & 3 deletions .eslintrc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ rules:
block-scoped-var: off
class-methods-use-this: off
complexity:
- error
- warn
- 6
consistent-return: off
default-case: off
Expand Down Expand Up @@ -253,7 +253,7 @@ rules:

# Node.js and CommonJS
callback-return: error
global-require: error
global-require: off
handle-callback-err: error
no-mixed-requires: off
no-new-require: off
Expand Down Expand Up @@ -282,7 +282,7 @@ rules:
max-params: off
max-statements-per-line: off
max-statements:
- error
- warn
- 30
multiline-ternary: off
new-parens: off
Expand Down
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ script:
- yarn test:client
- yarn test:helpers
- yarn test:typescript
- yarn lint
- yarn doc
notifications:
hipchat:
rooms:
Expand Down
8 changes: 7 additions & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,13 @@ Generally, we follow the style guidelines as suggested by the official language.
Please run your code through:

- [ESLint](http://eslint.org/) with the standard style guide.
- [esdoc](https://esdoc.org/) to check the documentation coverage of your added code.
```bash
yarn lint
```
- [ESDoc](https://esdoc.org/) to check the documentation coverage of your added code.
```bash
yarn doc
```

## Creating a Pull Request<a name="creating-a-pull-request"></a>

Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
"typescript": "~2.4.2"
},
"scripts": {
"doc": "esdoc",
"lint": "eslint . --fix",
"prism:install": "curl https://raw.githubusercontent.com/stoplightio/prism/master/install.sh | sh",
"prism": "prism run --mock --list --spec https://raw.githubusercontent.com/sendgrid/sendgrid-oai/master/oai_stoplight.json",
Expand Down
2 changes: 1 addition & 1 deletion packages/inbound-mail-parser/src/parser.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ describe('test_parse', () => {
const parse = new Parse({}, {});

function callback(email) {
expect(email).to.be.null;
expect(email).to.be.null();
done();
}

Expand Down
1 change: 1 addition & 0 deletions packages/mail/src/classes/mail-service.js
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ class MailService {

//Pass to callback if provided
if (cb) {
// eslint-disable-next-line callback-return
cb(error, null);
}

Expand Down
Loading

0 comments on commit 7026ae5

Please sign in to comment.