Skip to content

Commit

Permalink
update demo app ember-cli version to 1.13.13
Browse files Browse the repository at this point in the history
  • Loading branch information
bantic committed Jul 8, 2016
1 parent 9a470af commit ce7f1d9
Show file tree
Hide file tree
Showing 11 changed files with 56 additions and 31 deletions.
2 changes: 1 addition & 1 deletion demo/.watchmanconfig
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"ignore_dirs": ["tmp"]
"ignore_dirs": ["tmp", "dist"]
}
4 changes: 2 additions & 2 deletions demo/app/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ import Resolver from 'ember/resolver';
import loadInitializers from 'ember/load-initializers';
import config from './config/environment';

var App;
let App;

Ember.MODEL_FACTORY_INJECTIONS = true;

App = Ember.Application.extend({
modulePrefix: config.modulePrefix,
podModulePrefix: config.podModulePrefix,
Resolver: Resolver
Resolver
});

loadInitializers(App, config.modulePrefix);
Expand Down
2 changes: 1 addition & 1 deletion demo/app/router.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Ember from 'ember';
import config from './config/environment';

var Router = Ember.Router.extend({
const Router = Ember.Router.extend({
location: config.locationType
});

Expand Down
14 changes: 7 additions & 7 deletions demo/bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
"name": "mobiledoc-kit-demo",
"dependencies": {
"ember": "^2.2.0",
"ember-cli-shims": "ember-cli/ember-cli-shims#0.0.6",
"ember-cli-test-loader": "ember-cli-test-loader#0.2.1",
"ember-load-initializers": "ember-cli/ember-load-initializers#0.1.7",
"ember-qunit": "^0.4.16",
"ember-qunit-notifications": "0.0.7",
"ember-resolver": "~0.1.18",
"ember-cli-shims": "0.0.6",
"ember-cli-test-loader": "0.2.1",
"ember-load-initializers": "0.1.7",
"ember-qunit": "0.4.16",
"ember-qunit-notifications": "0.1.0",
"ember-resolver": "~0.1.20",
"jquery": "~2.1.1",
"loader.js": "ember-cli/loader.js#3.3.0",
"loader.js": "ember-cli/loader.js#3.4.0",
"qunit": "~1.20.0",
"codemirror": "~5.8.0"
}
Expand Down
1 change: 1 addition & 0 deletions demo/ember-cli-build.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/*jshint node:true*/
/* global require, module */
var EmberApp = require('ember-cli/lib/broccoli/ember-app');

Expand Down
28 changes: 14 additions & 14 deletions demo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,28 +19,28 @@
"author": "",
"license": "MIT",
"devDependencies": {
"broccoli-asset-rev": "^2.1.2",
"ember-cli": "1.13.8",
"ember-cli-app-version": "0.5.0",
"ember-cli-babel": "^5.1.3",
"ember-cli-dependency-checker": "^1.0.1",
"ember-cli-htmlbars": "0.7.9",
"ember-cli-htmlbars-inline-precompile": "^0.2.0",
"ember-cli-ic-ajax": "0.2.1",
"broccoli-asset-rev": "^2.2.0",
"ember-cli": "1.13.13",
"ember-cli-app-version": "^1.0.0",
"ember-cli-babel": "^5.1.5",
"ember-cli-dependency-checker": "^1.1.0",
"ember-cli-htmlbars": "^1.0.1",
"ember-cli-htmlbars-inline-precompile": "^0.3.1",
"ember-cli-ic-ajax": "0.2.4",
"ember-cli-inject-live-reload": "^1.3.1",
"ember-cli-qunit": "^1.0.0",
"ember-cli-release": "0.2.3",
"ember-cli-sri": "^1.0.3",
"ember-cli-qunit": "^1.0.4",
"ember-cli-release": "0.2.8",
"ember-cli-sri": "^1.2.0",
"ember-cli-uglify": "^1.2.0",
"ember-mobiledoc-editor": "^0.4.1",
"ember-disable-proxy-controllers": "^1.0.0",
"ember-export-application-global": "^1.0.3",
"ember-disable-proxy-controllers": "^1.0.1",
"ember-export-application-global": "^1.0.4",
"ember-mobiledoc-dom-renderer": "^0.4.1",
"ember-mobiledoc-html-renderer": "^0.3.0",
"ember-mobiledoc-text-renderer": "^0.3.0"
},
"dependencies": {
"ember-browserify": "^1.1.9",
"mobiledoc-pretty-json-renderer": "^2.0.0"
"mobiledoc-pretty-json-renderer": "bantic/mobiledoc-pretty-json-renderer#make-ie-11-compatible"
}
}
23 changes: 23 additions & 0 deletions demo/tests/helpers/module-for-acceptance.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import { module } from 'qunit';
import startApp from '../helpers/start-app';
import destroyApp from '../helpers/destroy-app';

export default function(name, options = {}) {
module(name, {
beforeEach() {
this.application = startApp();

if (options.beforeEach) {
options.beforeEach.apply(this, arguments);
}
},

afterEach() {
destroyApp(this.application);

if (options.afterEach) {
options.afterEach.apply(this, arguments);
}
}
});
}
2 changes: 1 addition & 1 deletion demo/tests/helpers/resolver.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Resolver from 'ember/resolver';
import config from '../../config/environment';

var resolver = Resolver.create();
const resolver = Resolver.create();

resolver.namespace = {
modulePrefix: config.modulePrefix,
Expand Down
6 changes: 3 additions & 3 deletions demo/tests/helpers/start-app.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ import Application from '../../app';
import config from '../../config/environment';

export default function startApp(attrs) {
var application;
let application;

var attributes = Ember.merge({}, config.APP);
let attributes = Ember.merge({}, config.APP);
attributes = Ember.merge(attributes, attrs); // use defaults, but you can override;

Ember.run(function() {
Ember.run(() => {
application = Application.create(attributes);
application.setupForTesting();
application.injectTestHelpers();
Expand Down
5 changes: 3 additions & 2 deletions demo/tests/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,14 @@
{{content-for 'test-head-footer'}}
</head>
<body>

{{content-for 'body'}}
{{content-for 'test-body'}}

<script src="assets/vendor.js"></script>
<script src="assets/test-support.js"></script>
<script src="assets/mobiledoc-kit-demo.js"></script>
<script src="testem.js"></script>
<script src="testem.js" integrity=""></script>
<script src="assets/tests.js"></script>
<script src="assets/test-loader.js"></script>

{{content-for 'body-footer'}}
Expand Down
Empty file added demo/tests/integration/.gitkeep
Empty file.

0 comments on commit ce7f1d9

Please sign in to comment.