Skip to content
This repository was archived by the owner on Dec 31, 2022. It is now read-only.

Commit eec179d

Browse files
authored
Merge pull request #216 from typed-ember/bump-ember-cli
chore(deps): upgrade Ember CLI to latest
2 parents 7f46c5c + 4d5dc04 commit eec179d

File tree

170 files changed

+2974
-7883
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

170 files changed

+2974
-7883
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ language: node_js
33
node_js:
44
# we recommend testing addons with the same minimum supported node version as Ember CLI
55
# so that your addon works for all apps
6-
- "8"
6+
- "10"
77

88
sudo: false
99
dist: trusty

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ init:
77
# Test against these versions of Node.js.
88
environment:
99
matrix:
10-
- nodejs_version: "8"
10+
- nodejs_version: "10"
1111

1212
# Install scripts. (runs after repo cloning)
1313
install:

azure-pipelines.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ trigger:
1414
steps:
1515
- task: NodeTool@0
1616
inputs:
17-
versionSpec: '8.x'
17+
versionSpec: '10.x'
1818
displayName: 'Install Node.js'
1919

2020
- script: |
Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,13 @@
1-
import { describe, it, beforeEach, afterEach } from 'mocha';
1+
import { describe, it } from 'mocha';
22
import { expect } from 'chai';
3-
import startApp from '<%= dasherizedPackageName %>/tests/helpers/start-app';
4-
<% if (destroyAppExists) { %>import destroyApp from '<%= dasherizedPackageName %>/tests/helpers/destroy-app';<% } else { %>import { run } from '@ember/runloop';<% } %>
3+
import { setupApplicationTest } from 'ember-mocha';
4+
import { visit, currentURL } from '@ember/test-helpers';
55

66
describe('<%= friendlyTestName %>', function() {
7-
let application;
7+
setupApplicationTest();
88

9-
beforeEach(function() {
10-
application = startApp();
11-
});
12-
13-
afterEach(function() {
14-
<% if (destroyAppExists) { %>destroyApp(application);<% } else { %>run(application, 'destroy');<% } %>
15-
});
16-
17-
it('can visit /<%= dasherizedModuleName %>', function() {
18-
visit('/<%= dasherizedModuleName %>');
19-
20-
return andThen(() => {
21-
expect(currentURL()).to.equal('/<%= dasherizedModuleName %>');
22-
});
9+
it('can visit /<%= dasherizedModuleName %>', async function() {
10+
await visit('/<%= dasherizedModuleName %>');
11+
expect(currentURL()).to.equal('/<%= dasherizedModuleName %>');
2312
});
2413
});

blueprints/acceptance-test/mocha-rfc-232-files/tests/acceptance/__name__-test.ts

Lines changed: 0 additions & 13 deletions
This file was deleted.
Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
1-
import { test } from 'qunit';
2-
import moduleForAcceptance from '<%= testFolderRoot %>/tests/helpers/module-for-acceptance';
1+
import { module, test } from 'qunit';
2+
import { visit, currentURL } from '@ember/test-helpers';
3+
import { setupApplicationTest } from 'ember-qunit';
34

4-
moduleForAcceptance('<%= friendlyTestName %>');
5+
module('<%= friendlyTestName %>', function(hooks) {
6+
setupApplicationTest(hooks);
57

6-
test('visiting /<%= dasherizedModuleName %>', function(assert) {
7-
visit('/<%= dasherizedModuleName %>');
8+
test('visiting /<%= dasherizedModuleName %>', async function(assert) {
9+
await visit('/<%= dasherizedModuleName %>');
810

9-
andThen(function() {
1011
assert.equal(currentURL(), '/<%= dasherizedModuleName %>');
1112
});
1213
});

blueprints/acceptance-test/qunit-rfc-232-files/tests/acceptance/__name__-test.ts

Lines changed: 0 additions & 13 deletions
This file was deleted.

blueprints/adapter-test/mocha-files/tests/unit/__path__/__test__.ts

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,11 @@ import { describe, it } from 'mocha';
33
import { setupTest } from 'ember-mocha';
44

55
describe('<%= friendlyTestDescription %>', function() {
6-
setupTest('adapter:<%= dasherizedModuleName %>', {
7-
// Specify the other units that are required for this test.
8-
// needs: ['serializer:foo']
9-
});
6+
setupTest();
107

118
// Replace this with your real tests.
129
it('exists', function() {
13-
let adapter = this.subject();
10+
let adapter = this.owner.lookup('adapter:<%= dasherizedModuleName %>');
1411
expect(adapter).to.be.ok;
1512
});
1613
});
Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
import { moduleFor, test } from 'ember-qunit';
1+
import { module, test } from 'qunit';
2+
import { setupTest } from 'ember-qunit';
23

3-
moduleFor('adapter:<%= dasherizedModuleName %>', '<%= friendlyTestDescription %>', {
4-
// Specify the other units that are required for this test.
5-
// needs: ['serializer:foo']
6-
});
4+
module('<%= friendlyTestDescription %>', function(hooks) {
5+
setupTest(hooks);
76

8-
// Replace this with your real tests.
9-
test('it exists', function(assert) {
10-
let adapter = this.subject();
11-
assert.ok(adapter);
7+
// Replace this with your real tests.
8+
test('it exists', function(assert) {
9+
let adapter = this.owner.lookup('adapter:<%= dasherizedModuleName %>');
10+
assert.ok(adapter);
11+
});
1212
});

blueprints/adapter-test/qunit-rfc-232-files/tests/unit/__path__/__test__.ts

Lines changed: 0 additions & 12 deletions
This file was deleted.

0 commit comments

Comments
 (0)