Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix floating dependencies test suite #5551

Merged
merged 1 commit into from
Jul 31, 2018
Merged

Fix floating dependencies test suite #5551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@
"loader.js": "^4.5.0",
"mocha": "^2.4.5",
"mocha-only-detector": "0.0.2",
"prettier": "^1.13.6",
"prettier": "^1.14.0",
"rimraf": "2.5.2",
"rsvp": "4.8.0",
"testdouble": "^3.2.6",
Expand Down
3 changes: 2 additions & 1 deletion tests/acceptance/relationships/has-many-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ function domListToArray(domList) {
}

class Person extends Model {
@attr name;
@attr
name;
@hasMany('person', { async: true, inverse: 'parent' })
children;
@belongsTo('person', { async: true, inverse: 'children' })
Expand Down
6 changes: 4 additions & 2 deletions tests/integration/records/create-record-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,17 @@ class Person extends Model {
pets;
@belongsTo('pet', { inverse: 'bestHuman', async: true })
bestDog;
@attr name;
@attr
name;
}

class Pet extends Model {
@belongsTo('person', { inverse: 'pets', async: false })
owner;
@belongsTo('person', { inverse: 'bestDog', async: false })
bestHuman;
@attr name;
@attr
name;
}

module('Store.createRecord() coverage', function(hooks) {
Expand Down
6 changes: 4 additions & 2 deletions tests/integration/records/edit-record-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,15 @@ class Person extends Model {
friends;
@belongsTo('person', { inverse: 'bestFriend', async: true })
bestFriend;
@attr name;
@attr
name;
}

class Pet extends Model {
@belongsTo('person', { inverse: 'pets', async: false })
owner;
@attr name;
@attr
name;
}

module('Editing a Record', function(hooks) {
Expand Down
3 changes: 2 additions & 1 deletion tests/integration/records/load-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ import { run } from '@ember/runloop';
import todo from '../../helpers/todo';

class Person extends Model {
@attr name;
@attr
name;
@belongsTo('person', { async: true, inverse: 'bestFriend' })
bestFriend;
}
Expand Down
6 changes: 3 additions & 3 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6292,9 +6292,9 @@ pretender@^1.4.2:
fake-xml-http-request "^1.6.0"
route-recognizer "^0.3.3"

prettier@^1.13.6:
version "1.13.6"
resolved "https://registry.npmjs.org/prettier/-/prettier-1.13.6.tgz#00ae0b777ad92f81a9e7a1df2f0470b6dab0cb44"
prettier@^1.14.0:
version "1.14.0"
resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.14.0.tgz#847c235522035fd988100f1f43cf20a7d24f9372"

pretty-ms@^3.1.0:
version "3.2.0"
Expand Down