Skip to content

Commit 23bc8ed

Browse files
crisbetoIgorMinar
authored andcommitted
test: move remaining fixmeIvy to test level (angular#27354)
Moves all of the remaning `describe`-level fixme instances to the `it` level. PR Close angular#27354
1 parent 36e7bf1 commit 23bc8ed

11 files changed

+1708
-1593
lines changed

packages/core/test/component_fixture_spec.ts

Lines changed: 203 additions & 191 deletions
Large diffs are not rendered by default.

packages/core/test/debug/debug_node_spec.ts

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ class TestApp {
169169
}
170170

171171
{
172-
fixmeIvy('unknown') && describe('debug element', () => {
172+
describe('debug element', () => {
173173
let fixture: ComponentFixture<any>;
174174

175175
beforeEach(async(() => {
@@ -192,13 +192,13 @@ class TestApp {
192192
});
193193
}));
194194

195-
it('should list all child nodes', () => {
195+
fixmeIvy('unknown') && it('should list all child nodes', () => {
196196
fixture = TestBed.createComponent(ParentComp);
197197
fixture.detectChanges();
198198
expect(fixture.debugElement.childNodes.length).toEqual(3);
199199
});
200200

201-
it('should list all component child elements', () => {
201+
fixmeIvy('unknown') && it('should list all component child elements', () => {
202202
fixture = TestBed.createComponent(ParentComp);
203203
fixture.detectChanges();
204204
const childEls = fixture.debugElement.children;
@@ -225,7 +225,7 @@ class TestApp {
225225
expect(getDOM().hasClass(childNested[0].nativeElement, 'childnested')).toBe(true);
226226
});
227227

228-
it('should list conditional component child elements', () => {
228+
fixmeIvy('unknown') && it('should list conditional component child elements', () => {
229229
fixture = TestBed.createComponent(ConditionalParentComp);
230230
fixture.detectChanges();
231231

@@ -246,7 +246,7 @@ class TestApp {
246246
expect(conditionalContentComp.children.length).toEqual(1);
247247
});
248248

249-
it('should list child elements within viewports', () => {
249+
fixmeIvy('unknown') && it('should list child elements within viewports', () => {
250250
fixture = TestBed.createComponent(UsingFor);
251251
fixture.detectChanges();
252252

@@ -259,7 +259,7 @@ class TestApp {
259259
expect(list.children.length).toEqual(3);
260260
});
261261

262-
it('should list element attributes', () => {
262+
fixmeIvy('unknown') && it('should list element attributes', () => {
263263
fixture = TestBed.createComponent(TestApp);
264264
fixture.detectChanges();
265265
const bankElem = fixture.debugElement.children[0];
@@ -268,7 +268,7 @@ class TestApp {
268268
expect(bankElem.attributes['account']).toEqual('4747');
269269
});
270270

271-
it('should list element classes', () => {
271+
fixmeIvy('unknown') && it('should list element classes', () => {
272272
fixture = TestBed.createComponent(TestApp);
273273
fixture.detectChanges();
274274
const bankElem = fixture.debugElement.children[0];
@@ -277,7 +277,7 @@ class TestApp {
277277
expect(bankElem.classes['open']).toBe(false);
278278
});
279279

280-
it('should list element styles', () => {
280+
fixmeIvy('unknown') && it('should list element styles', () => {
281281
fixture = TestBed.createComponent(TestApp);
282282
fixture.detectChanges();
283283
const bankElem = fixture.debugElement.children[0];
@@ -286,7 +286,7 @@ class TestApp {
286286
expect(bankElem.styles['color']).toEqual('red');
287287
});
288288

289-
it('should query child elements by css', () => {
289+
fixmeIvy('unknown') && it('should query child elements by css', () => {
290290
fixture = TestBed.createComponent(ParentComp);
291291
fixture.detectChanges();
292292

@@ -296,7 +296,7 @@ class TestApp {
296296
expect(getDOM().hasClass(childTestEls[0].nativeElement, 'child-comp-class')).toBe(true);
297297
});
298298

299-
it('should query child elements by directive', () => {
299+
fixmeIvy('unknown') && it('should query child elements by directive', () => {
300300
fixture = TestBed.createComponent(ParentComp);
301301
fixture.detectChanges();
302302

@@ -309,21 +309,21 @@ class TestApp {
309309
expect(getDOM().hasClass(childTestEls[3].nativeElement, 'childnested')).toBe(true);
310310
});
311311

312-
it('should list providerTokens', () => {
312+
fixmeIvy('unknown') && it('should list providerTokens', () => {
313313
fixture = TestBed.createComponent(ParentComp);
314314
fixture.detectChanges();
315315

316316
expect(fixture.debugElement.providerTokens).toContain(Logger);
317317
});
318318

319-
it('should list locals', () => {
319+
fixmeIvy('unknown') && it('should list locals', () => {
320320
fixture = TestBed.createComponent(LocalsComp);
321321
fixture.detectChanges();
322322

323323
expect(fixture.debugElement.children[0].references !['alice']).toBeAnInstanceOf(MyDir);
324324
});
325325

326-
it('should allow injecting from the element injector', () => {
326+
fixmeIvy('unknown') && it('should allow injecting from the element injector', () => {
327327
fixture = TestBed.createComponent(ParentComp);
328328
fixture.detectChanges();
329329

@@ -332,7 +332,7 @@ class TestApp {
332332
]);
333333
});
334334

335-
it('should list event listeners', () => {
335+
fixmeIvy('unknown') && it('should list event listeners', () => {
336336
fixture = TestBed.createComponent(EventsComp);
337337
fixture.detectChanges();
338338

@@ -341,7 +341,7 @@ class TestApp {
341341

342342
});
343343

344-
it('should trigger event handlers', () => {
344+
fixmeIvy('unknown') && it('should trigger event handlers', () => {
345345
fixture = TestBed.createComponent(EventsComp);
346346
fixture.detectChanges();
347347

packages/core/test/directive_lifecycle_integration_spec.ts

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import {Log} from '@angular/core/testing/src/testing_internal';
1313
import {fixmeIvy} from '@angular/private/testing';
1414

1515
{
16-
fixmeIvy('unknown') && describe('directive lifecycle integration spec', () => {
16+
describe('directive lifecycle integration spec', () => {
1717
let log: Log;
1818

1919
beforeEach(() => {
@@ -31,22 +31,23 @@ import {fixmeIvy} from '@angular/private/testing';
3131

3232
beforeEach(inject([Log], (_log: any) => { log = _log; }));
3333

34-
it('should invoke lifecycle methods ngOnChanges > ngOnInit > ngDoCheck > ngAfterContentChecked',
35-
() => {
36-
const fixture = TestBed.createComponent(MyComp5);
37-
fixture.detectChanges();
34+
fixmeIvy('unknown') &&
35+
it('should invoke lifecycle methods ngOnChanges > ngOnInit > ngDoCheck > ngAfterContentChecked',
36+
() => {
37+
const fixture = TestBed.createComponent(MyComp5);
38+
fixture.detectChanges();
3839

39-
expect(log.result())
40-
.toEqual(
41-
'ngOnChanges; ngOnInit; ngDoCheck; ngAfterContentInit; ngAfterContentChecked; child_ngDoCheck; ' +
42-
'ngAfterViewInit; ngAfterViewChecked');
40+
expect(log.result())
41+
.toEqual(
42+
'ngOnChanges; ngOnInit; ngDoCheck; ngAfterContentInit; ngAfterContentChecked; child_ngDoCheck; ' +
43+
'ngAfterViewInit; ngAfterViewChecked');
4344

44-
log.clear();
45-
fixture.detectChanges();
45+
log.clear();
46+
fixture.detectChanges();
4647

47-
expect(log.result())
48-
.toEqual('ngDoCheck; ngAfterContentChecked; child_ngDoCheck; ngAfterViewChecked');
49-
});
48+
expect(log.result())
49+
.toEqual('ngDoCheck; ngAfterContentChecked; child_ngDoCheck; ngAfterViewChecked');
50+
});
5051
});
5152
}
5253

0 commit comments

Comments
 (0)