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.

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

Update ember, ember-{cli,data} to 2.8 #480

Merged
merged 4 commits into from
Sep 14, 2016
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: 3 additions & 5 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@
"name": "ember-twiddle",
"version": "0.10.5",
"dependencies": {
"ember": "2.7.0",
"ember": "2.8.0",
"ember-cli-shims": "0.1.1",
"ember-qunit-notifications": "0.1.0",
"jquery": "1.11.3",
"codemirror": "~5.17.0",
"bootstrap-sass": "~3.3.5",
Expand All @@ -17,8 +16,7 @@
},
"resolutions": {
"codemirror": "~5.17.0",
"ember": "2.7.0",
"FakeXMLHttpRequest": "^1.3.0",
"qunit-notifications": "~0.1.0"
"ember": "2.8.0",
"FakeXMLHttpRequest": "^1.3.0"
}
}
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"ember-api-actions": "~0.1.4",
"ember-autoresize": "0.5.16",
"ember-browserify": "1.1.11",
"ember-cli": "2.7.0",
"ember-cli": "2.8.0",
"ember-cli-app-version": "1.0.0",
"ember-cli-babel": "^5.1.6",
"ember-cli-bootstrap-sassy": "lifegadget/ember-cli-bootstrap-sassy#fa01943776a219905ee4a12bb9cd3981bba5c75a",
Expand Down Expand Up @@ -60,7 +60,7 @@
"ember-cli-test-loader": "~1.1.0",
"ember-cli-uglify": "~1.2.0",
"ember-concurrency": "~0.7.1",
"ember-data": "2.7.0",
"ember-data": "2.8.0",
"ember-disable-proxy-controllers": "1.0.1",
"ember-export-application-global": "~1.0.5",
"ember-git-version": "0.1.0",
Expand Down
2 changes: 1 addition & 1 deletion tests/.jshintrc
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,6 @@
"strict": false,
"white": false,
"eqnull": true,
"esnext": true,
"esversion": 6,
"unused": true
}
10 changes: 5 additions & 5 deletions tests/acceptance/gist-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ test('can add service', function(assert){
assert.equal(fileNames[3], promptValue, 'Added the file with the right name');

let columnFiles = findMapText(displayedFiles);
assert.ok(columnFiles.contains(promptValue), 'Added file is displayed');
assert.ok(columnFiles.includes(promptValue), 'Added file is displayed');
});
});

Expand All @@ -222,7 +222,7 @@ test('can add helper', function(assert){
assert.equal(fileNames[3], promptValue, 'Added the file with the right name');

let columnFiles = findMapText(displayedFiles);
assert.ok(columnFiles.contains(promptValue), 'Added file is displayed');
assert.ok(columnFiles.includes(promptValue), 'Added file is displayed');
});
});

Expand All @@ -248,7 +248,7 @@ test('can add unit test', function(assert){
assert.equal(fileNames[fileNames.length - 1], promptValue, 'Added the file with the right name');

let columnFiles = findMapText(displayedFiles);
assert.ok(columnFiles.contains(promptValue), 'Added file is displayed');
assert.ok(columnFiles.includes(promptValue), 'Added file is displayed');
});
});

Expand All @@ -274,7 +274,7 @@ test('can add integration test', function(assert){
assert.equal(fileNames[fileNames.length - 1], promptValue, 'Added the file with the right name');

let columnFiles = findMapText(displayedFiles);
assert.ok(columnFiles.contains(promptValue), 'Added file is displayed');
assert.ok(columnFiles.includes(promptValue), 'Added file is displayed');
});
});

Expand All @@ -300,7 +300,7 @@ test('can add acceptance test', function(assert){
assert.equal(fileNames[fileNames.length - 1], promptValue, 'Added the file with the right name');

let columnFiles = findMapText(displayedFiles);
assert.ok(columnFiles.contains(promptValue), 'Added file is displayed');
assert.ok(columnFiles.includes(promptValue), 'Added file is displayed');
});
});

Expand Down
4 changes: 2 additions & 2 deletions tests/helpers/module-for-acceptance.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { module } from 'qunit';
import Ember from "ember";
import Ember from 'ember';
import startApp from '../helpers/start-app';
import destroyApp from '../helpers/destroy-app';

const { RSVP : { Promise } } = Ember;
const { RSVP: { Promise } } = Ember;

export default function(name, options = {}) {
module(name, {
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/models/gist-file-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ test('it calls "registerDeletedFile" on gist relationship when deleting a record

const adapter = DS.Adapter.extend({
createRecord() {
return Ember.RSVP.resolve();
return Ember.RSVP.resolve({ id: 1 });
}
});
this.register('adapter:application', adapter);
Expand Down