From f4d338d393dabb49182d40b4fe90c4d1b51621c0 Mon Sep 17 00:00:00 2001 From: Igor Minar Date: Fri, 9 Mar 2012 00:00:05 -0800 Subject: chore(*): refactor all ng: to ng- --- test/directive/booleanAttrDirSpecs.js | 22 +++---- test/directive/formSpec.js | 6 +- test/directive/inputSpec.js | 110 +++++++++++++++++----------------- test/directive/ngBindSpec.js | 24 ++++---- test/directive/ngClassSpec.js | 40 ++++++------- test/directive/ngClickSpec.js | 6 +- test/directive/ngCloakSpec.js | 10 ++-- test/directive/ngControllerSpec.js | 10 ++-- test/directive/ngEventDirsSpec.js | 4 +- test/directive/ngIncludeSpec.js | 8 ++- test/directive/ngInitSpec.js | 6 +- test/directive/ngNonBindableSpec.js | 4 +- test/directive/ngPluralizeSpec.js | 2 +- test/directive/ngRepeatSpec.js | 42 ++++++------- test/directive/ngShowHideSpec.js | 12 ++-- test/directive/ngStyleSpec.js | 8 +-- test/directive/ngSwitchSpec.js | 10 ++-- test/directive/ngViewSpec.js | 10 ++-- test/directive/selectSpec.js | 78 ++++++++++++------------ 19 files changed, 207 insertions(+), 205 deletions(-) (limited to 'test/directive') diff --git a/test/directive/booleanAttrDirSpecs.js b/test/directive/booleanAttrDirSpecs.js index 2c47d81a..8d71c2d8 100644 --- a/test/directive/booleanAttrDirSpecs.js +++ b/test/directive/booleanAttrDirSpecs.js @@ -9,7 +9,7 @@ describe('boolean attr directives', function() { it('should bind href', inject(function($rootScope, $compile) { - element = $compile('')($rootScope) + element = $compile('')($rootScope) $rootScope.url = 'http://server' $rootScope.$digest(); expect(element.attr('href')).toEqual('http://server'); @@ -17,7 +17,7 @@ describe('boolean attr directives', function() { it('should bind disabled', inject(function($rootScope, $compile) { - element = $compile('')($rootScope) + element = $compile('')($rootScope) $rootScope.isDisabled = false; $rootScope.$digest(); expect(element.attr('disabled')).toBeFalsy(); @@ -28,7 +28,7 @@ describe('boolean attr directives', function() { it('should bind checked', inject(function($rootScope, $compile) { - element = $compile('')($rootScope) + element = $compile('')($rootScope) $rootScope.isChecked = false; $rootScope.$digest(); expect(element.attr('checked')).toBeFalsy(); @@ -39,7 +39,7 @@ describe('boolean attr directives', function() { it('should bind selected', inject(function($rootScope, $compile) { - element = $compile('')($rootScope) + element = $compile('')($rootScope) jqLite(document.body).append(element) $rootScope.isSelected=false; $rootScope.$digest(); @@ -51,7 +51,7 @@ describe('boolean attr directives', function() { it('should bind readonly', inject(function($rootScope, $compile) { - element = $compile('')($rootScope) + element = $compile('')($rootScope) $rootScope.isReadonly=false; $rootScope.$digest(); expect(element.attr('readOnly')).toBeFalsy(); @@ -62,7 +62,7 @@ describe('boolean attr directives', function() { it('should bind multiple', inject(function($rootScope, $compile) { - element = $compile('')($rootScope) + element = $compile('')($rootScope) $rootScope.isMultiple=false; $rootScope.$digest(); expect(element.attr('multiple')).toBeFalsy(); @@ -73,7 +73,7 @@ describe('boolean attr directives', function() { it('should bind src', inject(function($rootScope, $compile) { - element = $compile('
')($rootScope) + element = $compile('
')($rootScope) $rootScope.url = 'http://localhost/'; $rootScope.$digest(); expect(element.attr('src')).toEqual('http://localhost/'); @@ -81,7 +81,7 @@ describe('boolean attr directives', function() { it('should bind href and merge with other attrs', inject(function($rootScope, $compile) { - element = $compile('')($rootScope); + element = $compile('')($rootScope); $rootScope.url = 'http://server'; $rootScope.rel = 'REL'; $rootScope.$digest(); @@ -92,18 +92,18 @@ describe('boolean attr directives', function() { it('should bind Text with no Bindings', inject(function($compile, $rootScope) { forEach(['checked', 'disabled', 'multiple', 'readonly', 'selected'], function(name) { - element = $compile('
')($rootScope) + element = $compile('
')($rootScope) $rootScope.$digest(); expect(element.attr(name)).toBe(name); dealoc(element); }); - element = $compile('
')($rootScope) + element = $compile('
')($rootScope) $rootScope.$digest(); expect(element.attr('src')).toEqual('some'); dealoc(element); - element = $compile('
')($rootScope) + element = $compile('
')($rootScope) $rootScope.$digest(); expect(element.attr('href')).toEqual('some'); dealoc(element); diff --git a/test/directive/formSpec.js b/test/directive/formSpec.js index 6387241f..6559da5d 100644 --- a/test/directive/formSpec.js +++ b/test/directive/formSpec.js @@ -34,7 +34,7 @@ describe('form', function() { it('should remove the widget when element removed', function() { doc = $compile( '
' + - '' + + '' + '
')(scope); var form = scope.form; @@ -150,7 +150,7 @@ describe('form', function() { it('should publish widgets', function() { - doc = jqLite('
'); + doc = jqLite('
'); $compile(doc)(scope); var widget = scope.form.w1; @@ -167,7 +167,7 @@ describe('form', function() { beforeEach(function() { doc = $compile( '
' + - '' + + '' + '
')(scope); scope.$digest(); diff --git a/test/directive/inputSpec.js b/test/directive/inputSpec.js index 54f3f7cd..5a0c4168 100644 --- a/test/directive/inputSpec.js +++ b/test/directive/inputSpec.js @@ -204,11 +204,11 @@ describe('NgModelController', function() { }); }); -describe('ng:model', function() { +describe('ng-model', function() { it('should set css classes (ng-valid, ng-invalid, ng-pristine, ng-dirty)', inject(function($compile, $rootScope) { - var element = $compile('')($rootScope); + var element = $compile('')($rootScope); $rootScope.$digest(); expect(element).toBeValid(); @@ -260,7 +260,7 @@ describe('input', function() { it('should bind to a model', function() { - compileInput(''); + compileInput(''); scope.$apply(function() { scope.name = 'misko'; @@ -271,7 +271,7 @@ describe('input', function() { it('should call $destroy on element remove', function() { - compileInput(''); + compileInput(''); var spy = jasmine.createSpy('on destroy'); scope.$on('$destroy', spy); @@ -282,7 +282,7 @@ describe('input', function() { it('should update the model on "blur" event', function() { - compileInput(''); + compileInput(''); changeInputValueTo('adam'); expect(scope.name).toEqual('adam'); @@ -290,7 +290,7 @@ describe('input', function() { it('should update the model and trim the value', function() { - compileInput(''); + compileInput(''); changeInputValueTo(' a '); expect(scope.name).toEqual('a'); @@ -298,7 +298,7 @@ describe('input', function() { it('should allow complex reference binding', function() { - compileInput(''); + compileInput(''); scope.$apply(function() { scope.obj = { abc: { name: 'Misko'} }; @@ -307,7 +307,7 @@ describe('input', function() { }); - it('should ignore input without ng:model attr', function() { + it('should ignore input without ng-model attr', function() { compileInput(''); browserTrigger(inputElm, 'blur'); @@ -320,14 +320,14 @@ describe('input', function() { it('should report error on assignment error', function() { expect(function() { - compileInput(''); + compileInput(''); scope.$digest(); }).toThrow("Syntax Error: Token '''' is an unexpected token at column 7 of the expression [throw ''] starting at ['']."); }); it("should render as blank if null", function() { - compileInput(''); + compileInput(''); scope.$apply(function() { scope.age = null; @@ -339,7 +339,7 @@ describe('input', function() { it('should render 0 even if it is a number', function() { - compileInput(''); + compileInput(''); scope.$apply(function() { scope.value = 0; }); @@ -351,7 +351,7 @@ describe('input', function() { describe('pattern', function() { it('should validate in-lined pattern', function() { - compileInput(''); + compileInput(''); scope.$digest(); changeInputValueTo('x000-00-0000x'); @@ -372,7 +372,7 @@ describe('input', function() { it('should validate pattern from scope', function() { - compileInput(''); + compileInput(''); scope.regexp = /^\d\d\d-\d\d-\d\d\d\d$/; scope.$digest(); @@ -402,7 +402,7 @@ describe('input', function() { xit('should throw an error when scope pattern can\'t be found', function() { - compileInput(''); + compileInput(''); expect(function() { changeInputValueTo('xx'); }). toThrow('Expected fooRegexp to be a RegExp but was undefined'); @@ -413,7 +413,7 @@ describe('input', function() { describe('minlength', function() { it('should invalid shorter than given minlenght', function() { - compileInput(''); + compileInput(''); changeInputValueTo('aa'); expect(scope.value).toBeUndefined(); @@ -427,7 +427,7 @@ describe('input', function() { describe('maxlength', function() { it('should invalid shorter than given maxlenght', function() { - compileInput(''); + compileInput(''); changeInputValueTo('aaaaaaaa'); expect(scope.value).toBeUndefined(); @@ -443,7 +443,7 @@ describe('input', function() { describe('number', function() { it('should not update model if view invalid', function() { - compileInput(''); + compileInput(''); scope.$apply(function() { scope.age = 123; @@ -465,7 +465,7 @@ describe('input', function() { it('should render as blank if null', function() { - compileInput(''); + compileInput(''); scope.$apply(function() { scope.age = null; @@ -477,7 +477,7 @@ describe('input', function() { it('should come up blank when no value specified', function() { - compileInput(''); + compileInput(''); scope.$digest(); expect(inputElm.val()).toBe(''); @@ -492,7 +492,7 @@ describe('input', function() { it('should parse empty string to null', function() { - compileInput(''); + compileInput(''); scope.$apply(function() { scope.age = 10; @@ -507,7 +507,7 @@ describe('input', function() { describe('min', function() { it('should validate', function() { - compileInput(''); + compileInput(''); scope.$digest(); changeInputValueTo('1'); @@ -526,7 +526,7 @@ describe('input', function() { describe('max', function() { it('should validate', function() { - compileInput(''); + compileInput(''); scope.$digest(); changeInputValueTo('20'); @@ -545,7 +545,7 @@ describe('input', function() { describe('required', function() { it('should be valid even if value is 0', function() { - compileInput(''); + compileInput(''); changeInputValueTo('0'); expect(inputElm).toBeValid(); @@ -554,7 +554,7 @@ describe('input', function() { }); it('should be valid even if value 0 is set from model', function() { - compileInput(''); + compileInput(''); scope.$apply(function() { scope.value = 0; @@ -570,7 +570,7 @@ describe('input', function() { describe('email', function() { it('should validate e-mail', function() { - compileInput(''); + compileInput(''); var widget = scope.form.alias; changeInputValueTo('vojta@google.com'); @@ -599,7 +599,7 @@ describe('input', function() { describe('url', function() { it('should validate url', function() { - compileInput(''); + compileInput(''); var widget = scope.form.alias; changeInputValueTo('http://www.something.com'); @@ -628,9 +628,9 @@ describe('input', function() { it('should update the model', function() { compileInput( - '' + - '' + - ''); + '' + + '' + + ''); scope.$apply(function() { scope.color = 'white'; @@ -655,8 +655,8 @@ describe('input', function() { xit('should allow {{expr}} as value', function() { scope.some = 11; compileInput( - '' + - ''); + '' + + ''); browserTrigger(inputElm[0]); expect(scope.value).toBe(true); @@ -669,7 +669,7 @@ describe('input', function() { describe('checkbox', function() { - it('should ignore checkbox without ng:model attr', function() { + it('should ignore checkbox without ng-model attr', function() { compileInput(''); browserTrigger(inputElm, 'blur'); @@ -681,7 +681,7 @@ describe('input', function() { it('should format booleans', function() { - compileInput(''); + compileInput(''); scope.$apply(function() { scope.name = false; @@ -696,7 +696,7 @@ describe('input', function() { it('should support type="checkbox" with non-standard capitalization', function() { - compileInput(''); + compileInput(''); browserTrigger(inputElm, 'click'); expect(scope.checkbox).toBe(true); @@ -707,8 +707,8 @@ describe('input', function() { it('should allow custom enumeration', function() { - compileInput(''); + compileInput(''); scope.$apply(function() { scope.name = 'y'; @@ -737,7 +737,7 @@ describe('input', function() { describe('textarea', function() { it("should process textarea", function() { - compileInput(''); + compileInput(''); inputElm = formElm.find('textarea'); scope.$apply(function() { @@ -753,7 +753,7 @@ describe('input', function() { }); - it('should ignore textarea without ng:model attr', function() { + it('should ignore textarea without ng-model attr', function() { compileInput(''); inputElm = formElm.find('textarea'); @@ -766,10 +766,10 @@ describe('input', function() { }); - describe('ng:list', function() { + describe('ng-list', function() { it('should parse text into an array', function() { - compileInput(''); + compileInput(''); // model -> view scope.$apply(function() { @@ -787,7 +787,7 @@ describe('input', function() { // When the user types 'a,b' the 'a,' stage parses to ['a'] but if the // $parseModel function runs it will change to 'a', in essence preventing // the user from ever typying ','. - compileInput(''); + compileInput(''); changeInputValueTo('a '); expect(inputElm.val()).toEqual('a '); @@ -808,7 +808,7 @@ describe('input', function() { xit('should require at least one item', function() { - compileInput(''); + compileInput(''); changeInputValueTo(' , '); expect(inputElm).toBeInvalid(); @@ -816,7 +816,7 @@ describe('input', function() { it('should convert empty string to an empty array', function() { - compileInput(''); + compileInput(''); changeInputValueTo(''); expect(scope.list).toEqual([]); @@ -826,7 +826,7 @@ describe('input', function() { describe('required', function() { it('should allow bindings on required', function() { - compileInput(''); + compileInput(''); scope.$apply(function() { scope.required = false; @@ -857,7 +857,7 @@ describe('input', function() { it('should invalid initial value with bound required', function() { - compileInput(''); + compileInput(''); scope.$apply(function() { scope.required = true; @@ -868,7 +868,7 @@ describe('input', function() { it('should be $invalid but $pristine if not touched', function() { - compileInput(''); + compileInput(''); scope.$apply(function() { scope.name = ''; @@ -884,7 +884,7 @@ describe('input', function() { it('should allow empty string if not required', function() { - compileInput(''); + compileInput(''); changeInputValueTo('a'); changeInputValueTo(''); expect(scope.foo).toBe(''); @@ -892,17 +892,17 @@ describe('input', function() { it('should set $invalid when model undefined', function() { - compileInput(''); + compileInput(''); scope.$digest(); expect(inputElm).toBeInvalid(); }) }); - describe('ng:change', function() { + describe('ng-change', function() { it('should $eval expression after new value is set in the model', function() { - compileInput(''); + compileInput(''); scope.change = jasmine.createSpy('change').andCallFake(function() { expect(scope.value).toBe('new value'); @@ -913,7 +913,7 @@ describe('input', function() { }); it('should not $eval the expression if changed from model', function() { - compileInput(''); + compileInput(''); scope.change = jasmine.createSpy('change'); scope.$apply(function() { @@ -924,8 +924,8 @@ describe('input', function() { }); - it('should $eval ng:change expression on checkbox', function() { - compileInput(''); + it('should $eval ng-change expression on checkbox', function() { + compileInput(''); scope.changeFn = jasmine.createSpy('changeFn'); scope.$digest(); @@ -937,10 +937,10 @@ describe('input', function() { }); - describe('ng:model-instant', function() { + describe('ng-model-instant', function() { it('should bind keydown, change, input events', inject(function($browser) { - compileInput(''); + compileInput(''); inputElm.val('value1'); browserTrigger(inputElm, 'keydown'); diff --git a/test/directive/ngBindSpec.js b/test/directive/ngBindSpec.js index e8c07494..ddfdd53d 100644 --- a/test/directive/ngBindSpec.js +++ b/test/directive/ngBindSpec.js @@ -1,6 +1,6 @@ 'use strict'; -describe('ng:bind-*', function() { +describe('ng-bind-*', function() { var element; @@ -9,10 +9,10 @@ describe('ng:bind-*', function() { }); - describe('ng:bind', function() { + describe('ng-bind', function() { it('should set text', inject(function($rootScope, $compile) { - element = $compile('
')($rootScope); + element = $compile('
')($rootScope); expect(element.text()).toEqual(''); $rootScope.a = 'misko'; $rootScope.$digest(); @@ -21,7 +21,7 @@ describe('ng:bind-*', function() { })); it('should set text to blank if undefined', inject(function($rootScope, $compile) { - element = $compile('
')($rootScope); + element = $compile('
')($rootScope); $rootScope.a = 'misko'; $rootScope.$digest(); expect(element.text()).toEqual('misko'); @@ -34,14 +34,14 @@ describe('ng:bind-*', function() { })); it('should set html', inject(function($rootScope, $compile) { - element = $compile('
')($rootScope); + element = $compile('
')($rootScope); $rootScope.html = '
hello
'; $rootScope.$digest(); expect(lowercase(element.html())).toEqual('
hello
'); })); it('should set unsafe html', inject(function($rootScope, $compile) { - element = $compile('
')($rootScope); + element = $compile('
')($rootScope); $rootScope.html = '
hello
'; $rootScope.$digest(); expect(lowercase(element.html())).toEqual('
hello
'); @@ -61,10 +61,10 @@ describe('ng:bind-*', function() { }); - describe('ng:bind-template', function() { + describe('ng-bind-template', function() { - it('should ng:bind-template', inject(function($rootScope, $compile) { - element = $compile('
')($rootScope); + it('should ng-bind-template', inject(function($rootScope, $compile) { + element = $compile('
')($rootScope); $rootScope.name = 'Misko'; $rootScope.$digest(); expect(element.hasClass('ng-binding')).toEqual(true); @@ -79,9 +79,9 @@ describe('ng:bind-*', function() { }); - describe('ng:bind-attr', function() { + describe('ng-bind-attr', function() { it('should bind attributes', inject(function($rootScope, $compile) { - element = $compile('
')($rootScope); + element = $compile('
')($rootScope); $rootScope.$digest(); expect(element.attr('src')).toEqual('http://localhost/mysrc'); expect(element.attr('alt')).toEqual('myalt'); @@ -94,7 +94,7 @@ describe('ng:bind-*', function() { })); it('should remove special attributes on false', inject(function($rootScope, $compile) { - element = $compile('')($rootScope); + element = $compile('')($rootScope); var input = element[0]; expect(input.disabled).toEqual(false); expect(input.readOnly).toEqual(false); diff --git a/test/directive/ngClassSpec.js b/test/directive/ngClassSpec.js index a8b6b17e..2297e343 100644 --- a/test/directive/ngClassSpec.js +++ b/test/directive/ngClassSpec.js @@ -1,6 +1,6 @@ 'use strict'; -describe('ng:class', function() { +describe('ng-class', function() { var element; @@ -10,7 +10,7 @@ describe('ng:class', function() { it('should add new and remove old classes dynamically', inject(function($rootScope, $compile) { - element = $compile('
')($rootScope); + element = $compile('
')($rootScope); $rootScope.dynClass = 'A'; $rootScope.$digest(); expect(element.hasClass('existing')).toBe(true); @@ -31,7 +31,7 @@ describe('ng:class', function() { it('should support adding multiple classes via an array', inject(function($rootScope, $compile) { - element = $compile('
')($rootScope); + element = $compile('
')($rootScope); $rootScope.$digest(); expect(element.hasClass('existing')).toBeTruthy(); expect(element.hasClass('A')).toBeTruthy(); @@ -43,7 +43,7 @@ describe('ng:class', function() { 'expressions', inject(function($rootScope, $compile) { var element = $compile( '
' + + 'ng-class="{A: conditionA, B: conditionB(), AnotB: conditionA&&!conditionB}">' + '
')($rootScope); $rootScope.conditionA = true; $rootScope.$digest(); @@ -62,7 +62,7 @@ describe('ng:class', function() { it('should support adding multiple classes via a space delimited string', inject(function($rootScope, $compile) { - element = $compile('
')($rootScope); + element = $compile('
')($rootScope); $rootScope.$digest(); expect(element.hasClass('existing')).toBeTruthy(); expect(element.hasClass('A')).toBeTruthy(); @@ -71,7 +71,7 @@ describe('ng:class', function() { it('should preserve class added post compilation with pre-existing classes', inject(function($rootScope, $compile) { - element = $compile('
')($rootScope); + element = $compile('
')($rootScope); $rootScope.dynClass = 'A'; $rootScope.$digest(); expect(element.hasClass('existing')).toBe(true); @@ -88,7 +88,7 @@ describe('ng:class', function() { it('should preserve class added post compilation without pre-existing classes"', inject(function($rootScope, $compile) { - element = $compile('
')($rootScope); + element = $compile('
')($rootScope); $rootScope.dynClass = 'A'; $rootScope.$digest(); expect(element.hasClass('A')).toBe(true); @@ -104,7 +104,7 @@ describe('ng:class', function() { it('should preserve other classes with similar name"', inject(function($rootScope, $compile) { - element = $compile('
')($rootScope); + element = $compile('
')($rootScope); $rootScope.dynCls = 'panel'; $rootScope.$digest(); $rootScope.dynCls = 'foo'; @@ -114,7 +114,7 @@ describe('ng:class', function() { it('should not add duplicate classes', inject(function($rootScope, $compile) { - element = $compile('
')($rootScope); + element = $compile('
')($rootScope); $rootScope.dynCls = 'panel'; $rootScope.$digest(); expect(element[0].className).toBe('panel bar ng-scope'); @@ -122,7 +122,7 @@ describe('ng:class', function() { it('should remove classes even if it was specified via class attribute', inject(function($rootScope, $compile) { - element = $compile('
')($rootScope); + element = $compile('
')($rootScope); $rootScope.dynCls = 'panel'; $rootScope.$digest(); $rootScope.dynCls = 'window'; @@ -132,7 +132,7 @@ describe('ng:class', function() { it('should remove classes even if they were added by another code', inject(function($rootScope, $compile) { - element = $compile('
')($rootScope); + element = $compile('
')($rootScope); $rootScope.dynCls = 'foo'; $rootScope.$digest(); element.addClass('foo'); @@ -142,14 +142,14 @@ describe('ng:class', function() { it('should convert undefined and null values to an empty string', inject(function($rootScope, $compile) { - element = $compile('
')($rootScope); + element = $compile('
')($rootScope); $rootScope.dynCls = [undefined, null]; $rootScope.$digest(); })); - it('should ng:class odd/even', inject(function($rootScope, $compile) { - element = $compile('
    • ')($rootScope); + it('should ng-class odd/even', inject(function($rootScope, $compile) { + element = $compile('
        • ')($rootScope); $rootScope.$digest(); var e1 = jqLite(element[0].childNodes[1]); var e2 = jqLite(element[0].childNodes[2]); @@ -160,10 +160,10 @@ describe('ng:class', function() { })); - it('should allow both ng:class and ng:class-odd/even on the same element', inject(function($rootScope, $compile) { + it('should allow both ng-class and ng-class-odd/even on the same element', inject(function($rootScope, $compile) { element = $compile('
            ' + - '
          • ' + + '
          • ' + '
              ')($rootScope); $rootScope.$apply(); var e1 = jqLite(element[0].childNodes[1]); @@ -178,10 +178,10 @@ describe('ng:class', function() { })); - it('should allow both ng:class and ng:class-odd/even with multiple classes', inject(function($rootScope, $compile) { + it('should allow both ng-class and ng-class-odd/even with multiple classes', inject(function($rootScope, $compile) { element = $compile('
                ' + - '
              • ' + + '
              • ' + '
                  ')($rootScope); $rootScope.$apply(); var e1 = jqLite(element[0].childNodes[1]); diff --git a/test/directive/ngClickSpec.js b/test/directive/ngClickSpec.js index cb52901c..f5086d1c 100644 --- a/test/directive/ngClickSpec.js +++ b/test/directive/ngClickSpec.js @@ -1,6 +1,6 @@ 'use strict'; -describe('ng:click', function() { +describe('ng-click', function() { var element; afterEach(function() { @@ -8,7 +8,7 @@ describe('ng:click', function() { }); it('should get called on a click', inject(function($rootScope, $compile) { - element = $compile('
                  ')($rootScope); + element = $compile('
                  ')($rootScope); $rootScope.$digest(); expect($rootScope.clicked).toBeFalsy(); @@ -17,7 +17,7 @@ describe('ng:click', function() { })); it('should pass event object', inject(function($rootScope, $compile) { - element = $compile('
                  ')($rootScope); + element = $compile('
                  ')($rootScope); $rootScope.$digest(); browserTrigger(element, 'click'); diff --git a/test/directive/ngCloakSpec.js b/test/directive/ngCloakSpec.js index bd911f35..f3c28b60 100644 --- a/test/directive/ngCloakSpec.js +++ b/test/directive/ngCloakSpec.js @@ -1,6 +1,6 @@ 'use strict'; -describe('ng:cloak', function() { +describe('ng-cloak', function() { var element; @@ -10,16 +10,16 @@ describe('ng:cloak', function() { it('should get removed when an element is compiled', inject(function($rootScope, $compile) { - element = jqLite('
                  '); - expect(element.attr('ng:cloak')).toBe(''); + element = jqLite('
                  '); + expect(element.attr('ng-cloak')).toBe(''); $compile(element); - expect(element.attr('ng:cloak')).toBeUndefined(); + expect(element.attr('ng-cloak')).toBeUndefined(); })); it('should remove ng-cloak class from a compiled element with attribute', inject( function($rootScope, $compile) { - element = jqLite('
                  '); + element = jqLite('
                  '); expect(element.hasClass('foo')).toBe(true); expect(element.hasClass('ng-cloak')).toBe(true); diff --git a/test/directive/ngControllerSpec.js b/test/directive/ngControllerSpec.js index 3ab6b929..832a683d 100644 --- a/test/directive/ngControllerSpec.js +++ b/test/directive/ngControllerSpec.js @@ -1,6 +1,6 @@ 'use strict'; -describe('ng:controller', function() { +describe('ng-controller', function() { var element; beforeEach(inject(function($window) { @@ -35,19 +35,19 @@ describe('ng:controller', function() { it('should instantiate controller and bind methods', inject(function($compile, $rootScope) { - element = $compile('
                  {{greet(name)}}
                  ')($rootScope); + element = $compile('
                  {{greet(name)}}
                  ')($rootScope); $rootScope.$digest(); expect(element.text()).toBe('Hello Misko!'); })); it('should allow nested controllers', inject(function($compile, $rootScope) { - element = $compile('
                  {{greet(name)}}
                  ')($rootScope); + element = $compile('
                  {{greet(name)}}
                  ')($rootScope); $rootScope.$digest(); expect(element.text()).toBe('Hello Adam!'); dealoc(element); - element = $compile('
                  {{protoGreet(name)}}
                  ')($rootScope); + element = $compile('
                  {{protoGreet(name)}}
                  ')($rootScope); $rootScope.$digest(); expect(element.text()).toBe('Hello Adam!'); })); @@ -58,7 +58,7 @@ describe('ng:controller', function() { $scope.name = 'Vojta'; }; - element = $compile('
                  {{name}}
                  ')($rootScope); + element = $compile('
                  {{name}}
                  ')($rootScope); $rootScope.$digest(); expect(element.text()).toBe('Vojta'); })); diff --git a/test/directive/ngEventDirsSpec.js b/test/directive/ngEventDirsSpec.js index 2b14bb33..c42f9b26 100644 --- a/test/directive/ngEventDirsSpec.js +++ b/test/directive/ngEventDirsSpec.js @@ -9,10 +9,10 @@ describe('event directives', function() { }); - describe('ng:submit', function() { + describe('ng-submit', function() { it('should get called on form submit', inject(function($rootScope, $compile) { - element = $compile('
                  ' + + element = $compile('' + '' + '
                  ')($rootScope); $rootScope.$digest(); diff --git a/test/directive/ngIncludeSpec.js b/test/directive/ngIncludeSpec.js index dc761abc..32d760c3 100644 --- a/test/directive/ngIncludeSpec.js +++ b/test/directive/ngIncludeSpec.js @@ -1,6 +1,6 @@ 'use strict'; -describe('ng:include', function() { +describe('ng-include', function() { var element; @@ -19,12 +19,14 @@ describe('ng:include', function() { it('should include on external file', inject(putIntoCache('myUrl', '{{name}}'), function($rootScope, $compile, $browser) { element = jqLite(''); + jqLite(document.body).append(element); element = $compile(element)($rootScope); $rootScope.childScope = $rootScope.$new(); $rootScope.childScope.name = 'misko'; $rootScope.url = 'myUrl'; $rootScope.$digest(); expect(element.text()).toEqual('misko'); + jqLite(document.body).html(''); })); @@ -56,7 +58,7 @@ describe('ng:include', function() { // TODO(misko): because we are using scope==this, the eval gets registered // during the flush phase and hence does not get called. - // I don't think passing 'this' makes sense. Does having scope on ng:include makes sense? + // I don't think passing 'this' makes sense. Does having scope on ng-include makes sense? // should we make scope="this" illegal? $rootScope.$digest(); @@ -197,7 +199,7 @@ describe('ng:include', function() { $rootScope.$on('$includeContentLoaded', onload); $templateCache.put('tpl.html', [200, 'partial {{tpl}}', {}]); - element = $compile('
                  ' + + element = $compile('
                  ' + '
                  ')($rootScope); expect(onload).not.toHaveBeenCalled(); diff --git a/test/directive/ngInitSpec.js b/test/directive/ngInitSpec.js index b096c7fd..92146089 100644 --- a/test/directive/ngInitSpec.js +++ b/test/directive/ngInitSpec.js @@ -1,6 +1,6 @@ 'use strict'; -describe('ng:init', function() { +describe('ng-init', function() { var element; @@ -9,8 +9,8 @@ describe('ng:init', function() { }); - it("should ng:init", inject(function($rootScope, $compile) { - element = $compile('
                  ')($rootScope); + it("should ng-init", inject(function($rootScope, $compile) { + element = $compile('
                  ')($rootScope); expect($rootScope.a).toEqual(123); })); }); diff --git a/test/directive/ngNonBindableSpec.js b/test/directive/ngNonBindableSpec.js index c974948d..8b745364 100644 --- a/test/directive/ngNonBindableSpec.js +++ b/test/directive/ngNonBindableSpec.js @@ -1,7 +1,7 @@ 'use strict'; -describe('ng:non-bindable', function() { +describe('ng-non-bindable', function() { var element; @@ -12,7 +12,7 @@ describe('ng:non-bindable', function() { it('should prevent compilation of the owning element and its children', inject(function($rootScope, $compile) { - element = $compile('
                  ')($rootScope); + element = $compile('
                  ')($rootScope); $rootScope.name = 'misko'; $rootScope.$digest(); expect(element.text()).toEqual(''); diff --git a/test/directive/ngPluralizeSpec.js b/test/directive/ngPluralizeSpec.js index 8046f45f..c7766c7b 100644 --- a/test/directive/ngPluralizeSpec.js +++ b/test/directive/ngPluralizeSpec.js @@ -1,6 +1,6 @@ 'use strict'; -describe('ng:pluralize', function() { +describe('ng-pluralize', function() { var element; diff --git a/test/directive/ngRepeatSpec.js b/test/directive/ngRepeatSpec.js index 8400edaa..8b6a5173 100644 --- a/test/directive/ngRepeatSpec.js +++ b/test/directive/ngRepeatSpec.js @@ -1,6 +1,6 @@ 'use strict'; -describe('ng:repeat', function() { +describe('ng-repeat', function() { var element; @@ -9,10 +9,10 @@ describe('ng:repeat', function() { }); - it('should ng:repeat over array', inject(function($rootScope, $compile) { + it('should ng-repeat over array', inject(function($rootScope, $compile) { element = $compile( '
                    ' + - '
                  • ' + + '
                  • ' + '
                  ')($rootScope); Array.prototype.extraProperty = "should be ignored"; @@ -37,10 +37,10 @@ describe('ng:repeat', function() { })); - it('should ng:repeat over object', inject(function($rootScope, $compile) { + it('should ng-repeat over object', inject(function($rootScope, $compile) { element = $compile( '
                    ' + - '
                  • ' + + '
                  • ' + '
                  ')($rootScope); $rootScope.items = {misko:'swe', shyam:'set'}; $rootScope.$digest(); @@ -48,14 +48,14 @@ describe('ng:repeat', function() { })); - it('should not ng:repeat over parent properties', inject(function($rootScope, $compile) { + it('should not ng-repeat over parent properties', inject(function($rootScope, $compile) { var Class = function() {}; Class.prototype.abc = function() {}; Class.prototype.value = 'abc'; element = $compile( '
                    ' + - '
                  • ' + + '
                  • ' + '
                  ')($rootScope); $rootScope.items = new Class(); $rootScope.items.name = 'value'; @@ -64,10 +64,10 @@ describe('ng:repeat', function() { })); - it('should error on wrong parsing of ng:repeat', inject(function($rootScope, $compile, $log) { + it('should error on wrong parsing of ng-repeat', inject(function($rootScope, $compile, $log) { expect(function() { - element = $compile('
                  ')($rootScope); - }).toThrow("Expected ng:repeat in form of '_item_ in _collection_' but got 'i dont parse'."); + element = $compile('
                  ')($rootScope); + }).toThrow("Expected ng-repeat in form of '_item_ in _collection_' but got 'i dont parse'."); $log.error.logs.shift(); })); @@ -77,7 +77,7 @@ describe('ng:repeat', function() { inject(function($rootScope, $compile) { element = $compile( '
                    ' + - '
                  • ' + + '
                  • ' + '
                  ')($rootScope); $rootScope.items = ['misko', 'shyam', 'frodo']; $rootScope.$digest(); @@ -89,7 +89,7 @@ describe('ng:repeat', function() { inject(function($rootScope, $compile) { element = $compile( '
                    ' + - '
                  • ' + + '
                  • ' + '
                  ')($rootScope); $rootScope.items = {'misko':'m', 'shyam':'s', 'frodo':'f'}; $rootScope.$digest(); @@ -101,7 +101,7 @@ describe('ng:repeat', function() { inject(function($rootScope, $compile) { element = $compile( '
                    ' + - '
                  • ' + + '
                  • ' + '
                  ')($rootScope); $rootScope.items = ['misko', 'shyam', 'doug']; $rootScope.$digest(); @@ -122,7 +122,7 @@ describe('ng:repeat', function() { inject(function($rootScope, $compile) { element = $compile( '
                    ' + - '
                  • ' + + '
                  • ' + '
                  • ' + '
                  ')($rootScope); $rootScope.items = {'misko':'m', 'shyam':'s', 'doug':'d', 'frodo':'f'}; @@ -137,7 +137,7 @@ describe('ng:repeat', function() { it('should ignore $ and $$ properties', inject(function($rootScope, $compile) { - element = $compile('
                  • {{i}}|
                  ')($rootScope); + element = $compile('
                  • {{i}}|
                  ')($rootScope); $rootScope.items = ['a', 'b', 'c']; $rootScope.items.$$hashkey = 'xxx'; $rootScope.items.$root = 'yyy'; @@ -150,8 +150,8 @@ describe('ng:repeat', function() { it('should repeat over nested arrays', inject(function($rootScope, $compile) { element = $compile( '
                    ' + - '
                  • ' + - '
                    {{group}}|
                    X' + + '
                  • ' + + '
                    {{group}}|
                    X' + '
                  • ' + '
                  ')($rootScope); $rootScope.groups = [['a', 'b'], ['c','d']]; @@ -163,7 +163,7 @@ describe('ng:repeat', function() { it('should ignore non-array element properties when iterating over an array', inject(function($rootScope, $compile) { - element = $compile('
                  • {{item}}|
                  ')($rootScope); + element = $compile('
                  • {{item}}|
                  ')($rootScope); $rootScope.array = ['a', 'b', 'c']; $rootScope.array.foo = '23'; $rootScope.array.bar = function() {}; @@ -175,7 +175,7 @@ describe('ng:repeat', function() { it('should iterate over non-existent elements of a sparse array', inject(function($rootScope, $compile) { - element = $compile('
                  • {{item}}|
                  ')($rootScope); + element = $compile('
                  • {{item}}|
                  ')($rootScope); $rootScope.array = ['a', 'b']; $rootScope.array[4] = 'c'; $rootScope.array[6] = 'd'; @@ -186,7 +186,7 @@ describe('ng:repeat', function() { it('should iterate over all kinds of types', inject(function($rootScope, $compile) { - element = $compile('
                  • {{item}}|
                  ')($rootScope); + element = $compile('
                  • {{item}}|
                  ')($rootScope); $rootScope.array = ['a', 1, null, undefined, {}]; $rootScope.$digest(); @@ -200,7 +200,7 @@ describe('ng:repeat', function() { beforeEach(inject(function($rootScope, $compile) { element = $compile( '
                    ' + - '
                  • ' + + '
                  • ' + '
                  ')($rootScope); a = {}; b = {}; diff --git a/test/directive/ngShowHideSpec.js b/test/directive/ngShowHideSpec.js index 6b9aea24..5005274d 100644 --- a/test/directive/ngShowHideSpec.js +++ b/test/directive/ngShowHideSpec.js @@ -1,6 +1,6 @@ 'use strict'; -describe('ng:show / ng:hide', function() { +describe('ng-show / ng-hide', function() { var element; @@ -8,9 +8,9 @@ describe('ng:show / ng:hide', function() { dealoc(element); }); - describe('ng:show', function() { + describe('ng-show', function() { it('should show and hide an element', inject(function($rootScope, $compile) { - element = jqLite('
                  '); + element = jqLite('
                  '); element = $compile(element)($rootScope); $rootScope.$digest(); expect(isCssVisible(element)).toEqual(false); @@ -21,7 +21,7 @@ describe('ng:show / ng:hide', function() { it('should make hidden element visible', inject(function($rootScope, $compile) { - element = jqLite('
                  '); + element = jqLite('
                  '); element = $compile(element)($rootScope); expect(isCssVisible(element)).toBe(false); $rootScope.exp = true; @@ -30,9 +30,9 @@ describe('ng:show / ng:hide', function() { })); }); - describe('ng:hide', function() { + describe('ng-hide', function() { it('should hide an element', inject(function($rootScope, $compile) { - element = jqLite('
                  '); + element = jqLite('
                  '); element = $compile(element)($rootScope); expect(isCssVisible(element)).toBe(true); $rootScope.exp = true; diff --git a/test/directive/ngStyleSpec.js b/test/directive/ngStyleSpec.js index a413353b..c12f2f4d 100644 --- a/test/directive/ngStyleSpec.js +++ b/test/directive/ngStyleSpec.js @@ -1,6 +1,6 @@ 'use strict'; -describe('ng:style', function() { +describe('ng-style', function() { var element; @@ -10,14 +10,14 @@ describe('ng:style', function() { it('should set', inject(function($rootScope, $compile) { - element = $compile('
                  ')($rootScope); + element = $compile('
                  ')($rootScope); $rootScope.$digest(); expect(element.css('height')).toEqual('40px'); })); it('should silently ignore undefined style', inject(function($rootScope, $compile) { - element = $compile('
                  ')($rootScope); + element = $compile('
                  ')($rootScope); $rootScope.$digest(); expect(element.hasClass('ng-exception')).toBeFalsy(); })); @@ -31,7 +31,7 @@ describe('ng:style', function() { preCompVal = '300px'; postCompStyle = 'height'; postCompVal = '100px'; - element = jqLite('
                  '); + element = jqLite('
                  '); element.css(preCompStyle, preCompVal); jqLite(document.body).append(element); $compile(element)($rootScope); diff --git a/test/directive/ngSwitchSpec.js b/test/directive/ngSwitchSpec.js index 88e81dea..c61dd60d 100644 --- a/test/directive/ngSwitchSpec.js +++ b/test/directive/ngSwitchSpec.js @@ -1,6 +1,6 @@ 'use strict'; -describe('ng:switch', function() { +describe('ng-switch', function() { var element; @@ -12,9 +12,9 @@ describe('ng:switch', function() { it('should switch on value change', inject(function($rootScope, $compile) { element = $compile( '
                  ' + - '
                  first:{{name}}
                  ' + - '
                  second:{{name}}
                  ' + - '
                  true:{{name}}
                  ' + + '
                  first:{{name}}
                  ' + + '
                  second:{{name}}
                  ' + + '
                  true:{{name}}
                  ' + '
                  ')($rootScope); expect(element.html()).toEqual( ''); @@ -53,7 +53,7 @@ describe('ng:switch', function() { it('should call change on switch', inject(function($rootScope, $compile) { element = $compile( '' + - '
                  {{name}}
                  ' + + '
                  {{name}}
                  ' + '
                  ')($rootScope); $rootScope.url = 'a'; $rootScope.$apply(); diff --git a/test/directive/ngViewSpec.js b/test/directive/ngViewSpec.js index afdded94..2a4347a0 100644 --- a/test/directive/ngViewSpec.js +++ b/test/directive/ngViewSpec.js @@ -1,6 +1,6 @@ 'use strict'; -describe('ng:view', function() { +describe('ng-view', function() { var element; beforeEach(module(function() { @@ -118,7 +118,7 @@ describe('ng:view', function() { }); - it('should be possible to nest ng:view in ng:include', inject(function() { + it('should be possible to nest ng-view in ng-include', inject(function() { // TODO(vojta): refactor this test dealoc(element); var injector = angular.injector(['ng', 'ngMock', function($routeProvider) { @@ -149,7 +149,7 @@ describe('ng:view', function() { it('should initialize view template after the view controller was initialized even when ' + 'templates were cached', function() { - //this is a test for a regression that was introduced by making the ng:view cache sync + //this is a test for a regression that was introduced by making the ng-view cache sync function ParentCtrl($scope) { $scope.log.push('parent'); } @@ -168,8 +168,8 @@ describe('ng:view', function() { $location.path('/foo'); $httpBackend.expect('GET', 'viewPartial.html'). - respond('
                  ' + - '
                  ' + + respond('
                  ' + + '
                  ' + '
                  '); $rootScope.$apply(); $httpBackend.flush(); diff --git a/test/directive/selectSpec.js b/test/directive/selectSpec.js index c262d0cf..3b4f992e 100644 --- a/test/directive/selectSpec.js +++ b/test/directive/selectSpec.js @@ -23,7 +23,7 @@ describe('select', function() { describe('select-one', function() { - it('should compile children of a select without a ng:model, but not create a model for it', + it('should compile children of a select without a ng-model, but not create a model for it', function() { compile('' + + ''); @@ -78,7 +78,7 @@ describe('select', function() { it('should not be invalid if no require', function() { compile( - '' + '' + '' + ''); @@ -93,7 +93,7 @@ describe('select', function() { it('should support type="select-multiple"', function() { compile( - '' + '' + '' + ''); @@ -108,7 +108,7 @@ describe('select', function() { it('should require', function() { compile( - '' + '' + '' + ''); @@ -136,7 +136,7 @@ describe('select', function() { }); - describe('ng:options', function() { + describe('ng-options', function() { function createSelect(attrs, blank, unknown) { var html = ''); - }).toThrow("Expected ng:options in form of '_select_ (as _label_)? for (_key_,)?_value_ in" + + compile(''); + }).toThrow("Expected ng-options in form of '_select_ (as _label_)? for (_key_,)?_value_ in" + " _collection_' but got 'i dont parse'."); }); @@ -196,8 +196,8 @@ describe('select', function() { it('should render an object', function() { createSelect({ - 'ng:model': 'selected', - 'ng:options': 'value as key for (key, value) in object' + 'ng-model': 'selected', + 'ng-options': 'value as key for (key, value) in object' }); scope.$apply(function() { @@ -380,8 +380,8 @@ describe('select', function() { it('should bind to scope value and group', function() { createSelect({ - 'ng:model': 'selected', - 'ng:options': 'item.name group by item.group for item in values' + 'ng-model': 'selected', + 'ng-options': 'item.name group by item.group for item in values' }); scope.$apply(function() { @@ -419,8 +419,8 @@ describe('select', function() { it('should bind to scope value through experession', function() { createSelect({ - 'ng:model': 'selected', - 'ng:options': 'item.id as item.name for item in values' + 'ng-model': 'selected', + 'ng-options': 'item.id as item.name for item in values' }); scope.$apply(function() { @@ -440,8 +440,8 @@ describe('select', function() { it('should bind to object key', function() { createSelect({ - 'ng:model': 'selected', - 'ng:options': 'key as value for (key, value) in object' + 'ng-model': 'selected', + 'ng-options': 'key as value for (key, value) in object' }); scope.$apply(function() { @@ -461,8 +461,8 @@ describe('select', function() { it('should bind to object value', function() { createSelect({ - 'ng:model': 'selected', - 'ng:options': 'value as key for (key, value) in object' + 'ng-model': 'selected', + 'ng-options': 'value as key for (key, value) in object' }); scope.$apply(function() { @@ -592,9 +592,9 @@ describe('select', function() { }); - it('should support binding via ng:bind-template attribute', function () { + it('should support binding via ng-bind-template attribute', function () { var option; - createSingleSelect(''); + createSingleSelect(''); scope.$apply(function() { scope.blankVal = 'so blank'; @@ -609,9 +609,9 @@ describe('select', function() { }); - it('should support biding via ng:bind attribute', function () { + it('should support biding via ng-bind attribute', function () { var option; - createSingleSelect(''); + createSingleSelect(''); scope.$apply(function() { scope.blankVal = 'is blank'; @@ -664,8 +664,8 @@ describe('select', function() { it('should update model on change through expression', function() { createSelect({ - 'ng:model': 'selected', - 'ng:options': 'item.id as item.name for item in values' + 'ng-model': 'selected', + 'ng-options': 'item.id as item.name for item in values' }); scope.$apply(function() { @@ -745,9 +745,9 @@ describe('select', function() { it('should select from object', function() { createSelect({ - 'ng:model':'selected', + 'ng-model':'selected', 'multiple':true, - 'ng:options':'key as value for (key,value) in values' + 'ng-options':'key as value for (key,value) in values' }); scope.values = {'0':'A', '1':'B'}; @@ -766,13 +766,13 @@ describe('select', function() { }); - describe('ng:required', function() { + describe('ng-required', function() { - it('should allow bindings on ng:required', function() { + it('should allow bindings on ng-required', function() { createSelect({ - 'ng:model': 'value', - 'ng:options': 'item.name for item in values', - 'ng:required': '{{required}}' + 'ng-model': 'value', + 'ng-options': 'item.name for item in values', + 'ng-required': '{{required}}' }, true); @@ -831,24 +831,24 @@ describe('select', function() { it('should populate value attribute on OPTION', inject(function($rootScope, $compile) { - element = $compile('')($rootScope) + element = $compile('')($rootScope) expect(element).toHaveValue('abc'); })); it('should ignore value if already exists', inject(function($rootScope, $compile) { - element = $compile('')($rootScope) + element = $compile('')($rootScope) expect(element).toHaveValue('abc'); })); it('should set value even if newlines present', inject(function($rootScope, $compile) { - element = $compile('')($rootScope) + element = $compile('')($rootScope) expect(element).toHaveValue('\nabc\n'); })); it('should set value even if self closing HTML', inject(function($rootScope, $compile) { // IE removes the \n from option, which makes this test pointless if (msie) return; - element = $compile('')($rootScope) + element = $compile('')($rootScope) expect(element).toHaveValue('\n'); })); }); -- cgit v1.2.3