Skip to content

Commit 3e48455

Browse files
committed
Upgrade to ember-cli-qunit@4
1 parent 898a5be commit 3e48455

6 files changed

Lines changed: 36 additions & 26 deletions

File tree

app/components/main-gist.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import FilesMixin from "../mixins/files";
55
import TestFilesMixin from "../mixins/test-files";
66
import AppBuilderMixin from "../mixins/app-builder";
77

8-
const { inject, computed } = Ember;
8+
const { inject, computed, run } = Ember;
99

1010
export default Ember.Component.extend(AppBuilderMixin, ColumnsMixin, FilesMixin, TestFilesMixin, {
1111
emberCli: inject.service(),
@@ -124,7 +124,7 @@ export default Ember.Component.extend(AppBuilderMixin, ColumnsMixin, FilesMixin,
124124

125125
selectFile (file) {
126126
this.set('activeFile', file);
127-
this.updateOpenFiles();
127+
run.scheduleOnce('afterRender', this, this.updateOpenFiles);
128128
},
129129

130130
openFile(filePath) {
@@ -204,7 +204,7 @@ export default Ember.Component.extend(AppBuilderMixin, ColumnsMixin, FilesMixin,
204204

205205
removeColumn (col) {
206206
this.removeColumn(col);
207-
this.updateOpenFiles();
207+
run.scheduleOnce('afterRender', this, this.updateOpenFiles);
208208
this.get('transitionQueryParams')({numColumns: this.get('realNumColumns') - 1});
209209
},
210210

@@ -216,7 +216,7 @@ export default Ember.Component.extend(AppBuilderMixin, ColumnsMixin, FilesMixin,
216216
}).then((queryParams) => {
217217
this.setProperties(queryParams);
218218
this.initializeColumns();
219-
this.updateOpenFiles();
219+
run.scheduleOnce('afterRender', this, this.updateOpenFiles);
220220
});
221221
},
222222

@@ -232,7 +232,7 @@ export default Ember.Component.extend(AppBuilderMixin, ColumnsMixin, FilesMixin,
232232
fullScreen: false
233233
}).then(() => {
234234
this.initializeColumns();
235-
this.updateOpenFiles();
235+
run.scheduleOnce('afterRender', this, this.updateOpenFiles);
236236
});
237237
},
238238

app/mixins/files.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ export default Ember.Mixin.create({
2929
this.setColumnFile(fileColumn, file);
3030
this.set('activeEditorCol', '1');
3131
this.send('contentsChanged');
32-
this.updateOpenFiles();
32+
run.scheduleOnce('afterRender', this, this.updateOpenFiles);
3333
}
3434
},
3535

@@ -63,7 +63,7 @@ export default Ember.Mixin.create({
6363
this.setColumnFile(activeCol, file);
6464
this.set('activeEditorCol', activeCol);
6565
this.set('activeFile', file);
66-
this.updateOpenFiles();
66+
run.scheduleOnce('afterRender', this, this.updateOpenFiles);
6767
},
6868

6969
addFile(type) {
@@ -77,7 +77,7 @@ export default Ember.Mixin.create({
7777
return;
7878
}
7979
this.createFile(filePath, fileProperties);
80-
this.updateOpenFiles();
80+
run.scheduleOnce('afterRender', this, this.updateOpenFiles);
8181
},
8282

8383
renameFile(file) {
@@ -90,7 +90,7 @@ export default Ember.Mixin.create({
9090

9191
file.set('filePath', filePath);
9292
this.get('notify').info(`File ${file.get('filePath')} was added`);
93-
this.updateOpenFiles();
93+
run.scheduleOnce('afterRender', this, this.updateOpenFiles);
9494
}
9595
},
9696

@@ -105,8 +105,8 @@ export default Ember.Mixin.create({
105105
});
106106
}
107107

108-
this.updateOpenFiles();
109108
this.send('contentsChanged');
109+
run.scheduleOnce('afterRender', this, this.updateOpenFiles);
110110
},
111111

112112
addComponent(path) {

ember-cli-build.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
/* global require, module, process */
22
module.exports = function(defaults) {
3+
process.env.FASTBOOT_DISABLED = true;
4+
35
var EmberApp = require('ember-cli/lib/broccoli/ember-app');
46
var funnel = require('broccoli-funnel');
57
var concat = require('broccoli-concat');

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
"ember-cli-mirage": "~0.2.9",
5252
"ember-cli-moment-shim": "^2.2.1",
5353
"ember-cli-node-assets": "~0.2.2",
54-
"ember-cli-qunit": "^3.1.1",
54+
"ember-cli-qunit": "~4.0.0",
5555
"ember-cli-release": "1.0.0-beta.2",
5656
"ember-cli-sass": "^6.2.0",
5757
"ember-cli-shims": "~1.0.2",

tests/test-helper.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import resolver from './helpers/resolver';
33
import {
44
setResolver
55
} from 'ember-qunit';
6+
import { start } from 'ember-cli-qunit';
67
import createGist from "./helpers/create-gist";
78
import runGist from "./helpers/run-gist";
89
import runRevision from "./helpers/run-revision";
@@ -27,3 +28,5 @@ Ember.Test.registerAsyncHelper('runGist', runGist);
2728
Ember.Test.registerAsyncHelper('runRevision', runRevision);
2829
Ember.Test.registerAsyncHelper('waitForLoadedIFrame', waitForLoadedIFrame);
2930
Ember.Test.registerAsyncHelper('waitForUnloadedIFrame', waitForUnloadedIFrame);
31+
32+
start();

yarn.lock

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1379,7 +1379,7 @@ broccoli-asset-rewrite@^1.1.0:
13791379
dependencies:
13801380
broccoli-filter "^1.2.3"
13811381

1382-
broccoli-babel-transpiler@^5.5.0, broccoli-babel-transpiler@^5.6.2:
1382+
broccoli-babel-transpiler@^5.6.2:
13831383
version "5.7.4"
13841384
resolved "https://registry.yarnpkg.com/broccoli-babel-transpiler/-/broccoli-babel-transpiler-5.7.4.tgz#2b0611ce9e5d98b8d8d2b49ae1219af2f52767e3"
13851385
dependencies:
@@ -3375,21 +3375,20 @@ ember-cli-preprocess-registry@^3.1.0:
33753375
process-relative-require "^1.0.0"
33763376
silent-error "^1.0.0"
33773377

3378-
ember-cli-qunit@^3.1.1:
3379-
version "3.1.3"
3380-
resolved "https://registry.yarnpkg.com/ember-cli-qunit/-/ember-cli-qunit-3.1.3.tgz#1bc6e3fc00b5e50753ab443246bfc147a8d2acbc"
3378+
ember-cli-qunit@~4.0.0:
3379+
version "4.0.2"
3380+
resolved "https://registry.yarnpkg.com/ember-cli-qunit/-/ember-cli-qunit-4.0.2.tgz#4d4d9cad106ccf1be658d35015d344efbbcf8951"
33813381
dependencies:
3382-
broccoli-babel-transpiler "^5.5.0"
3383-
broccoli-funnel "^1.0.1"
3384-
broccoli-merge-trees "^1.1.0"
3385-
ember-cli-babel "^5.1.5"
3386-
ember-cli-test-loader "^1.1.1"
3387-
ember-cli-version-checker "^1.1.4"
3388-
ember-qunit "^2.0.0-beta.1"
3382+
broccoli-funnel "^2.0.0"
3383+
broccoli-merge-trees "^2.0.0"
3384+
ember-cli-babel "^6.8.1"
3385+
ember-cli-test-loader "^2.2.0"
3386+
ember-cli-version-checker "^2.0.0"
3387+
ember-qunit "^2.2.0"
33893388
qunit "^2.4.1"
33903389
qunit-notifications "^0.1.1"
3391-
resolve "^1.1.6"
3392-
silent-error "^1.0.0"
3390+
resolve "^1.4.0"
3391+
silent-error "^1.1.0"
33933392

33943393
ember-cli-release@1.0.0-beta.2:
33953394
version "1.0.0-beta.2"
@@ -3447,6 +3446,12 @@ ember-cli-test-loader@^1.1.1:
34473446
dependencies:
34483447
ember-cli-babel "^5.2.1"
34493448

3449+
ember-cli-test-loader@^2.2.0:
3450+
version "2.2.0"
3451+
resolved "https://registry.yarnpkg.com/ember-cli-test-loader/-/ember-cli-test-loader-2.2.0.tgz#3fb8d5d1357e4460d3f0a092f5375e71b6f7c243"
3452+
dependencies:
3453+
ember-cli-babel "^6.8.1"
3454+
34503455
ember-cli-uglify@^2.1.0:
34513456
version "2.1.0"
34523457
resolved "https://registry.yarnpkg.com/ember-cli-uglify/-/ember-cli-uglify-2.1.0.tgz#4a0641fe4768d7ab7d4807aca9924cc77c544184"
@@ -3460,7 +3465,7 @@ ember-cli-valid-component-name@^1.0.0:
34603465
dependencies:
34613466
silent-error "^1.0.0"
34623467

3463-
ember-cli-version-checker@^1.0.2, ember-cli-version-checker@^1.1.4, ember-cli-version-checker@^1.1.7, ember-cli-version-checker@^1.2.0:
3468+
ember-cli-version-checker@^1.0.2, ember-cli-version-checker@^1.1.7, ember-cli-version-checker@^1.2.0:
34643469
version "1.3.1"
34653470
resolved "https://registry.yarnpkg.com/ember-cli-version-checker/-/ember-cli-version-checker-1.3.1.tgz#0bc2d134c830142da64bf9627a0eded10b61ae72"
34663471
dependencies:
@@ -3720,7 +3725,7 @@ ember-notify@^5.2.1:
37203725
ember-string-ishtmlsafe-polyfill "^1.1.0"
37213726
object-assign "^4.1.0"
37223727

3723-
ember-qunit@^2.0.0-beta.1:
3728+
ember-qunit@^2.2.0:
37243729
version "2.2.0"
37253730
resolved "https://registry.yarnpkg.com/ember-qunit/-/ember-qunit-2.2.0.tgz#3cdf400031c93a38de781a7304819738753b7f99"
37263731
dependencies:

0 commit comments

Comments
 (0)