Spec format improvements

Author: Anatoly Ostrovsky

src/core/parse/parse.spec.js

@@ -344,7 +344,7 @@ describe("parser", () => {
         scope.fooExp = "barVal";
         // By evaluating hasOwnProperty, the $parse cache will store a getter for
         // the scope's own hasOwnProperty function, which will mess up future cache look ups.
-        // i.e. cache['hasOwnProperty'] = function(scope) { return scope.hasOwnProperty; }
+        // i.e. cache['hasOwnProperty'] = (scope) => scope.hasOwnProperty;
         scope.$eval("hasOwnProperty");
         expect(scope.$eval("fooExp")).toBe("barVal");
       });

src/services/http/http.spec.js

@@ -447,19 +447,7 @@ describe("$http", function () {
   });
 
   it("does not serialize blobs for requests", async function () {
-    let blob;
-    if (window.Blob) {
-      blob = new Blob(["hello"]);
-    } else {
-      const BlobBuilder =
-        window.BlobBuilder ||
-        window.WebKitBlobBuilder ||
-        window.MozBlobBuilder ||
-        window.MSBlobBuilder;
-      const bb = new BlobBuilder();
-      bb.append("hello");
-      blob = bb.getBlob("text/plain");
-    }
+    let blob = new Blob(["hello"]);
     await $http({
       method: "POST",
       url: "/mock/blob",

src/services/sce/sce.spec.js

@@ -10,18 +10,18 @@ describe("SCE", () => {
   let errorLog = [];
 
   describe("when disabled", () => {
-    beforeEach(function () {
+    beforeEach(() => {
       window.angular = new Angular();
       window.angular
         .module("myModule", ["ng"])
-        .decorator("$exceptionHandler", function () {
+        .decorator("$exceptionHandler", () => {
           return (exception) => {
             errorLog.push(exception.message);
           };
         });
       createInjector([
         "myModule",
-        function ($sceProvider, $exceptionHandlerProvider) {
+        ($sceProvider, $exceptionHandlerProvider) => {
           $exceptionHandlerProvider.handler = (err) => logs.push(err.message);
           $sceProvider.enabled(false);
         },
@@ -36,12 +36,12 @@ describe("SCE", () => {
   });
 
   describe("when enabled", () => {
-    beforeEach(function () {
+    beforeEach(() => {
       window.angular = new Angular();
       logs = [];
       createInjector([
         "ng",
-        function ($sceProvider, $exceptionHandlerProvider) {
+        ($sceProvider, $exceptionHandlerProvider) => {
           $exceptionHandlerProvider.handler = (err) => {
             logs.push(err.message);
           };
@@ -550,20 +550,29 @@ describe("SCE", () => {
         const $$sanitizeUri = jasmine
           .createSpy("$$sanitizeUri")
           .and.returnValue("someSanitizedUrl");
-        // module(($provide) => {
-        //   $provide.value("$$sanitizeUri", $$sanitizeUri);
-        // });
-        () => {
-          expect($sce.getTrustedMediaUrl("someUrl")).toEqual(
-            "someSanitizedUrl",
-          );
-          expect($$sanitizeUri).toHaveBeenCalledOnceWith("someUrl", true);
+        window.angular = new Angular();
+        window.angular.module("testSanitizeUri", ["ng"]).config([
+          "$provide",
+          ($provide) => {
+            $provide.value("$$sanitizeUri", $$sanitizeUri);
+          },
+        ]);
+        createInjector([
+          "testSanitizeUri",
+          ($sceProvider, $exceptionHandlerProvider) => {
+            $sceProvider.enabled(true);
+          },
+        ]).invoke((_$sce_) => {
+          $sce = _$sce_;
+        });
 
-          $$sanitizeUri.calls.reset();
+        expect($sce.getTrustedMediaUrl("someUrl")).toEqual("someSanitizedUrl");
+        expect($$sanitizeUri).toHaveBeenCalledOnceWith("someUrl", true);
 
-          expect($sce.getTrustedUrl("someUrl")).toEqual("someSanitizedUrl");
-          expect($$sanitizeUri).toHaveBeenCalledOnceWith("someUrl", false);
-        };
+        $$sanitizeUri.calls.reset();
+
+        expect($sce.getTrustedUrl("someUrl")).toEqual("someSanitizedUrl");
+        expect($$sanitizeUri).toHaveBeenCalledOnceWith("someUrl", false);
       });
     });
 

src/services/sce/sce.ts

@@ -53,10 +53,12 @@ export interface SceService {
   parseAsHtml(expression: string): (context: any, locals: any) => any;
   parseAsResourceUrl(expression: string): (context: any, locals: any) => any;
   parseAsUrl(expression: string): (context: any, locals: any) => any;
+  parseAsMediaUrl(expression: string): (context: any, locals: any) => any;
   trustAs(type: string, value: any): any;
   trustAsHtml(value: any): any;
   trustAsResourceUrl(value: any): any;
   trustAsUrl(value: any): any;
+  trustAsMediaUrl(value: any): any;
   isEnabled(): boolean;
   valueOf(value?: any): any;
 }

src/shared/utils.spec.js

@@ -79,7 +79,7 @@ describe("utility functions", () => {
     });
 
     it("should create appropriate `_hashKey`s for non-primitive values", () => {
-      const fn = function () {};
+      const fn = () => {};
       const arr = [];
       const obj = {};
       const date = new Date();
@@ -145,9 +145,7 @@ describe("utility functions", () => {
     });
 
     it("is function:[unique id] for functions", () => {
-      const fn = function (a) {
-        return a;
-      };
+      const fn = (a) => a;
       expect(hashKey(fn)).toMatch(/^function:\S+$/);
     });
 
@@ -186,7 +184,7 @@ describe("utility functions", () => {
       expect(
         hashKey({
           myKey: "42",
-          _hashKey: function () {
+          _hashKey() {
             return this.myKey;
           },
         }),