scratch – Diff between revs 58 and 125

Subversion Repositories:

?pathlinks?

Rev 58 – Details – Blame – Last modification – View Log

       expect(fp2.options.swfPath).toEqual("flash/compiled/FontList.swf");
       expect(fp2.options.excludeUserAgent).toBe(true);
     });
     describe("sortPluginsFor", function () {
-      it("has default value", function (){
+      it("has default value", function () {
         var fp2 = new Fingerprint2();
         expect(fp2.options.sortPluginsFor).toEqual([/palemoon/i]);
       });
   describe("get", function () {
     describe("default options", function () {
       it("calculates fingerprint", function (done) {
         var fp2 = new Fingerprint2();
-        fp2.get(function(result){
+        fp2.get(function (result) {
           expect(result).toMatch(/^[0-9a-f]{32}$/i);
           done();
         });
       });
       it("does not try calling flash font detection", function (done) {
         var fp2 = new Fingerprint2();
         spyOn(fp2, "flashFontsKey");
-        fp2.get(function(result) {
+        fp2.get(function (result) {
           expect(fp2.flashFontsKey).not.toHaveBeenCalled();
           done();
         });
       });
     });
     describe("non-default options", function () {
       it("does not use userAgent when excluded", function (done) {
         var fp2 = new Fingerprint2({excludeUserAgent: true});
         spyOn(fp2, "getUserAgent");
-        fp2.get(function(result) {
+        fp2.get(function (result) {
           expect(fp2.getUserAgent).not.toHaveBeenCalled();
           done();
         });
       });
       it("does not use pixelRatio when excluded", function (done) {
         var fp2 = new Fingerprint2({excludePixelRatio: true});
         spyOn(fp2, "getPixelRatio");
-        fp2.get(function(result) {
+        fp2.get(function (result) {
           expect(fp2.getPixelRatio).not.toHaveBeenCalled();
           done();
         });
       });
       it("does not use screen resolution when excluded", function (done) {
         var fp2 = new Fingerprint2({excludeScreenResolution: true});
         spyOn(fp2, "getScreenResolution");
-        fp2.get(function(result) {
+        fp2.get(function (result) {
           expect(fp2.getScreenResolution).not.toHaveBeenCalled();
           done();
         });
       });
       it("does not use available screen resolution when excluded", function (done) {
         var fp2 = new Fingerprint2({excludeAvailableScreenResolution: true});
         spyOn(fp2, "getAvailableScreenResolution");
-        fp2.get(function(result) {
+        fp2.get(function (result) {
           expect(fp2.getAvailableScreenResolution).not.toHaveBeenCalled();
           done();
         });
       });
       it("does not use plugins info when excluded", function (done) {
         var fp2 = new Fingerprint2({excludePlugins: true});
         spyOn(fp2, "getRegularPlugins");
-        fp2.get(function(result) {
+        fp2.get(function (result) {
           expect(fp2.getRegularPlugins).not.toHaveBeenCalled();
           done();
         });
       });
       it("does not use IE plugins info when excluded", function (done) {
         var fp2 = new Fingerprint2({excludeIEPlugins: true});
         spyOn(fp2, "getIEPlugins");
-        fp2.get(function(result) {
+        fp2.get(function (result) {
           expect(fp2.getIEPlugins).not.toHaveBeenCalled();
           done();
         });
       });
     });
     describe("returns components", function () {
       it("does it return components as a second argument to callback", function (done) {
         var fp2 = new Fingerprint2();
-        fp2.get(function(result, components) {
+        fp2.get(function (result, components) {
           expect(components).not.toBeNull();
           done();
         });
       });
       it("checks if returned components is array", function (done) {
         var fp2 = new Fingerprint2();
-        fp2.get(function(result, components) {
+        fp2.get(function (result, components) {
           expect(components).toBeArrayOfObjects();
           done();
         });
       });
       it("checks if js_fonts component is array", function (done) {
         var fp2 = new Fingerprint2();
-        fp2.get(function(result, components) {
+        fp2.get(function (result, components) {
-          for(var x = 0; x < components.length; x++) {
+          for (var x = 0; x < components.length; x++) {
-            if(components[x].key == "js_fonts") {
+            if (components[x].key == "js_fonts") {
-                expect(components[x].value).toBeArray();
+              expect(components[x].value).toBeArray();
+            }
     });
     describe("userDefinedFonts option", function () {
       it("concatinates existing fonts with user-defined", function (done) {
         var fontList = [
+          "Andale Mono", "Arial", "Arial Black", "Arial Hebrew", "Arial MT", "Arial Narrow", "Arial Rounded MT Bold",
-                        "Andale Mono", "Arial", "Arial Black", "Arial Hebrew", "Arial MT", "Arial Narrow", "Arial Rounded MT Bold", "Arial Unicode MS",
+          "Arial Unicode MS",
-                        "Bitstream Vera Sans Mono", "Book Antiqua", "Bookman Old Style",
+          "Bitstream Vera Sans Mono", "Book Antiqua", "Bookman Old Style",
+          "Calibri", "Cambria", "Cambria Math", "Century", "Century Gothic", "Century Schoolbook", "Comic Sans",
-                        "Calibri", "Cambria", "Cambria Math", "Century", "Century Gothic", "Century Schoolbook", "Comic Sans", "Comic Sans MS", "Consolas", "Courier", "Courier New",
+          "Comic Sans MS", "Consolas", "Courier", "Courier New",
-                        "Garamond", "Geneva", "Georgia",
+          "Garamond", "Geneva", "Georgia",
-                        "Helvetica", "Helvetica Neue",
+          "Helvetica", "Helvetica Neue",
-                        "Impact",
+          "Impact",
+          "Lucida Bright", "Lucida Calligraphy", "Lucida Console", "Lucida Fax", "LUCIDA GRANDE", "Lucida Handwriting",
-                        "Lucida Bright", "Lucida Calligraphy", "Lucida Console", "Lucida Fax", "LUCIDA GRANDE", "Lucida Handwriting", "Lucida Sans", "Lucida Sans Typewriter", "Lucida Sans Unicode",
+          "Lucida Sans", "Lucida Sans Typewriter", "Lucida Sans Unicode",
+          "Microsoft Sans Serif", "Monaco", "Monotype Corsiva", "MS Gothic", "MS Outlook", "MS PGothic",
-                        "Microsoft Sans Serif", "Monaco", "Monotype Corsiva", "MS Gothic", "MS Outlook", "MS PGothic", "MS Reference Sans Serif", "MS Sans Serif", "MS Serif", "MYRIAD", "MYRIAD PRO",
+          "MS Reference Sans Serif", "MS Sans Serif", "MS Serif", "MYRIAD", "MYRIAD PRO",
-                        "Palatino", "Palatino Linotype",
+          "Palatino", "Palatino Linotype",
-                        "Segoe Print", "Segoe Script", "Segoe UI", "Segoe UI Light", "Segoe UI Semibold", "Segoe UI Symbol",
+          "Segoe Print", "Segoe Script", "Segoe UI", "Segoe UI Light", "Segoe UI Semibold", "Segoe UI Symbol",
-                        "Tahoma", "Times", "Times New Roman", "Times New Roman PS", "Trebuchet MS",
+          "Tahoma", "Times", "Times New Roman", "Times New Roman PS", "Trebuchet MS",
-                        "Verdana", "Wingdings", "Wingdings 2", "Wingdings 3"
+          "Verdana", "Wingdings", "Wingdings 2", "Wingdings 3"
-                      ];
+        ];
         expect(fontList.length).toEqual(65);
         var userDefinedFonts = [];
-        fontList.concat(userDefinedFonts);
-        expect(fontList.length).toEqual(65);
+        fontList.concat(userDefinedFonts);
         expect(fontList.length).toEqual(65);
         userDefinedFonts = ["Adria Grotesk", "Butler", "Nimbus Mono"];
         expect(userDefinedFonts.length).toEqual(3);
         fontList = fontList.concat(userDefinedFonts);
         expect(fontList.length).toEqual(65 + 3);
+        done();
+      });
+    });
+    describe("customFunction option", function () {
+      it("concatinates the current keys with the customFunction output", function (done) {
+        function customFunction () {
+          return "RANDOM_STRING";
+        }
+        var spy = jasmine.createSpy('customFunction', customFunction).and.callThrough();
+        var fp = new Fingerprint2({
+          "customFunction": spy
+        });
+        fp.get(function (result, keys) {
+          expect(spy).toHaveBeenCalled();
+          done()
-        done();
+        });
       });