From de7be4b316824e32535717ad4ab73bee622796b3 Mon Sep 17 00:00:00 2001 From: ragaskar Date: Fri, 6 May 2011 18:32:17 -0400 Subject: [PATCH 1/7] ignore rvmrc --- .gitignore | 1 + .rvmrc | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 .rvmrc diff --git a/.gitignore b/.gitignore index dbc0f28..8474082 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ site/ .bundle/ .pairs +.rvmrc diff --git a/.rvmrc b/.rvmrc deleted file mode 100644 index 7a283b1..0000000 --- a/.rvmrc +++ /dev/null @@ -1 +0,0 @@ -rvm use default@jasmine \ No newline at end of file From c30f7d1aa7f0a0cd1e57d190db1e2110e49939c5 Mon Sep 17 00:00:00 2001 From: ragaskar Date: Fri, 6 May 2011 18:34:42 -0400 Subject: [PATCH 2/7] Fail with an error if node is not installed when running rake spec --- Rakefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Rakefile b/Rakefile index 6610545..9da9602 100644 --- a/Rakefile +++ b/Rakefile @@ -33,7 +33,7 @@ task :spec => ["spec:node", "spec:browser", "jasmine:hint"] namespace :spec do desc 'Run specs in Node.js' task :node do - system("node spec/node_suite.js") + raise "Node is required to run all jasmine specs" unless system("node spec/node_suite.js") end desc "Run specs in the default browser (MacOS only)" @@ -163,4 +163,4 @@ jasmine.version_= { exec "cd #{temp_dir} && zip -r #{zip_file_name} . -x .[a-zA-Z0-9]*" end -end \ No newline at end of file +end From 118324b4510c48bd1fc7286c5fc388da841d864a Mon Sep 17 00:00:00 2001 From: ragaskar Date: Fri, 6 May 2011 19:07:00 -0400 Subject: [PATCH 3/7] Don't show 'Jasmine waiting for...' console messages unless jasmine.VERBOSE is set to true --- spec/suites/WaitsForBlockSpec.js | 33 +++++++++++++++++++++++++++++++- src/WaitsBlock.js | 4 +++- src/WaitsForBlock.js | 6 ++++-- src/base.js | 8 +++++++- 4 files changed, 46 insertions(+), 5 deletions(-) diff --git a/spec/suites/WaitsForBlockSpec.js b/spec/suites/WaitsForBlockSpec.js index 6927194..e180721 100644 --- a/spec/suites/WaitsForBlockSpec.js +++ b/spec/suites/WaitsForBlockSpec.js @@ -10,6 +10,37 @@ describe('WaitsForBlock', function () { onComplete = jasmine.createSpy("onComplete"); }); + describe("jasmine.VERBOSE", function() { + var jasmineVerboseOriginal; + beforeEach(function() { + jasmineVerboseOriginal = jasmine.VERBOSE; + spyOn(env.reporter, 'log'); + + }); + it('do not show information if jasmine.VERBOSE is set to false', function () { + jasmine.VERBOSE = false; + var latchFunction = function() { + return true; + }; + var block = new jasmine.WaitsForBlock(env, timeout, latchFunction, message, spec); + expect(env.reporter.log).not.toHaveBeenCalled(); + block.execute(onComplete); + expect(env.reporter.log).not.toHaveBeenCalled(); + jasmine.VERBOSE = jasmineVerboseOriginal; + }); + it('show information if jasmine.VERBOSE is set to true', function () { + jasmine.VERBOSE = true; + var latchFunction = function() { + return true; + }; + var block = new jasmine.WaitsForBlock(env, timeout, latchFunction, message, spec); + expect(env.reporter.log).not.toHaveBeenCalled(); + block.execute(onComplete); + expect(env.reporter.log).toHaveBeenCalled(); + jasmine.VERBOSE = jasmineVerboseOriginal; + }); + }); + it('onComplete should be called if the latchFunction returns true', function () { var latchFunction = function() { return true; @@ -84,4 +115,4 @@ describe('WaitsForBlock', function () { expect(onComplete).toHaveBeenCalled(); }); }); -}); \ No newline at end of file +}); diff --git a/src/WaitsBlock.js b/src/WaitsBlock.js index 151c051..4900805 100644 --- a/src/WaitsBlock.js +++ b/src/WaitsBlock.js @@ -6,7 +6,9 @@ jasmine.WaitsBlock = function(env, timeout, spec) { jasmine.util.inherit(jasmine.WaitsBlock, jasmine.Block); jasmine.WaitsBlock.prototype.execute = function (onComplete) { - this.env.reporter.log('>> Jasmine waiting for ' + this.timeout + ' ms...'); + if (jasmine.VERBOSE) { + this.env.reporter.log('>> Jasmine waiting for ' + this.timeout + ' ms...'); + } this.env.setTimeout(function () { onComplete(); }, this.timeout); diff --git a/src/WaitsForBlock.js b/src/WaitsForBlock.js index 793ca3e..9a72954 100644 --- a/src/WaitsForBlock.js +++ b/src/WaitsForBlock.js @@ -21,7 +21,9 @@ jasmine.util.inherit(jasmine.WaitsForBlock, jasmine.Block); jasmine.WaitsForBlock.TIMEOUT_INCREMENT = 10; jasmine.WaitsForBlock.prototype.execute = function(onComplete) { - this.env.reporter.log('>> Jasmine waiting for ' + (this.message || 'something to happen')); + if (jasmine.VERBOSE) { + this.env.reporter.log('>> Jasmine waiting for ' + (this.message || 'something to happen')); + } var latchFunctionResult; try { latchFunctionResult = this.latchFunction.apply(this.spec); @@ -49,4 +51,4 @@ jasmine.WaitsForBlock.prototype.execute = function(onComplete) { self.execute(onComplete); }, jasmine.WaitsForBlock.TIMEOUT_INCREMENT); } -}; \ No newline at end of file +}; diff --git a/src/base.js b/src/base.js index d0fafda..cd7e778 100755 --- a/src/base.js +++ b/src/base.js @@ -22,6 +22,12 @@ jasmine.unimplementedMethod_ = function() { */ jasmine.undefined = jasmine.___undefined___; +/** + * Show diagnostic messages in the console if set to true + * + */ +jasmine.VERBOSE = false; + /** * Default interval in milliseconds for event loop yields (e.g. to allow network activity or to refresh the screen with the HTML-based runner). Small values here may result in slow test running. Zero means no updates until all tests have completed. * @@ -599,4 +605,4 @@ jasmine.XmlHttpRequest = (typeof XMLHttpRequest == "undefined") ? function() { if (!xhr) throw new Error("This browser does not support XMLHttpRequest."); return xhr; -} : XMLHttpRequest; \ No newline at end of file +} : XMLHttpRequest; From bd8a3baed18e7b2018c4f9dd2fdda3dd6bb4432e Mon Sep 17 00:00:00 2001 From: ragaskar Date: Fri, 6 May 2011 22:30:48 -0400 Subject: [PATCH 4/7] Remove unused image files --- images/fail-16.png | Bin 722 -> 0 bytes images/fail.png | Bin 2114 -> 0 bytes images/go-16.png | Bin 759 -> 0 bytes images/go.png | Bin 2303 -> 0 bytes images/pending-16.png | Bin 802 -> 0 bytes images/pending.png | Bin 2720 -> 0 bytes images/question-bk.png | Bin 2541 -> 0 bytes images/questionbk-16.png | Bin 768 -> 0 bytes images/spinner.gif | Bin 1737 -> 0 bytes 9 files changed, 0 insertions(+), 0 deletions(-) delete mode 100755 images/fail-16.png delete mode 100755 images/fail.png delete mode 100644 images/go-16.png delete mode 100644 images/go.png delete mode 100755 images/pending-16.png delete mode 100755 images/pending.png delete mode 100755 images/question-bk.png delete mode 100755 images/questionbk-16.png delete mode 100755 images/spinner.gif diff --git a/images/fail-16.png b/images/fail-16.png deleted file mode 100755 index 6ebbf329e5a8f786264e03b17329d40c3f6fe495..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 722 zcmV;@0xkWCP)JVde(kg!hGhha zf`FijEb6!*dN9t#gGAzZ@!|!3fC(`!M~6S4{s0q*T+o(eu;MtkMtD*yuQ&ne6G1M zmixZ69_&&WE?_wh6lSLkNvbGCxU~V3GxGz{!IwQ=oUoDkLVazw{&^No!Sn(1k_>vK z3wm7>ranxfMkcWG1~RkDsB5f^Tsw9c{S(t~1+V9;XIh8o@+znoN!KePCn7j>s}~2_ z&*Ink1S+aXK20;*NH$UrR%^Ut3l`8x$+mtfsB(l1M_wQi^d{J;|NW?cY zrSUhXXXbunjmL^C?|F@NRUt@0KJM{ib3CILJNhdXxjUuju;#6aowBK@&Nr{w1iWF%i9bh=iJ!U`i+ut$284evPZ}j$z zP!lTu4VT+UxsCpMBfijy_i$|jPL^vpG!j(V`C}u)TlW+SI$|s9NF>roBr^#*HCwLN z4mtqt0HBwsnI0PKop|c>r~?=r>f86Zd_hBW;UVtMMV(sEbOwHz!2kA0fC=;>H8Uj1 z@Cz57sgdMC%4av{aO2h-4I;+CrwROKM}P@5z$BpteAD0i?(@4qjdTwBW(r0shhkoX zPXBGggv~D6Hl%JpI8lJh?}6OohteCUdH(L)eZ2SQkC@8L5cE&l0w&leskw6Q*>8uR zzwk8NitL=%H`B<+)}gI!!ZM0rbav^dsx1NAcBwDBe833;+(X^)9v;|&XX^6TzkiC4 z|M@vH(g^}jwhUZ`oqgpy6Y7~KPnL{`AT#%4DAEhcL?xgWfVW#XQdb{80#C4aOHKat z&TOI#eY0ucov=DtdHQaYK=l$tiM4Iu%JWLEA3fv8AO(DgEwAIP-@cO|53?to(!WAFx@o!@{8v}PmiBK`qr1w*ON_IeOi(c=SAqf{jiQ6gVxiJ z4ZVo@l}#+?4GhX61g<7P}F_yFYys(X58iE_vU+vdeK8|G0(c&Y#Bph1kR! z^Y}5T#&0Uu`D#^AWa;vy7oJ1v<~`WOV$(j=;(2&ajqQSECHPbrp^NA7AZIk)pPtMj zM$nTlpNFDIm&>lT7MS_kmk8D*ooxlSnc@!)wfu}m(D8rG;o{ja3;8oOz)ZTbC`_H; z1X!AmZ%SeMJfd6daH{MKwj?}#yssO@Y#!gV!X$k>;Aq5DHSkopi3!ZtRf39l3s_`9 zqF0erpQ$4o-+&-V5JVRQvU+gb*P{xigTf(`2bYK08a0S%TCl;IKew+1rs(6%^#H%mf1t4}0Bv zc2uP3W|A*1 zheXVP6OZy6GX33i9@_?RqaC-`iG)#^OU1JsuPmAHZNt?rg5l zRx;0p6$ukc)nbgh=rLn@Z?X)LDFGu2C0HFF8N@Qc6PUyPV!C|*x%k~YahEdTKjFtge1 z0i-jy@zz!Jw-Dt-fpcJany-Jd6pK`Jx9(yfTeKMPxT8P()=8DKEF?2&N}cSQNw-yA z?5oKVL=pC2KQzUI?(-L%pz+^#KR|9HjuFZi#qz@6&I!B)Y@K(@B2Eme)D?%{-L9puRubM%Z~*TDpA?E^g2 z?ZM%`E|_HWZ{ME7S}s3Hu-98!AFeXQ+TRYGlRmo9O$}-|c66Sag zUfBh|S3$rllW}d^`-e0S`DpPW+nkx&Z#%4&U8Gk@MP?>KN7SQ%u08Kz18}w$C_^sN zfIN!ijKD<_lw7+%=IzyW2AW7}`sL~+)s6sHq|Kao(C3{B5A}ym^r&F^-AYLoG~8a> zz@61~2Fg|?XBut7v<18ao^3Erjs&_U5Ba;)KGJV@ojEnrPga*wX$HwY{k3{V^~ivC sdK8rQnZtE%Vbj-0vzv#F%Kroy0IDrmV=}&Ad;kCd07*qoM6N<$g6kmwMF0Q* diff --git a/images/go-16.png b/images/go-16.png deleted file mode 100644 index f2bd574c65cf83062c1548ccd434105a23264bce..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 759 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 y*xKTwhUw#~S7=E9 diff --git a/images/spinner.gif b/images/spinner.gif deleted file mode 100755 index 148005da279b97c0acc697d48a815645977dc723..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1737 zcmYk+ZA?>H8o=>msePlC7H(UlOeuva6-udX=eG2X-nQJ9g5||K3}WrHKr7Zx(JnHq zYm9Sl?~UuSa${USIL0u>7~?RkfNPD*`ob8-IL0xKV;t8tt}(_n#yG|p*O+y6r*3#Y zo}4H7<@}T5Z^5mNF)7XZ9@^9BHL{rdI2d-q18QMcRe^ZC;0^r1tCZr{Fr`0(NC z>T0c4YcLp46m_{=$z<~M>C@%q<(W+8@#Du&o;;bKpWn4>S4T%jBoaAu=FHWrS8X<% zOePx}8#{LFSU4Qswr$(Jd-rIX7KucIgM$YS97rS*Cr_Tlaah-n{wj*|S@>Zf)JV^~8x2Gcz-7ZEam$UA?`%eSLi% zkH_I~T)1#yWMsr>G(LLtsJ6Ct_wL<2Jv};|PN`H*OiYAAq2l7=ojZ393=Ejf=8G3E zUcP+!!Gi~U=R0Kh!QmGv~cD#M_U#IdvW!_9YHXI*NeZFCMP!&tY zMpHwv0sV$_VhB|Jn+*hSFIK)O3^fz0y;w)HQEw<%^7csgZvS0G!2RP60Ld&xDXLb~ z(-g0~x>gTSn}re-e(+&k1GE^ND9Pd!D`^x#_JM-Jk}=?HazeIHGHr4Z{<1uku9sN;jT0*bq@ZR zy5l(W&#&;^(fMKyE012XSU8p!+6zAE5w2aQpn;?GDKjD1idkWAsSnflj1#qo+1HjNgl{r4E%i_$QP7s;6!vR z8hE*_oFdUOVKPNoBkKn{rBZL#Mj?+>4}=`_V10)I_KOn?5P!A~>PlR>U^)qn0Yi?^ z*F&Y*l%qb9`>$rBac>T_kw``2EM;^4K>9zbzzB=QfHX)^%I(#9J(%6yaGS>Yip)z@ z@t=GD;?C;|7VF0Ix+bks9I8zDY0xO=)+}GYHW><1SXCgUz@46TMePof&={?B;?p)e zZ0y!DARsJ&K^;FQ+4u=eC2TpQ_+vPf`i>z!$UvE+FBkl*75cTVT&T7R;!&%b*|ZEJ z8={SB1GGE`n<=E3#a9zf6Po_lgbEifEnPCSq8#DnjqJt7_lc3%P+X~zG|_-xw>d61 z2TF`G%I6Ts+$IxC@S(Vj#H|iH9aNRLp}SwffcV-JbXkdlVSeGHzfRj z;-!m$?-Lu`joLa1hR}e(to^|X-e!S|k}9Hp0=22jy1OwFb-Nm9k2&54o&0Z@p)Ls| zd?p6CxPyP4Ig3ZQP&&S_ss^g$zU%9$HNRND; z4%e^AlsXu!YD1y$%HE%U`TFj}`^22Zx}EvN7H5;)Wmg+$U?Y5d7Ur>bswq_3ATPx0w-9QSx`*AL7f4I3iUbdbvlHZ_8bb`@^p|+G4|{ zQXHj8)Py5_KA)4)&^Dymj*!?g{WyWSOt7jpG!FPOA8f6zn?k&eurN$ap}~GAtUohu zt2hbPuhCBVdL=MkxMfPB!yv1*XEQC6^A^BR$FQ-}iDRisxq_-wwI|zFMYzh?xSzLj Wc_{4u<=a1<$G!l-{_f-Z-~1P&zb^m) From c1f8151bcb74d9186b941073aa2b7f38b833fe05 Mon Sep 17 00:00:00 2001 From: ragaskar Date: Fri, 6 May 2011 22:40:53 -0400 Subject: [PATCH 5/7] Add png suitable for favicon --- images/jasmine_favicon.png | Bin 0 -> 905 bytes spec/runner.html | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 images/jasmine_favicon.png diff --git a/images/jasmine_favicon.png b/images/jasmine_favicon.png new file mode 100644 index 0000000000000000000000000000000000000000..218f3b43713598fa5a3e78b57aceb909c33f46df GIT binary patch literal 905 zcmV;419tq0P)Px#AY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF* zm;eA5aGbhPJOBUy24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_0008u zNkl3{fod28|PjmA)7fYg4w8-(2my9xtBGOs}K`n&t1VzxMO^X)M zrW+Ln1udc?q6TP)z5gAjt)P&D!M$+HJK#x<`xnD030zwD?KrxxY!2tlA zGc-58?0D7SsT)7Km=v+tNVNUk`?s@;^OxCF)y6P}_mL;~7;S<@b|MzmKq)m8l@yky zT1~ECpxZw@64!nkI34QLiUsA%i%N>-$&zGYR7WJyi9ERMyS(%kf z7A_r)X>!90&m(FwDQZ>q;+nOa*KR2+E6Fz)QwU=W1Oyo*4>_qlm|~joa|{4_A_3W8 z#FFZzRp-xMIx5a7D_Fj3&#r^TbIY@cND1d0f*^qDIs{!pw!IWGQ_%l4#ASm_D5Vet z0%ek7^)@xPihX_G0&hIc9*14ca=D!8oG}vW?H%~w^F?f_s>zU|fKrNJXJ_d6{v!t( zpEoqMws_yQws>3o?VW8Txq~#->dJG^ELW5irR!s`(_JvD^6;r+ho~eIK@ia8_lH(h zt*-p?CFC1_h2MV=?jP){uW!7WjLjCaO&c1D+tf582!XEaoB#xWAYcN5f$sLtf$koW zQs{{>)ZTq?FC6|J_%n}AWbiFK(Bo-%^-{H`*)E(ucjo-r%SYm)W5f6tN=xz=S646E fNXW#U{x?4WXWJ - + @@ -79,4 +79,4 @@ - \ No newline at end of file + From 1fae8f0a311f95f1bf66c02ea85c5557ab44a980 Mon Sep 17 00:00:00 2001 From: ragaskar Date: Fri, 6 May 2011 23:08:49 -0400 Subject: [PATCH 6/7] Rebuild main jasmine lib --- lib/jasmine.js | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/lib/jasmine.js b/lib/jasmine.js index 43c2f27..421bbf7 100644 --- a/lib/jasmine.js +++ b/lib/jasmine.js @@ -22,6 +22,12 @@ jasmine.unimplementedMethod_ = function() { */ jasmine.undefined = jasmine.___undefined___; +/** + * Show diagnostic messages in the console if set to true + * + */ +jasmine.VERBOSE = false; + /** * Default interval in milliseconds for event loop yields (e.g. to allow network activity or to refresh the screen with the HTML-based runner). Small values here may result in slow test running. Zero means no updates until all tests have completed. * @@ -2186,7 +2192,9 @@ jasmine.WaitsBlock = function(env, timeout, spec) { jasmine.util.inherit(jasmine.WaitsBlock, jasmine.Block); jasmine.WaitsBlock.prototype.execute = function (onComplete) { - this.env.reporter.log('>> Jasmine waiting for ' + this.timeout + ' ms...'); + if (jasmine.VERBOSE) { + this.env.reporter.log('>> Jasmine waiting for ' + this.timeout + ' ms...'); + } this.env.setTimeout(function () { onComplete(); }, this.timeout); @@ -2214,7 +2222,9 @@ jasmine.util.inherit(jasmine.WaitsForBlock, jasmine.Block); jasmine.WaitsForBlock.TIMEOUT_INCREMENT = 10; jasmine.WaitsForBlock.prototype.execute = function(onComplete) { - this.env.reporter.log('>> Jasmine waiting for ' + (this.message || 'something to happen')); + if (jasmine.VERBOSE) { + this.env.reporter.log('>> Jasmine waiting for ' + (this.message || 'something to happen')); + } var latchFunctionResult; try { latchFunctionResult = this.latchFunction.apply(this.spec); @@ -2429,7 +2439,7 @@ jasmine.getGlobal().clearInterval = function(timeoutKey) { jasmine.version_= { "major": 1, - "minor": 0, - "build": 2, - "revision": 1299565706 + "minor": 1, + "build": 0, + "revision": 1304737707 }; From d875d1d997ac02fedbb9a8fe6c431aea89d6a567 Mon Sep 17 00:00:00 2001 From: ragaskar Date: Fri, 6 May 2011 23:18:57 -0400 Subject: [PATCH 7/7] Don't run TrivialConsoleReporter specs if TrivialConsoleReporter is not loaded --- spec/suites/TrivialConsoleReporterSpec.js | 792 +++++++++++----------- 1 file changed, 397 insertions(+), 395 deletions(-) diff --git a/spec/suites/TrivialConsoleReporterSpec.js b/spec/suites/TrivialConsoleReporterSpec.js index 37e81aa..622043e 100644 --- a/spec/suites/TrivialConsoleReporterSpec.js +++ b/spec/suites/TrivialConsoleReporterSpec.js @@ -1,429 +1,431 @@ -describe("TrivialConsoleReporter", function() { - +if (jasmine.TrivialConsoleReporter) { + describe("TrivialConsoleReporter", function() { - //keep these literal. otherwise the test loses value as a test. - function green(str) { return '\033[32m' + str + '\033[0m'; } - function red(str) { return '\033[31m' + str + '\033[0m'; } - function yellow(str) { return '\033[33m' + str + '\033[0m'; } - - function prefixGreen(str) { return '\033[32m' + str; } - function prefixRed(str) { return '\033[31m' + str; } - - var newline = "\n"; - - var passingSpec = { results: function(){ return {passed: function(){return true;}}; } }, - failingSpec = { results: function(){ return {passed: function(){return false;}}; } }, - skippedSpec = { results: function(){ return {skipped: true}; } }, - passingRun = { results: function(){ return {failedCount: 0, items_: [null, null, null]}; } }, - failingRun = { results: function(){ return {failedCount: 7, items_: [null, null, null]}; } }; - - function repeatedlyInvoke(f, times) { for(var i=0; i