scratch – Diff between revs 58 and 125

Subversion Repositories:
Rev:
Show entire file – Regard whitespace
Rev 58 Rev 125
Line 195... Line 195...
195 }); 195 });
Line 196... Line 196...
196   196  
197 describe("userDefinedFonts option", function () { 197 describe("userDefinedFonts option", function () {
198 it("concatinates existing fonts with user-defined", function (done) { 198 it("concatinates existing fonts with user-defined", function (done) {
199 var fontList = [ 199 var fontList = [
-   200 "Andale Mono", "Arial", "Arial Black", "Arial Hebrew", "Arial MT", "Arial Narrow", "Arial Rounded MT Bold",
200 "Andale Mono", "Arial", "Arial Black", "Arial Hebrew", "Arial MT", "Arial Narrow", "Arial Rounded MT Bold", "Arial Unicode MS", 201 "Arial Unicode MS",
201 "Bitstream Vera Sans Mono", "Book Antiqua", "Bookman Old Style", 202 "Bitstream Vera Sans Mono", "Book Antiqua", "Bookman Old Style",
-   203 "Calibri", "Cambria", "Cambria Math", "Century", "Century Gothic", "Century Schoolbook", "Comic Sans",
202 "Calibri", "Cambria", "Cambria Math", "Century", "Century Gothic", "Century Schoolbook", "Comic Sans", "Comic Sans MS", "Consolas", "Courier", "Courier New", 204 "Comic Sans MS", "Consolas", "Courier", "Courier New",
203 "Garamond", "Geneva", "Georgia", 205 "Garamond", "Geneva", "Georgia",
204 "Helvetica", "Helvetica Neue", 206 "Helvetica", "Helvetica Neue",
205 "Impact", 207 "Impact",
-   208 "Lucida Bright", "Lucida Calligraphy", "Lucida Console", "Lucida Fax", "LUCIDA GRANDE", "Lucida Handwriting",
206 "Lucida Bright", "Lucida Calligraphy", "Lucida Console", "Lucida Fax", "LUCIDA GRANDE", "Lucida Handwriting", "Lucida Sans", "Lucida Sans Typewriter", "Lucida Sans Unicode", 209 "Lucida Sans", "Lucida Sans Typewriter", "Lucida Sans Unicode",
-   210 "Microsoft Sans Serif", "Monaco", "Monotype Corsiva", "MS Gothic", "MS Outlook", "MS PGothic",
207 "Microsoft Sans Serif", "Monaco", "Monotype Corsiva", "MS Gothic", "MS Outlook", "MS PGothic", "MS Reference Sans Serif", "MS Sans Serif", "MS Serif", "MYRIAD", "MYRIAD PRO", 211 "MS Reference Sans Serif", "MS Sans Serif", "MS Serif", "MYRIAD", "MYRIAD PRO",
208 "Palatino", "Palatino Linotype", 212 "Palatino", "Palatino Linotype",
209 "Segoe Print", "Segoe Script", "Segoe UI", "Segoe UI Light", "Segoe UI Semibold", "Segoe UI Symbol", 213 "Segoe Print", "Segoe Script", "Segoe UI", "Segoe UI Light", "Segoe UI Semibold", "Segoe UI Symbol",
210 "Tahoma", "Times", "Times New Roman", "Times New Roman PS", "Trebuchet MS", 214 "Tahoma", "Times", "Times New Roman", "Times New Roman PS", "Trebuchet MS",
211 "Verdana", "Wingdings", "Wingdings 2", "Wingdings 3" 215 "Verdana", "Wingdings", "Wingdings 2", "Wingdings 3"
Line 214... Line 218...
214 expect(fontList.length).toEqual(65); 218 expect(fontList.length).toEqual(65);
215 var userDefinedFonts = []; 219 var userDefinedFonts = [];
216 fontList.concat(userDefinedFonts); 220 fontList.concat(userDefinedFonts);
217 expect(fontList.length).toEqual(65); 221 expect(fontList.length).toEqual(65);
Line 218... Line -...
218   -  
219   222  
220 userDefinedFonts = ["Adria Grotesk", "Butler", "Nimbus Mono"]; 223 userDefinedFonts = ["Adria Grotesk", "Butler", "Nimbus Mono"];
221 expect(userDefinedFonts.length).toEqual(3); 224 expect(userDefinedFonts.length).toEqual(3);
222 fontList = fontList.concat(userDefinedFonts); 225 fontList = fontList.concat(userDefinedFonts);
223 expect(fontList.length).toEqual(65 + 3); 226 expect(fontList.length).toEqual(65 + 3);
224 done(); 227 done();
225 }); 228 });
-   229 });
-   230 describe("customFunction option", function () {
-   231  
-   232 it("concatinates the current keys with the customFunction output", function (done) {
-   233 function customFunction () {
-   234 return "RANDOM_STRING";
-   235 }
-   236 var spy = jasmine.createSpy('customFunction', customFunction).and.callThrough();
-   237 var fp = new Fingerprint2({
-   238 "customFunction": spy
-   239 });
-   240 fp.get(function (result, keys) {
-   241 expect(spy).toHaveBeenCalled();
-   242 done()
-   243 });
-   244 });
226 }); 245 });
227 }); 246 });