@@ -10,7 +10,7 @@ import hasEmberVersion from '@ember/test-helpers/has-ember-version';
1010import { A } from '@ember/array' ;
1111import { run } from '@ember/runloop' ;
1212// eslint-disable-next-line ember/no-classic-components
13- import EmberComponent from '@ember/component' ;
13+ import EmberComponent , { setComponentTemplate } from '@ember/component' ;
1414import EmberRoute from '@ember/routing/route' ;
1515import EmberObject from '@ember/object' ;
1616import Controller from '@ember/controller' ;
@@ -260,7 +260,7 @@ function Component(
260260 {
261261 name,
262262 instance = Serialized ( ) ,
263- template = `my-app/templates/ components/${ name } .hbs` ,
263+ template = `my-app/components/${ name } .hbs` ,
264264 bounds = 'single' ,
265265 ...options
266266 } ,
@@ -490,45 +490,78 @@ module('Ember Debug - View', function (hooks) {
490490
491491 this . owner . register (
492492 'component:test-foo' ,
493- EmberComponent . extend ( {
494- classNames : [ 'simple-component' ] ,
495- toString ( ) {
496- return 'App.TestFooComponent' ;
497- } ,
498- } ) ,
499- ) ;
500-
501- this . owner . register (
502- 'component:test-bar' ,
503- templateOnlyComponent ?. ( ) ||
493+ setComponentTemplate (
494+ hbs ( 'test-foo' , {
495+ moduleName : 'my-app/components/test-foo.hbs' ,
496+ } ) ,
504497 EmberComponent . extend ( {
505- tagName : '' ,
498+ classNames : [ 'simple-component' ] ,
506499 toString ( ) {
507- return 'App.TestBarComponent ' ;
500+ return 'App.TestFooComponent ' ;
508501 } ,
509502 } ) ,
503+ ) ,
504+ ) ;
505+
506+ this . owner . register (
507+ 'component:test-bar' ,
508+ setComponentTemplate (
509+ hbs (
510+ `<!-- before -->
511+ <div class="another-component">
512+ {{@value}}
513+ <span>test</span>
514+ <span class="bar-inner">bar</span>
515+ </div>
516+ <!-- after -->` ,
517+ { moduleName : 'my-app/components/test-bar.hbs' } ,
518+ ) ,
519+ templateOnlyComponent ?. ( ) ||
520+ EmberComponent . extend ( {
521+ tagName : '' ,
522+ toString ( ) {
523+ return 'App.TestBarComponent' ;
524+ } ,
525+ } ) ,
526+ ) ,
510527 ) ;
511528
512529 this . owner . register (
513530 'component:test-in-element-in-component' ,
514- EmberComponent . extend ( {
515- init ( ...args ) {
516- this . _super ( ...args ) ;
517- this . elementTarget = document . querySelector ( '#target' ) ;
518- } ,
519- toString ( ) {
520- return 'App.TestInElementInComponent' ;
521- } ,
522- } ) ,
531+ setComponentTemplate (
532+ hbs ( `
533+ {{#in-element this.elementTarget}}
534+ <p class='test-in-element-in-component'>
535+ App.TestInElementInComponent
536+ </p>
537+ {{/in-element}}
538+ ` ) ,
539+ EmberComponent . extend ( {
540+ init ( ...args ) {
541+ this . _super ( ...args ) ;
542+ this . elementTarget = document . querySelector ( '#target' ) ;
543+ } ,
544+ toString ( ) {
545+ return 'App.TestInElementInComponent' ;
546+ } ,
547+ } ) ,
548+ ) ,
523549 ) ;
524550
525551 this . owner . register (
526552 'component:test-component-in-in-element' ,
527- EmberComponent . extend ( {
528- toString ( ) {
529- return 'App.TestComponentInElement' ;
530- } ,
531- } ) ,
553+ setComponentTemplate (
554+ hbs ( `
555+ <p class='test-component-in-in-element'>
556+ App.TestComponentInElement
557+ </p>
558+ ` ) ,
559+ EmberComponent . extend ( {
560+ toString ( ) {
561+ return 'App.TestComponentInElement' ;
562+ } ,
563+ } ) ,
564+ ) ,
532565 ) ;
533566
534567 /*
@@ -601,45 +634,6 @@ module('Ember Debug - View', function (hooks) {
601634 'template:posts' ,
602635 hbs ( 'Posts' , { moduleName : 'my-app/templates/posts.hbs' } ) ,
603636 ) ;
604- this . owner . register (
605- 'template:components/test-foo' ,
606- hbs ( 'test-foo' , {
607- moduleName : 'my-app/templates/components/test-foo.hbs' ,
608- } ) ,
609- ) ;
610- this . owner . register (
611- 'template:components/test-bar' ,
612- hbs (
613- `<!-- before -->
614- <div class="another-component">
615- {{@value}}
616- <span>test</span>
617- <span class="bar-inner">bar</span>
618- </div>
619- <!-- after -->` ,
620- { moduleName : 'my-app/templates/components/test-bar.hbs' } ,
621- ) ,
622- ) ;
623-
624- this . owner . register (
625- 'template:components/test-component-in-in-element' ,
626- hbs ( `
627- <p class='test-component-in-in-element'>
628- App.TestComponentInElement
629- </p>
630- ` ) ,
631- ) ;
632-
633- this . owner . register (
634- 'template:components/test-in-element-in-component' ,
635- hbs ( `
636- {{#in-element this.elementTarget}}
637- <p class='test-in-element-in-component'>
638- App.TestInElementInComponent
639- </p>
640- {{/in-element}}
641- ` ) ,
642- ) ;
643637
644638 this . owner . register ( 'modifier:did-insert' , didInsert ) ;
645639 } ) ;
@@ -892,25 +886,28 @@ module('Ember Debug - View', function (hooks) {
892886 } ) ;
893887
894888 test ( 'Does not list nested {{yield}} views' , async function ( ) {
895- this . owner . register ( 'component:x-first' , EmberComponent . extend ( ) ) ;
896- this . owner . register ( 'component:x-second' , EmberComponent . extend ( ) ) ;
897-
898889 this . owner . register (
899- 'template:posts' ,
900- hbs ( '{{#x-first}}Foo{{/x-first}}' , {
901- moduleName : 'my-app/templates/posts.hbs' ,
902- } ) ,
890+ 'component:x-first' ,
891+ setComponentTemplate (
892+ hbs ( '{{#x-second}}{{yield}}{{/x-second}}' , {
893+ moduleName : 'my-app/components/x-first.hbs' ,
894+ } ) ,
895+ EmberComponent . extend ( ) ,
896+ ) ,
903897 ) ;
904898 this . owner . register (
905- 'template:components/x-first' ,
906- hbs ( '{{#x-second}}{{yield}}{{/x-second}}' , {
907- moduleName : 'my-app/templates/components/x-first.hbs' ,
908- } ) ,
899+ 'component:x-second' ,
900+ setComponentTemplate (
901+ hbs ( '{{yield}}' , {
902+ moduleName : 'my-app/components/x-second.hbs' ,
903+ } ) ,
904+ EmberComponent . extend ( ) ,
905+ ) ,
909906 ) ;
910907 this . owner . register (
911- 'template:components/x-second ' ,
912- hbs ( '{{yield }}' , {
913- moduleName : 'my-app/templates/components/x-second .hbs' ,
908+ 'template:posts ' ,
909+ hbs ( '{{#x-first}}Foo{{/x-first }}' , {
910+ moduleName : 'my-app/templates/posts .hbs' ,
914911 } ) ,
915912 ) ;
916913
@@ -970,10 +967,7 @@ module('Ember Debug - View', function (hooks) {
970967 assert
971968 . dom ( '.ember-inspector-tooltip-detail-template' , tooltip )
972969 . hasText (
973- 'my-app/templates/components/test-foo.hbs' . replace (
974- / \/ / g,
975- '\u200B/\u200B' ,
976- ) ,
970+ 'my-app/components/test-foo.hbs' . replace ( / \/ / g, '\u200B/\u200B' ) ,
977971 ) ;
978972 assert
979973 . dom ( '.ember-inspector-tooltip-detail-instance' , tooltip )
@@ -1005,10 +999,7 @@ module('Ember Debug - View', function (hooks) {
1005999 assert
10061000 . dom ( '.ember-inspector-tooltip-detail-template' , tooltip )
10071001 . hasText (
1008- 'my-app/templates/components/test-bar.hbs' . replace (
1009- / \/ / g,
1010- '\u200B/\u200B' ,
1011- ) ,
1002+ 'my-app/components/test-bar.hbs' . replace ( / \/ / g, '\u200B/\u200B' ) ,
10121003 ) ;
10131004 assert
10141005 . dom ( '.ember-inspector-tooltip-detail-instance' , tooltip )
@@ -1051,10 +1042,7 @@ module('Ember Debug - View', function (hooks) {
10511042 assert
10521043 . dom ( '.ember-inspector-tooltip-detail-template' , tooltip )
10531044 . hasText (
1054- 'my-app/templates/components/test-foo.hbs' . replace (
1055- / \/ / g,
1056- '\u200B/\u200B' ,
1057- ) ,
1045+ 'my-app/components/test-foo.hbs' . replace ( / \/ / g, '\u200B/\u200B' ) ,
10581046 ) ;
10591047 assert
10601048 . dom ( '.ember-inspector-tooltip-detail-instance' , tooltip )
@@ -1080,10 +1068,7 @@ module('Ember Debug - View', function (hooks) {
10801068 assert
10811069 . dom ( '.ember-inspector-tooltip-detail-template' , tooltip )
10821070 . hasText (
1083- 'my-app/templates/components/test-foo.hbs' . replace (
1084- / \/ / g,
1085- '\u200B/\u200B' ,
1086- ) ,
1071+ 'my-app/components/test-foo.hbs' . replace ( / \/ / g, '\u200B/\u200B' ) ,
10871072 ) ;
10881073 assert
10891074 . dom ( '.ember-inspector-tooltip-detail-instance' , tooltip )
0 commit comments