noth/surrealpatch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update emberjs@2.6.2

Browse source
This commit is contained in:
Tobie Morgan Hitchcock 2016-07-11 14:49:23 +01:00
parent 8e2c21af35
commit 1d08e89f7b
4 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gui/bower.json
View file

@ -1,7 +1,7 @@
{ {
"name": "gui", "name": "gui",
"dependencies": { "dependencies": {
"ember": "~2.5.0", "ember": "~2.6.0",
"ember-cli-shims": "0.1.1", "ember-cli-shims": "0.1.1",
"ember-cli-test-loader": "0.2.2", "ember-cli-test-loader": "0.2.2",
"ember-qunit-notifications": "0.1.0" "ember-qunit-notifications": "0.1.0"

9
gui/package.json
View file

@ -20,8 +20,8 @@
"license": "MIT", "license": "MIT",
"devDependencies": { "devDependencies": {
"broccoli-asset-rev": "^2.4.2", "broccoli-asset-rev": "^2.4.2",
"ember-ajax": "0.7.1", "ember-ajax": "^2.0.1",
"ember-cli": "2.5.0", "ember-cli": "2.6.2",
"ember-cli-app-version": "^1.0.0", "ember-cli-app-version": "^1.0.0",
"ember-cli-babel": "^5.1.6", "ember-cli-babel": "^5.1.6",
"ember-cli-dependency-checker": "^1.2.0", "ember-cli-dependency-checker": "^1.2.0",
@ -30,13 +30,14 @@
"ember-cli-inject-live-reload": "^1.4.0", "ember-cli-inject-live-reload": "^1.4.0",
"ember-cli-jshint": "^1.0.0", "ember-cli-jshint": "^1.0.0",
"ember-cli-qunit": "^1.4.0", "ember-cli-qunit": "^1.4.0",
"ember-cli-release": "0.2.8", "ember-cli-release": "^0.2.9",
"ember-cli-sri": "^2.1.0", "ember-cli-sri": "^2.1.0",
"ember-cli-uglify": "^1.2.0", "ember-cli-uglify": "^1.2.0",
"ember-data": "^2.5.0", "ember-data": "^2.6.0",
"ember-export-application-global": "^1.0.5", "ember-export-application-global": "^1.0.5",
"ember-load-initializers": "^0.5.1", "ember-load-initializers": "^0.5.1",
"ember-resolver": "^2.0.3", "ember-resolver": "^2.0.3",
"ember-welcome-page": "^1.0.1",
"loader.js": "^4.0.1" "loader.js": "^4.0.1"
} }
} }

3
gui/public/robots.txt
View file

@ -1,2 +1,3 @@
# http://www.robotstxt.org
User-agent: * User-agent: *
Disallow: Disallow:

12
gui/tests/helpers/module-for-acceptance.js
View file

@ -1,23 +1,23 @@
import { module } from 'qunit'; import { module } from 'qunit';
import Ember from 'ember';
import startApp from '../helpers/start-app'; import startApp from '../helpers/start-app';
import destroyApp from '../helpers/destroy-app'; import destroyApp from '../helpers/destroy-app';
const { RSVP: { Promise } } = Ember;
export default function(name, options = {}) { export default function(name, options = {}) {
module(name, { module(name, {
beforeEach() { beforeEach() {
this.application = startApp(); this.application = startApp();
if (options.beforeEach) { if (options.beforeEach) {
options.beforeEach.apply(this, arguments); return options.beforeEach.apply(this, arguments);
} }
}, },
afterEach() { afterEach() {
if (options.afterEach) { let afterEach = options.afterEach && options.afterEach.apply(this, arguments);
options.afterEach.apply(this, arguments); return Promise.resolve(afterEach).then(() => destroyApp(this.application));
}
destroyApp(this.application);
} }
}); });
} }