Skip to content

Commit 0d803a2

Browse files
Merge pull request #139 from robsontenorio/dev
Release v1.7.1
2 parents a740a17 + 2c67024 commit 0d803a2

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

.github/workflows/test-and-release.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ on:
1212

1313
jobs:
1414
test:
15-
name: Build & Test
15+
name: Test
1616

1717
runs-on: ${{ matrix.os }}
1818

@@ -77,8 +77,8 @@ jobs:
7777
if: steps.cache-modules.outputs.cache-hit != 'true'
7878
run: yarn install
7979

80-
- name: Test
81-
run: yarn test
80+
- name: Build
81+
run: yarn build
8282

8383
- name: Upload Coverage to Codecov
8484
uses: codecov/codecov-action@v1

docs/content/en/api/query-builder-methods.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ await Model.include('user', 'category')
2222
Append attributes.
2323

2424
```js
25-
await Model.include('likes')
25+
await Model.append('likes')
2626
```
2727

2828
## `select`

src/Model.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -107,12 +107,12 @@ export default class Model extends StaticModel {
107107
let url = `${this.baseURL()}`;
108108

109109
args.forEach(object => {
110-
if (object instanceof Model === false) {
110+
if (!(object instanceof Model)) {
111111
throw new Error('The object referenced on for() method is not a valid Model.')
112112
}
113113

114114
if (!this.isValidId(object.getPrimaryKey())) {
115-
throw new Error('The object referenced on for() method has a invalid id.')
115+
throw new Error('The object referenced on for() method has an invalid id.')
116116
}
117117

118118
url += `/${object.resource()}/${object.getPrimaryKey()}`
@@ -139,7 +139,7 @@ export default class Model extends StaticModel {
139139
}
140140

141141
isValidId(id) {
142-
return id !== undefined && id !== 0 && id !== '' && id !== null
142+
return !!id
143143
}
144144

145145
endpoint() {

tests/model.test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -671,7 +671,7 @@ describe('Model methods', () => {
671671
const post = new Post({ text: 'Hello' }).for(user)
672672
}
673673

674-
expect(errorModel).toThrow('The object referenced on for() method has a invalid id.')
674+
expect(errorModel).toThrow('The object referenced on for() method has an invalid id.')
675675
})
676676

677677
test('it throws a error when a custom() parameter is not a valid Model or a string', () => {

0 commit comments

Comments
 (0)