Skip to content

Commit 027d38a

Browse files
chriskrychochriskrycho
authored
Merge pull request #121 from csantero/initializer-types
Add types to initializer and instance initializer blueprints
2 parents e4a0ce5 + 52c437a commit 027d38a

File tree

4 files changed

+54
-26
lines changed

4 files changed

+54
-26
lines changed

‎blueprints/initializer/files/__root__/initializers/__name__.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
export function initialize(/* application */) {
1+
import Application from '@ember/application';
2+
3+
export function initialize(application: Application): void {
24
// application.inject('route', 'foo', 'service:foo');
35
}
46

‎blueprints/instance-initializer/files/__root__/instance-initializers/__name__.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
export function initialize(/* appInstance */) {
1+
import ApplicationInstance from '@ember/application/instance';
2+
3+
export function initialize(appInstance: ApplicationInstance): void {
24
// appInstance.inject('route', 'foo', 'service:foo');
35
}
46

‎node-tests/blueprints/initializer-test.js

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ describe('Blueprint: initializer', function() {
2020
it('initializer foo', function() {
2121
return emberGenerateDestroy(['initializer', 'foo'], _file => {
2222
expect(_file('app/initializers/foo.ts'))
23-
.to.contain('export function initialize(/* application */) {')
23+
.to.contain('import Application from \'@ember/application\';')
24+
.to.contain('export function initialize(application: Application): void {')
2425
.to.contain(" // application.inject('route', 'foo', 'service:foo');")
2526
.to.contain('}')
2627
.to.contain('')
@@ -37,7 +38,8 @@ describe('Blueprint: initializer', function() {
3738
it('initializer foo/bar', function() {
3839
return emberGenerateDestroy(['initializer', 'foo/bar'], _file => {
3940
expect(_file('app/initializers/foo/bar.ts'))
40-
.to.contain('export function initialize(/* application */) {')
41+
.to.contain('import Application from \'@ember/application\';')
42+
.to.contain('export function initialize(application: Application): void {')
4143
.to.contain(" // application.inject('route', 'foo', 'service:foo');")
4244
.to.contain('}')
4345
.to.contain('')
@@ -54,7 +56,8 @@ describe('Blueprint: initializer', function() {
5456
it('initializer foo --pod', function() {
5557
return emberGenerateDestroy(['initializer', 'foo', '--pod'], _file => {
5658
expect(_file('app/initializers/foo.ts'))
57-
.to.contain('export function initialize(/* application */) {')
59+
.to.contain('import Application from \'@ember/application\';')
60+
.to.contain('export function initialize(application: Application): void {')
5861
.to.contain(" // application.inject('route', 'foo', 'service:foo');")
5962
.to.contain('}')
6063
.to.contain('')
@@ -67,7 +70,8 @@ describe('Blueprint: initializer', function() {
6770
it('initializer foo/bar --pod', function() {
6871
return emberGenerateDestroy(['initializer', 'foo/bar', '--pod'], _file => {
6972
expect(_file('app/initializers/foo/bar.ts'))
70-
.to.contain('export function initialize(/* application */) {')
73+
.to.contain('import Application from \'@ember/application\';')
74+
.to.contain('export function initialize(application: Application): void {')
7175
.to.contain(" // application.inject('route', 'foo', 'service:foo');")
7276
.to.contain('}')
7377
.to.contain('')
@@ -85,7 +89,8 @@ describe('Blueprint: initializer', function() {
8589
it('initializer foo --pod', function() {
8690
return emberGenerateDestroy(['initializer', 'foo', '--pod'], _file => {
8791
expect(_file('app/initializers/foo.ts'))
88-
.to.contain('export function initialize(/* application */) {')
92+
.to.contain('import Application from \'@ember/application\';')
93+
.to.contain('export function initialize(application: Application): void {')
8994
.to.contain(" // application.inject('route', 'foo', 'service:foo');")
9095
.to.contain('}')
9196
.to.contain('')
@@ -98,7 +103,8 @@ describe('Blueprint: initializer', function() {
98103
it('initializer foo/bar --pod', function() {
99104
return emberGenerateDestroy(['initializer', 'foo/bar', '--pod'], _file => {
100105
expect(_file('app/initializers/foo/bar.ts'))
101-
.to.contain('export function initialize(/* application */) {')
106+
.to.contain('import Application from \'@ember/application\';')
107+
.to.contain('export function initialize(application: Application): void {')
102108
.to.contain(" // application.inject('route', 'foo', 'service:foo');")
103109
.to.contain('}')
104110
.to.contain('')
@@ -120,7 +126,8 @@ describe('Blueprint: initializer', function() {
120126
it.skip('initializer foo', function() {
121127
return emberGenerateDestroy(['initializer', 'foo'], _file => {
122128
expect(_file('addon/initializers/foo.ts'))
123-
.to.contain('export function initialize(/* application */) {')
129+
.to.contain('import Application from \'@ember/application\';')
130+
.to.contain('export function initialize(application: Application): void {')
124131
.to.contain(" // application.inject('route', 'foo', 'service:foo');")
125132
.to.contain('}')
126133
.to.contain('')
@@ -141,7 +148,8 @@ describe('Blueprint: initializer', function() {
141148
it.skip('initializer foo/bar', function() {
142149
return emberGenerateDestroy(['initializer', 'foo/bar'], _file => {
143150
expect(_file('addon/initializers/foo/bar.ts'))
144-
.to.contain('export function initialize(/* application */) {')
151+
.to.contain('import Application from \'@ember/application\';')
152+
.to.contain('export function initialize(application: Application): void {')
145153
.to.contain(" // application.inject('route', 'foo', 'service:foo');")
146154
.to.contain('}')
147155
.to.contain('')
@@ -160,7 +168,8 @@ describe('Blueprint: initializer', function() {
160168
it('initializer foo --dumy', function() {
161169
return emberGenerateDestroy(['initializer', 'foo', '--dummy'], _file => {
162170
expect(_file('tests/dummy/app/initializers/foo.ts'))
163-
.to.contain('export function initialize(/* application */) {')
171+
.to.contain('import Application from \'@ember/application\';')
172+
.to.contain('export function initialize(application: Application): void {')
164173
.to.contain(" // application.inject('route', 'foo', 'service:foo');")
165174
.to.contain('}')
166175
.to.contain('')
@@ -177,7 +186,8 @@ describe('Blueprint: initializer', function() {
177186
it('initializer foo/bar --dummy', function() {
178187
return emberGenerateDestroy(['initializer', 'foo/bar', '--dummy'], _file => {
179188
expect(_file('tests/dummy/app/initializers/foo/bar.ts'))
180-
.to.contain('export function initialize(/* application */) {')
189+
.to.contain('import Application from \'@ember/application\';')
190+
.to.contain('export function initialize(application: Application): void {')
181191
.to.contain(" // application.inject('route', 'foo', 'service:foo');")
182192
.to.contain('}')
183193
.to.contain('')
@@ -212,7 +222,8 @@ describe('Blueprint: initializer', function() {
212222
it('initializer foo --in-repo-addon=my-addon', function() {
213223
return emberGenerateDestroy(['initializer', 'foo', '--in-repo-addon=my-addon'], _file => {
214224
expect(_file('lib/my-addon/addon/initializers/foo.ts'))
215-
.to.contain('export function initialize(/* application */) {')
225+
.to.contain('import Application from \'@ember/application\';')
226+
.to.contain('export function initialize(application: Application): void {')
216227
.to.contain(" // application.inject('route', 'foo', 'service:foo');")
217228
.to.contain('}')
218229
.to.contain('')
@@ -231,7 +242,8 @@ describe('Blueprint: initializer', function() {
231242
it('initializer foo/bar --in-repo-addon=my-addon', function() {
232243
return emberGenerateDestroy(['initializer', 'foo/bar', '--in-repo-addon=my-addon'], _file => {
233244
expect(_file('lib/my-addon/addon/initializers/foo/bar.ts'))
234-
.to.contain('export function initialize(/* application */) {')
245+
.to.contain('import Application from \'@ember/application\';')
246+
.to.contain('export function initialize(application: Application): void {')
235247
.to.contain(" // application.inject('route', 'foo', 'service:foo');")
236248
.to.contain('}')
237249
.to.contain('')

‎node-tests/blueprints/instance-initializer-test.js

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ describe('Blueprint: instance-initializer', function() {
2020
it('instance-initializer foo', function() {
2121
return emberGenerateDestroy(['instance-initializer', 'foo'], _file => {
2222
expect(_file('app/instance-initializers/foo.ts'))
23-
.to.contain('export function initialize(/* appInstance */) {')
23+
.to.contain('import ApplicationInstance from \'@ember/application/instance\';')
24+
.to.contain('export function initialize(appInstance: ApplicationInstance): void {')
2425
.to.contain(" // appInstance.inject('route', 'foo', 'service:foo');")
2526
.to.contain('}')
2627
.to.contain('')
@@ -37,7 +38,8 @@ describe('Blueprint: instance-initializer', function() {
3738
it('instance-initializer foo/bar', function() {
3839
return emberGenerateDestroy(['instance-initializer', 'foo/bar'], _file => {
3940
expect(_file('app/instance-initializers/foo/bar.ts'))
40-
.to.contain('export function initialize(/* appInstance */) {')
41+
.to.contain('import ApplicationInstance from \'@ember/application/instance\';')
42+
.to.contain('export function initialize(appInstance: ApplicationInstance): void {')
4143
.to.contain(" // appInstance.inject('route', 'foo', 'service:foo');")
4244
.to.contain('}')
4345
.to.contain('')
@@ -54,7 +56,8 @@ describe('Blueprint: instance-initializer', function() {
5456
it('instance-initializer foo --pod', function() {
5557
return emberGenerateDestroy(['instance-initializer', 'foo', '--pod'], _file => {
5658
expect(_file('app/instance-initializers/foo.ts'))
57-
.to.contain('export function initialize(/* appInstance */) {')
59+
.to.contain('import ApplicationInstance from \'@ember/application/instance\';')
60+
.to.contain('export function initialize(appInstance: ApplicationInstance): void {')
5861
.to.contain(" // appInstance.inject('route', 'foo', 'service:foo');")
5962
.to.contain('}')
6063
.to.contain('')
@@ -67,7 +70,8 @@ describe('Blueprint: instance-initializer', function() {
6770
it('instance-initializer foo/bar --pod', function() {
6871
return emberGenerateDestroy(['instance-initializer', 'foo/bar', '--pod'], _file => {
6972
expect(_file('app/instance-initializers/foo/bar.ts'))
70-
.to.contain('export function initialize(/* appInstance */) {')
73+
.to.contain('import ApplicationInstance from \'@ember/application/instance\';')
74+
.to.contain('export function initialize(appInstance: ApplicationInstance): void {')
7175
.to.contain(" // appInstance.inject('route', 'foo', 'service:foo');")
7276
.to.contain('}')
7377
.to.contain('')
@@ -85,7 +89,8 @@ describe('Blueprint: instance-initializer', function() {
8589
it('instance-initializer foo --pod', function() {
8690
return emberGenerateDestroy(['instance-initializer', 'foo', '--pod'], _file => {
8791
expect(_file('app/instance-initializers/foo.ts'))
88-
.to.contain('export function initialize(/* appInstance */) {')
92+
.to.contain('import ApplicationInstance from \'@ember/application/instance\';')
93+
.to.contain('export function initialize(appInstance: ApplicationInstance): void {')
8994
.to.contain(" // appInstance.inject('route', 'foo', 'service:foo');")
9095
.to.contain('}')
9196
.to.contain('')
@@ -98,7 +103,8 @@ describe('Blueprint: instance-initializer', function() {
98103
it('instance-initializer foo/bar --pod', function() {
99104
return emberGenerateDestroy(['instance-initializer', 'foo/bar', '--pod'], _file => {
100105
expect(_file('app/instance-initializers/foo/bar.ts'))
101-
.to.contain('export function initialize(/* appInstance */) {')
106+
.to.contain('import ApplicationInstance from \'@ember/application/instance\';')
107+
.to.contain('export function initialize(appInstance: ApplicationInstance): void {')
102108
.to.contain(" // appInstance.inject('route', 'foo', 'service:foo');")
103109
.to.contain('}')
104110
.to.contain('')
@@ -120,7 +126,8 @@ describe('Blueprint: instance-initializer', function() {
120126
it.skip('instance-initializer foo', function() {
121127
return emberGenerateDestroy(['instance-initializer', 'foo'], _file => {
122128
expect(_file('addon/instance-initializers/foo.ts'))
123-
.to.contain('export function initialize(/* appInstance */) {')
129+
.to.contain('import ApplicationInstance from \'@ember/application/instance\';')
130+
.to.contain('export function initialize(appInstance: ApplicationInstance): void {')
124131
.to.contain(" // appInstance.inject('route', 'foo', 'service:foo');")
125132
.to.contain('}')
126133
.to.contain('')
@@ -141,7 +148,8 @@ describe('Blueprint: instance-initializer', function() {
141148
it.skip('instance-initializer foo/bar', function() {
142149
return emberGenerateDestroy(['instance-initializer', 'foo/bar'], _file => {
143150
expect(_file('addon/instance-initializers/foo/bar.ts'))
144-
.to.contain('export function initialize(/* appInstance */) {')
151+
.to.contain('import ApplicationInstance from \'@ember/application/instance\';')
152+
.to.contain('export function initialize(appInstance: ApplicationInstance): void {')
145153
.to.contain(" // appInstance.inject('route', 'foo', 'service:foo');")
146154
.to.contain('}')
147155
.to.contain('')
@@ -160,7 +168,8 @@ describe('Blueprint: instance-initializer', function() {
160168
it('instance-initializer foo --dummy', function() {
161169
return emberGenerateDestroy(['instance-initializer', 'foo', '--dummy'], _file => {
162170
expect(_file('tests/dummy/app/instance-initializers/foo.ts'))
163-
.to.contain('export function initialize(/* appInstance */) {')
171+
.to.contain('import ApplicationInstance from \'@ember/application/instance\';')
172+
.to.contain('export function initialize(appInstance: ApplicationInstance): void {')
164173
.to.contain(" // appInstance.inject('route', 'foo', 'service:foo');")
165174
.to.contain('}')
166175
.to.contain('')
@@ -177,7 +186,8 @@ describe('Blueprint: instance-initializer', function() {
177186
it('instance-initializer foo/bar --dummy', function() {
178187
return emberGenerateDestroy(['instance-initializer', 'foo/bar', '--dummy'], _file => {
179188
expect(_file('tests/dummy/app/instance-initializers/foo/bar.ts'))
180-
.to.contain('export function initialize(/* appInstance */) {')
189+
.to.contain('import ApplicationInstance from \'@ember/application/instance\';')
190+
.to.contain('export function initialize(appInstance: ApplicationInstance): void {')
181191
.to.contain(" // appInstance.inject('route', 'foo', 'service:foo');")
182192
.to.contain('}')
183193
.to.contain('')
@@ -204,7 +214,8 @@ describe('Blueprint: instance-initializer', function() {
204214
['instance-initializer', 'foo', '--in-repo-addon=my-addon'],
205215
_file => {
206216
expect(_file('lib/my-addon/addon/instance-initializers/foo.ts'))
207-
.to.contain('export function initialize(/* appInstance */) {')
217+
.to.contain('import ApplicationInstance from \'@ember/application/instance\';')
218+
.to.contain('export function initialize(appInstance: ApplicationInstance): void {')
208219
.to.contain(" // appInstance.inject('route', 'foo', 'service:foo');")
209220
.to.contain('}')
210221
.to.contain('')
@@ -226,7 +237,8 @@ describe('Blueprint: instance-initializer', function() {
226237
['instance-initializer', 'foo/bar', '--in-repo-addon=my-addon'],
227238
_file => {
228239
expect(_file('lib/my-addon/addon/instance-initializers/foo/bar.ts'))
229-
.to.contain('export function initialize(/* appInstance */) {')
240+
.to.contain('import ApplicationInstance from \'@ember/application/instance\';')
241+
.to.contain('export function initialize(appInstance: ApplicationInstance): void {')
230242
.to.contain(" // appInstance.inject('route', 'foo', 'service:foo');")
231243
.to.contain('}')
232244
.to.contain('')

0 commit comments

Comments
 (0)