Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 5 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
language: node_js
node_js:
- "6"
- "8"

sudo: required
dist: trusty
Expand All @@ -24,6 +24,10 @@ env:
- EMBER_TRY_SCENARIO=ember-lts-2.8
- EMBER_TRY_SCENARIO=ember-lts-2.12
- EMBER_TRY_SCENARIO=ember-lts-2.16
- EMBER_TRY_SCENARIO=ember-lts-2.18
- EMBER_TRY_SCENARIO=ember-lts-3.4
- EMBER_TRY_SCENARIO=ember-lts-3.8
- EMBER_TRY_SCENARIO=ember-lts-3.12
- EMBER_TRY_SCENARIO=ember-release
- EMBER_TRY_SCENARIO=ember-beta
- EMBER_TRY_SCENARIO=ember-canary
Expand All @@ -36,8 +40,6 @@ matrix:
- env: EMBER_TRY_SCENARIO=ember-canary

before_install:
- npm config set spin false
- npm install -g npm@4
- npm --version

script:
Expand Down
29 changes: 28 additions & 1 deletion config/ember-try.js
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,33 @@ module.exports = function() {
}
}
},
{
name: 'ember-lts-3.4',
npm: {
devDependencies: {
'ember-source': '~3.4.0',
'ember-data': '~3.4.0',
}
}
},
{
name: 'ember-lts-3.8',
npm: {
devDependencies: {
'ember-source': '~3.8.0',
'ember-data': '~3.8.0',
}
}
},
{
name: 'ember-lts-3.12',
npm: {
devDependencies: {
'ember-source': '~3.12.0',
'ember-data': '~3.12.0',
}
}
},
{
name: 'ember-release',
npm: {
Expand Down Expand Up @@ -121,4 +148,4 @@ module.exports = function() {
]
};
});
};
};
5 changes: 2 additions & 3 deletions tests/integration/adapters/pouch-basics-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -286,8 +286,7 @@ test('creating an associated record stores a reference to it in the parent', fun
//tacoSoup.save() actually not needed in !savingHasmany mode, but should still work
return newIngredient.save().then(() => savingHasMany() ? tacoSoup.save() : tacoSoup);
}).then(() => {
this.store().unloadAll();

Ember.run(() => this.store().unloadAll());
return this.store().findRecord('taco-soup', 'C');
}).then(tacoSoup => {
return tacoSoup.get('ingredients');
Expand Down Expand Up @@ -423,7 +422,7 @@ test('delete cascade null', function (assert) {
.then((found) => {
return found.destroyRecord();
}).then(() => {
this.store().unloadAll();//to make sure the record is unloaded, normally this would be done by onChange listeren
Ember.run(() => this.store().unloadAll()); // normally this would be done by onChange listener
return this.store().findRecord('food-item', 'Z');//Z should be updated now
})
.then((found) => {
Expand Down