Skip to content
This repository was archived by the owner on Feb 22, 2018. It is now read-only.

Commit 43b950b

Browse files
committed
chore(tests): fix disabled input_spec tests
1 parent 0384346 commit 43b950b

File tree

1 file changed

+32
-25
lines changed

1 file changed

+32
-25
lines changed

test/directive/input_select_spec.dart

Lines changed: 32 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -497,52 +497,57 @@ main() {
497497
});
498498

499499

500-
xit('should require', () {
500+
it('should require', () {
501501
compile(
502-
'<select name="select" ng-model="selection" required ng-change="change()">' +
502+
'<select name="select" ng-model="selection" probe="i" required ng-change="change()">' +
503503
'<option value=""></option>' +
504504
'<option value="c">C</option>' +
505505
'</select>');
506506

507+
var element = scope.context['i'].element;
508+
509+
scope.context['log'] = '';
507510
scope.context['change'] = () {
508-
scope.log += 'change;';
511+
scope.context['log'] += 'change;';
509512
};
510513

511514
scope.apply(() {
512515
scope.context['log'] = '';
513516
scope.context['selection'] = 'c';
514517
});
515518

516-
expect(scope.context['form'].select.$error.required).toEqual(false);;
517-
expect(element).toEqualValid();
518-
expect(element).toEqualPristine();
519+
expect(scope.context['form']['select'].hasErrorState('ng-required')).toEqual(false);
520+
expect(scope.context['form']['select'].valid).toEqual(true);
521+
expect(scope.context['form']['select'].pristine).toEqual(true);
519522

520523
scope.apply(() {
521524
scope.context['selection'] = '';
522525
});
523526

524-
expect(scope.context['form'].select.$error.required).toEqual(true);;
525-
expect(element).toEqualInvalid();
526-
expect(element).toEqualPristine();
527+
expect(scope.context['form']['select'].hasErrorState('ng-required')).toEqual(true);
528+
expect(scope.context['form']['select'].invalid).toEqual(true);
529+
expect(scope.context['form']['select'].pristine).toEqual(true);
527530
expect(scope.context['log']).toEqual('');
528531

529-
element[0].value = 'c';
532+
element.value = 'c';
530533
_.triggerEvent(element, 'change');
531-
expect(element).toEqualValid();
532-
expect(element).toEqualDirty();
534+
scope.apply();
535+
536+
expect(scope.context['form']['select'].valid).toEqual(true);
537+
expect(scope.context['form']['select'].dirty).toEqual(true);
533538
expect(scope.context['log']).toEqual('change;');
534539
});
535540

536541

537-
xit('should not be invalid if no require', () {
542+
it('should not be invalid if no require', () {
538543
compile(
539544
'<select name="select" ng-model="selection">' +
540545
'<option value=""></option>' +
541546
'<option value="c">C</option>' +
542547
'</select>');
543548

544-
expect(element).toEqualValid();
545-
expect(element).toEqualPristine();
549+
expect(scope.context['form']['select'].valid).toEqual(true);
550+
expect(scope.context['form']['select'].pristine).toEqual(true);
546551
});
547552

548553

@@ -616,32 +621,34 @@ main() {
616621
expect(element).toEqualSelect([['A'], ['B']]);
617622
});
618623

619-
xit('should require', () {
624+
it('should require', () {
620625
compile(
621-
'<select name="select" ng-model="selection" multiple required>' +
626+
'<select name="select" probe="i" ng-model="selection" multiple required>' +
622627
'<option>A</option>' +
623628
'<option>B</option>' +
624629
'</select>');
625630

631+
var element = scope.context['i'].element;
626632
scope.apply(() {
627633
scope.context['selection'] = [];
628634
});
629635

630-
expect(scope.context['form'].select.$error.required).toEqual(true);;
631-
expect(element).toEqualInvalid();
632-
expect(element).toEqualPristine();
636+
expect(scope.context['form']['select'].hasErrorState('ng-required')).toEqual(true);
637+
expect(scope.context['form']['select'].invalid).toEqual(true);
638+
expect(scope.context['form']['select'].pristine).toEqual(true);
633639

634640
scope.apply(() {
635641
scope.context['selection'] = ['A'];
636642
});
637643

638-
expect(element).toEqualValid();
639-
expect(element).toEqualPristine();
644+
expect(scope.context['form']['select'].valid).toEqual(true);
645+
expect(scope.context['form']['select'].pristine).toEqual(true);
640646

641-
element[0].value = 'B';
647+
element.value = 'B';
642648
_.triggerEvent(element, 'change');
643-
expect(element).toEqualValid();
644-
expect(element).toEqualDirty();
649+
650+
expect(scope.context['form']['select'].valid).toEqual(true);
651+
expect(scope.context['form']['select'].dirty).toEqual(true);
645652
});
646653
});
647654

0 commit comments

Comments
 (0)