diff --git a/app/services/dependency-resolver.js b/app/services/dependency-resolver.js index 427616f4..bc067e08 100644 --- a/app/services/dependency-resolver.js +++ b/app/services/dependency-resolver.js @@ -2,8 +2,8 @@ import Ember from 'ember'; import config from '../config/environment'; import { task, timeout } from 'ember-concurrency'; -const EMBER_VERSIONS = ['2.8.0', '2.7.3', '2.6.2', '2.5.1', '2.4.5', '2.3.2', '2.2.2', '2.1.2', '2.0.3', '1.13.13', '1.12.2']; -const EMBER_DATA_VERSIONS = ['2.8.0', '2.7.0', '2.6.2', '2.5.5', '2.4.3', '2.3.3', '2.2.1', '2.1.0', '2.0.1', '1.13.15']; +const EMBER_VERSIONS = ['2.9.0', '2.8.2', '2.7.3', '2.6.2', '2.5.1', '2.4.5', '2.3.2', '2.2.2', '2.1.2', '2.0.3', '1.13.13', '1.12.2']; +const EMBER_DATA_VERSIONS = ['2.9.0', '2.8.1', '2.7.0', '2.6.2', '2.5.5', '2.4.3', '2.3.3', '2.2.1', '2.1.0', '2.0.1', '1.13.15']; const VERSION_REGEX = /^\d+.\d+.\d+(-beta\.\d+)?$/; diff --git a/blueprints/twiddle.json b/blueprints/twiddle.json index 49323e65..5da46692 100644 --- a/blueprints/twiddle.json +++ b/blueprints/twiddle.json @@ -1,5 +1,5 @@ { - "version": "0.10.5", + "version": "0.10.6", "EmberENV": { "FEATURES": {} }, @@ -9,10 +9,10 @@ }, "dependencies": { "jquery": "https://cdnjs.cloudflare.com/ajax/libs/jquery/1.11.3/jquery.js", - "ember": "2.8.0", - "ember-data": "2.8.0", - "ember-template-compiler": "2.8.0", - "ember-testing": "2.8.0" + "ember": "2.9.0", + "ember-data": "2.9.0", + "ember-template-compiler": "2.9.0", + "ember-testing": "2.9.0" }, "addons": {} } diff --git a/bower.json b/bower.json index bc18d543..9289d4a8 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "ember-twiddle", - "version": "0.10.5", + "version": "0.10.6", "dependencies": { "ember": "2.8.0", "ember-cli-shims": "0.1.1", diff --git a/package.json b/package.json index 86d3a8d7..51f7e874 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ember-twiddle", - "version": "0.10.5", + "version": "0.10.6", "description": "https://ember-twiddle.com", "private": true, "directories": { @@ -43,15 +43,15 @@ "ember-cli-deploy-s3-pack": "~0.1.5", "ember-cli-deploy-slack": "0.1.0", "ember-cli-document-title": "0.3.1", - "ember-cli-fastboot": "1.0.0-beta.7", - "ember-cli-file-creator": "~0.3.0", + "ember-cli-fastboot": "1.0.0-beta.9", + "ember-cli-file-creator": "~0.4.0", "ember-cli-htmlbars": "~1.0.3", "ember-cli-htmlbars-inline-precompile": "^0.3.1", "ember-cli-inject-live-reload": "^1.4.0", "ember-cli-jshint": "~1.0.0", - "ember-cli-jstree": "ritesh83/ember-cli-jstree#cda17d9e88911c5bbd245a498ba633571305347f", + "ember-cli-jstree": "~1.0.7", "ember-cli-legacy-blueprints": "^0.1.0", - "ember-cli-mirage": "~0.2.1", + "ember-cli-mirage": "0.2.2", "ember-cli-moment-shim": "~2.0.0", "ember-cli-qunit": "~2.1.0", "ember-cli-release": "1.0.0-beta.2", diff --git a/tests/acceptance/columns-test.js b/tests/acceptance/columns-test.js index 6cbec7bf..46e8faf1 100644 --- a/tests/acceptance/columns-test.js +++ b/tests/acceptance/columns-test.js @@ -3,7 +3,7 @@ import moduleForAcceptance from 'ember-twiddle/tests/helpers/module-for-acceptan moduleForAcceptance('Acceptance | columns', { beforeEach: function() { - server.create('user', 'octocat'); + server.create('user', { login: 'octocat' }); } }); diff --git a/tests/acceptance/delete-test.js b/tests/acceptance/delete-test.js index f2284a6f..eac2d770 100644 --- a/tests/acceptance/delete-test.js +++ b/tests/acceptance/delete-test.js @@ -7,7 +7,7 @@ moduleForAcceptance('Acceptance | delete gist', { this.cacheConfirm = window.confirm; window.confirm = () => true; - server.create('user', 'octocat'); + server.create('user', { login: 'octocat' }); }, afterEach: function() { diff --git a/tests/acceptance/fork-test.js b/tests/acceptance/fork-test.js index ad438791..5e878ef1 100644 --- a/tests/acceptance/fork-test.js +++ b/tests/acceptance/fork-test.js @@ -1,21 +1,22 @@ import { test } from 'qunit'; import moduleForAcceptance from 'ember-twiddle/tests/helpers/module-for-acceptance'; import { stubValidSession } from 'ember-twiddle/tests/helpers/torii'; -import { faker } from 'ember-cli-mirage'; +import Mirage from 'ember-cli-mirage'; moduleForAcceptance('Acceptance | fork gist', { beforeEach: function() { this.cacheConfirm = window.confirm; window.confirm = () => true; - this.cacheRandom = faker.random; - faker.seed(0.1); + server.create('user', { login: 'octocat' }); - server.create('user', 'octocat'); + server.post('/gists/:id/forks', () => { + let gist = server.create('gist', { id: 'bd9d8d69-a674-4e0f-867c-c8796ed151a0' }); + return new Mirage.Response(200, {}, gist); + }); }, afterEach: function() { window.confirm = this.cacheConfirm; - faker.random = this.cacheRandom; } }); diff --git a/tests/acceptance/gist-test.js b/tests/acceptance/gist-test.js index 8ca3acb6..4e4cd521 100644 --- a/tests/acceptance/gist-test.js +++ b/tests/acceptance/gist-test.js @@ -27,7 +27,7 @@ moduleForAcceptance('Acceptance | gist', { window.confirm = () => true; window.prompt = () => promptValue; - server.create('user', 'octocat'); + server.create('user', { login: 'octocat' }); }, afterEach: function() { diff --git a/tests/acceptance/save-test.js b/tests/acceptance/save-test.js index c7347e9f..4d08aca9 100644 --- a/tests/acceptance/save-test.js +++ b/tests/acceptance/save-test.js @@ -7,7 +7,7 @@ moduleForAcceptance('Acceptance | save gist', { this.cacheConfirm = window.confirm; window.confirm = () => true; - server.create('user', 'octocat'); + server.create('user', { login: 'octocat' }); }, afterEach: function() { diff --git a/tests/acceptance/twiddles-test.js b/tests/acceptance/twiddles-test.js index 70b03c73..ecee62e6 100644 --- a/tests/acceptance/twiddles-test.js +++ b/tests/acceptance/twiddles-test.js @@ -7,7 +7,7 @@ const { K } = Ember; moduleForAcceptance('Acceptance | twiddles', { beforeEach: function() { - server.create('user', 'octocat'); + server.create('user', { login: 'octocat' }); const owner = server.create('owner', {login: 'octocat'}); const file = server.create('gist-file', { login: "octocat", diff --git a/tests/acceptance/update-title-test.js b/tests/acceptance/update-title-test.js index cceb32c0..a4b28b60 100644 --- a/tests/acceptance/update-title-test.js +++ b/tests/acceptance/update-title-test.js @@ -3,7 +3,7 @@ import moduleForAcceptance from 'ember-twiddle/tests/helpers/module-for-acceptan moduleForAcceptance('Acceptance | title input', { beforeEach: function() { - server.create('user', 'octocat'); + server.create('user', { login: 'octocat' }); } });