refactor(tests): exctract createElement into a helper

Author: vsavkin

modules/core/test/compiler/compiler_spec.js

@@ -1,4 +1,4 @@
-import {describe, beforeEach, it, expect, ddescribe, iit} from 'test_lib/test_lib';
+import {describe, beforeEach, it, expect, ddescribe, iit, el} from 'test_lib/test_lib';
 import {DOM} from 'facade/dom';
 import {List} from 'facade/collection';
 
@@ -32,19 +32,19 @@ export function main() {
       var compiler = createCompiler( (parent, current, control) => {
         current.inheritedProtoView = rootProtoView;
       });
-      compiler.compile(MainComponent, createElement('<div></div>')).then( (protoView) => {
+      compiler.compile(MainComponent, el('<div></div>')).then( (protoView) => {
         expect(protoView).toBe(rootProtoView);
         done();
       });
     });
 
     it('should use the given element', (done) => {
-      var el = createElement('<div></div>');
+      var element = el('<div></div>');
       var compiler = createCompiler( (parent, current, control) => {
         current.inheritedProtoView = new ProtoView(current.element, null);
       });
-      compiler.compile(MainComponent, el).then( (protoView) => {
-        expect(protoView.element).toBe(el);
+      compiler.compile(MainComponent, element).then( (protoView) => {
+        expect(protoView.element).toBe(element);
         done();
       });
     });
@@ -60,7 +60,7 @@ export function main() {
     });
 
     it('should load nested components', (done) => {
-      var mainEl = createElement('<div></div>');
+      var mainEl = el('<div></div>');
       var compiler = createCompiler( (parent, current, control) => {
         current.inheritedProtoView = new ProtoView(current.element, null);
         current.inheritedElementBinder = current.inheritedProtoView.bindElement(null);
@@ -77,14 +77,14 @@ export function main() {
     });
 
     it('should cache components', (done) => {
-      var el = createElement('<div></div>');
+      var element = el('<div></div>');
       var compiler = createCompiler( (parent, current, control) => {
         current.inheritedProtoView = new ProtoView(current.element, null);
       });
       var firstProtoView;
-      compiler.compile(MainComponent, el).then( (protoView) => {
+      compiler.compile(MainComponent, element).then( (protoView) => {
         firstProtoView = protoView;
-        return compiler.compile(MainComponent, el);
+        return compiler.compile(MainComponent, element);
       }).then( (protoView) => {
         expect(firstProtoView).toBe(protoView);
         done();
@@ -151,7 +151,3 @@ class MockStep extends CompileStep {
     this.processClosure(parent, current, control);
   }
 }
-
-function createElement(html) {
-  return DOM.createTemplate(html).content.firstChild;
-}

modules/core/test/compiler/integration_spec.js

@@ -1,4 +1,4 @@
-import {describe, xit, it, expect, beforeEach, ddescribe, iit} from 'test_lib/test_lib';
+import {describe, xit, it, expect, beforeEach, ddescribe, iit, el} from 'test_lib/test_lib';
 
 import {DOM} from 'facade/dom';
 
@@ -33,7 +33,7 @@ export function main() {
       }
 
       it('should consume text node changes', (done) => {
-        compiler.compile(MyComp, createElement('<div>{{ctxProp}}</div>')).then((pv) => {
+        compiler.compile(MyComp, el('<div>{{ctxProp}}</div>')).then((pv) => {
           createView(pv);
           ctx.ctxProp = 'Hello World!';
 
@@ -44,7 +44,7 @@ export function main() {
       });
 
       it('should consume element binding changes', (done) => {
-        compiler.compile(MyComp, createElement('<div [id]="ctxProp"></div>')).then((pv) => {
+        compiler.compile(MyComp, el('<div [id]="ctxProp"></div>')).then((pv) => {
           createView(pv);
 
           ctx.ctxProp = 'Hello World!';
@@ -56,7 +56,7 @@ export function main() {
       });
 
       it('should consume directive watch expression change.', (done) => {
-        compiler.compile(MyComp, createElement('<div my-dir [elprop]="ctxProp"></div>')).then((pv) => {
+        compiler.compile(MyComp, el('<div my-dir [elprop]="ctxProp"></div>')).then((pv) => {
           createView(pv);
 
           ctx.ctxProp = 'Hello World!';
@@ -69,7 +69,7 @@ export function main() {
       });
 
       it('should support nested components.', (done) => {
-        compiler.compile(MyComp, createElement('<child-cmp></child-cmp>')).then((pv) => {
+        compiler.compile(MyComp, el('<child-cmp></child-cmp>')).then((pv) => {
           createView(pv);
 
           cd.detectChanges();
@@ -80,7 +80,7 @@ export function main() {
       });
 
       it('should support template directives via `<template>` elements.', (done) => {
-        compiler.compile(MyComp, createElement('<div><template let-some-tmpl="greeting"><copy-me>{{greeting}}</copy-me></template></div>')).then((pv) => {
+        compiler.compile(MyComp, el('<div><template let-some-tmpl="greeting"><copy-me>{{greeting}}</copy-me></template></div>')).then((pv) => {
           createView(pv);
 
           cd.detectChanges();
@@ -95,7 +95,7 @@ export function main() {
       });
 
       it('should support template directives via `template` attribute.', (done) => {
-        compiler.compile(MyComp, createElement('<div><copy-me template="some-tmpl #greeting">{{greeting}}</copy-me></div>')).then((pv) => {
+        compiler.compile(MyComp, el('<div><copy-me template="some-tmpl #greeting">{{greeting}}</copy-me></div>')).then((pv) => {
           createView(pv);
 
           cd.detectChanges();
@@ -111,7 +111,7 @@ export function main() {
     });
 
     it('should emulate content tag', (done) => {
-      var el = `<emulated-shadow-dom-component>` +
+      var temp = `<emulated-shadow-dom-component>` +
         `<div>Light</div>` +
         `<div template="trivial-template">DOM</div>` +
       `</emulated-shadow-dom-component>`;
@@ -122,7 +122,7 @@ export function main() {
         return view;
       }
 
-      compiler.compile(MyComp, createElement(el)).
+      compiler.compile(MyComp, el(temp)).
         then(createView).
         then((view) => {
           expect(DOM.getText(view.nodes[0])).toEqual('Before LightDOM After');
@@ -207,8 +207,3 @@ class MyService {
     this.greeting = 'hello';
   }
 }
-
-
-function createElement(html) {
-  return DOM.createTemplate(html).content.firstChild;
-}

modules/core/test/compiler/pipeline/directive_parser_spec.js

@@ -1,4 +1,4 @@
-import {describe, beforeEach, it, expect, iit, ddescribe} from 'test_lib/test_lib';
+import {describe, beforeEach, it, expect, iit, ddescribe, el} from 'test_lib/test_lib';
 import {isPresent} from 'facade/lang';
 import {ListWrapper, MapWrapper, StringMapWrapper} from 'facade/collection';
 import {DirectiveParser} from 'core/compiler/pipeline/directive_parser';
@@ -50,126 +50,126 @@ export function main() {
     }
 
     it('should not add directives if they are not used', () => {
-      var results = createPipeline().process(createElement('<div></div>'));
+      var results = createPipeline().process(el('<div></div>'));
       expect(results[0].decoratorDirectives).toBe(null);
       expect(results[0].componentDirective).toBe(null);
       expect(results[0].templateDirective).toBe(null);
     });
 
     describe('component directives', () => {
       it('should detect them in attributes', () => {
-        var results = createPipeline().process(createElement('<div some-comp></div>'));
+        var results = createPipeline().process(el('<div some-comp></div>'));
         expect(results[0].componentDirective).toEqual(reader.read(SomeComponent));
       });
 
       it('should detect them in property bindings', () => {
         var pipeline = createPipeline({propertyBindings: {
           'some-comp': 'someExpr'
         }});
-        var results = pipeline.process(createElement('<div></div>'));
+        var results = pipeline.process(el('<div></div>'));
         expect(results[0].componentDirective).toEqual(reader.read(SomeComponent));
       });
 
       it('should detect them in variable bindings', () => {
         var pipeline = createPipeline({variableBindings: {
           'some-comp': 'someExpr'
         }});
-        var results = pipeline.process(createElement('<div></div>'));
+        var results = pipeline.process(el('<div></div>'));
         expect(results[0].componentDirective).toEqual(reader.read(SomeComponent));
       });
 
       it('should not allow multiple component directives on the same element', () => {
         expect( () => {
           createPipeline().process(
-            createElement('<div some-comp some-comp2></div>')
+            el('<div some-comp some-comp2></div>')
           );
         }).toThrowError('Only one component directive per element is allowed!');
       });
 
       it('should not allow component directives on <template> elements', () => {
         expect( () => {
           createPipeline().process(
-            createElement('<template some-comp></template>')
+            el('<template some-comp></template>')
           );
         }).toThrowError('Only template directives are allowed on <template> elements!');
       });
     });
 
     describe('template directives', () => {
       it('should detect them in attributes', () => {
-        var results = createPipeline().process(createElement('<template some-templ></template>'));
+        var results = createPipeline().process(el('<template some-templ></template>'));
         expect(results[0].templateDirective).toEqual(reader.read(SomeTemplate));
       });
 
       it('should detect them in property bindings', () => {
         var pipeline = createPipeline({propertyBindings: {
           'some-templ': 'someExpr'
         }});
-        var results = pipeline.process(createElement('<template></template>'));
+        var results = pipeline.process(el('<template></template>'));
         expect(results[0].templateDirective).toEqual(reader.read(SomeTemplate));
       });
 
       it('should detect them in variable bindings', () => {
         var pipeline = createPipeline({variableBindings: {
           'some-templ': 'someExpr'
         }});
-        var results = pipeline.process(createElement('<template></template>'));
+        var results = pipeline.process(el('<template></template>'));
         expect(results[0].templateDirective).toEqual(reader.read(SomeTemplate));
       });
 
       it('should not allow multiple template directives on the same element', () => {
         expect( () => {
           createPipeline().process(
-            createElement('<template some-templ some-templ2></template>')
+            el('<template some-templ some-templ2></template>')
           );
         }).toThrowError('Only one template directive per element is allowed!');
       });
 
       it('should not allow template directives on non <template> elements', () => {
         expect( () => {
           createPipeline().process(
-            createElement('<div some-templ></div>')
+            el('<div some-templ></div>')
           );
         }).toThrowError('Template directives need to be placed on <template> elements or elements with template attribute!');
       });
     });
 
     describe('decorator directives', () => {
       it('should detect them in attributes', () => {
-        var results = createPipeline().process(createElement('<div some-decor></div>'));
+        var results = createPipeline().process(el('<div some-decor></div>'));
         expect(results[0].decoratorDirectives).toEqual([reader.read(SomeDecorator)]);
       });
 
       it('should detect them in property bindings', () => {
         var pipeline = createPipeline({propertyBindings: {
           'some-decor': 'someExpr'
         }});
-        var results = pipeline.process(createElement('<div></div>'));
+        var results = pipeline.process(el('<div></div>'));
         expect(results[0].decoratorDirectives).toEqual([reader.read(SomeDecorator)]);
       });
 
       it('should compile children by default', () => {
-        var results = createPipeline().process(createElement('<div some-decor></div>'));
+        var results = createPipeline().process(el('<div some-decor></div>'));
         expect(results[0].compileChildren).toEqual(true);
       });
 
       it('should stop compiling children when specified in the decorator config', () => {
-        var results = createPipeline().process(createElement('<div some-decor-ignoring-children></div>'));
+        var results = createPipeline().process(el('<div some-decor-ignoring-children></div>'));
         expect(results[0].compileChildren).toEqual(false);
       });
 
       it('should detect them in variable bindings', () => {
         var pipeline = createPipeline({variableBindings: {
           'some-decor': 'someExpr'
         }});
-        var results = pipeline.process(createElement('<div></div>'));
+        var results = pipeline.process(el('<div></div>'));
         expect(results[0].decoratorDirectives).toEqual([reader.read(SomeDecorator)]);
       });
 
       it('should not allow decorator directives on <template> elements', () => {
         expect( () => {
           createPipeline().process(
-            createElement('<template some-decor></template>')
+            el('<template some-decor></template>')
           );
         }).toThrowError('Only template directives are allowed on <template> elements!');
       });
@@ -226,7 +226,3 @@ class SomeComponent2 {}
   })
 })
 class MyComp {}
-
-function createElement(html) {
-  return DOM.createTemplate(html).content.firstChild;
-}