Commit Graph

150 Commits

Author SHA1 Message Date
Christian Williams
a661e77345 Remove jasmine.Matchers.pp(), use jasmine.pp() instead. 2010-03-05 22:34:37 -05:00
Christian Williams
564b9a0c3e Cleanup. 2010-03-05 22:11:11 -05:00
Christian Williams
49f295690a Old-style custom matchers (those which call this.report()) are not supported with the ".not" matcher negation syntax. 2010-03-01 23:02:59 -05:00
Christian Williams
6574dcc728 Merge branch 'master' into dot-not 2010-02-27 11:57:15 -05:00
Josh Susser
80d67d49a0 Bump version to 0.10.1 2010-02-24 19:45:30 -08:00
Josh Susser
6ca766d5ea Update isArray_ function and add test coverage 2010-02-24 19:35:32 -08:00
Josh Susser
5e3eb884ca Fix message bug with wasCalledWith. Throw on bad arguments to createSpyObj 2010-02-24 19:27:43 -08:00
Christian Williams
bef9867b61 Merge branch 'master' of git@github.com:pivotal/jasmine 2009-12-25 11:41:07 -05:00
Christian Williams
d16e2b7992 Add partial support for not -- e.g. expect(xxx).not.toEqual(yyy). Old-style custom matchers not yet supported. 2009-12-24 17:01:13 -05:00
Christian Williams
20a00d517e Refactor toThrow matcher. 2009-12-24 13:41:28 -05:00
Christian Williams
9f247eb278 Custom matchers may now work like regular matchers -- just return a boolean, don't call this.report(). The old style still works but is deprecated. 2009-12-24 12:15:18 -05:00
Fabio M. Costa
dd5e97bf14 with this fix jasmine runs on ie6
(cherry picked from commit 33a3b769e2b28aab01c1d6ee216c55e12539f417)
2009-12-23 07:14:47 -08:00
Nathan Wilmes & Davis W. Frank
d90852336f Added wasNotCalledWith matcher, used argsForCall a bit less 2009-12-21 11:45:49 -08:00
Christian Williams
40ff1cb4c8 Merge branch 'safe-undefined' of git@github.com:pivotal/jasmine 2009-11-27 15:30:56 -05:00
Christian Williams
23c5289b7e Fix regexp pretty printing for Chrome. 2009-11-27 15:27:52 -05:00
Christian Williams
7653107f0c Use jasmine.undefined for all comparisons to the undefined value, since undefined itself may be redefined elsewhere
in app code.  Thanks to Charlie Meyer at UIUC for the suggestion.
2009-11-26 11:12:06 -05:00
Joseph Palermo
701ee719e6 Fix loop so it works with extra methods added to Array 2009-11-22 22:18:53 -08:00
Christian Williams
1a53838d97 Wrap base matchers from jasmine.Matcher prototype automatically at env instantiation time rather than manually. 2009-11-13 14:32:08 -05:00
Christian Williams
2fc78a0fe2 Moved last message formatting functions to be set up by matcher test function. 2009-11-13 13:34:10 -05:00
Christian Williams
b0ae461139 Nicer pretty printing of spy objects. 2009-11-12 16:49:48 -05:00
Christian Williams
5a8a050c46 Removed toMatch and toNotMatch's message functions, now sufficiently handled by the default message builder. 2009-11-12 15:43:49 -05:00
Christian Williams
7be8247b2f Fix pretty printing of RegExp objects. 2009-11-12 15:37:52 -05:00
Christian Williams
98e86817bf Fix wasCalledWith matcher. 2009-11-12 15:03:55 -05:00
Christian Williams
3b92b9bb79 Remove message function from matchers where a formulaic message is good enough. 2009-11-12 14:36:58 -05:00
Christian Williams
1b3545c82a Remove 'actual' param from matchers test and message functions. Use this.actual instead. This way, the signature of the test function matches how the matcher is called from a spec.
Spy matchers now throw an exception when called with non-spies, rather than returning false.  This makes the message function simpler, and will work better with future dot-not support.
Added better specs for error conditions on spy matchers.
2009-11-12 12:47:44 -05:00
Christian Williams
2a5754600a Add documentation for all non-private functions. 2009-11-10 17:32:29 -05:00
Christian Williams
1982fb51c9 Generate docs from source files, not lib. 2009-11-10 14:28:47 -05:00
Christian Williams
0810e4a01c Rename UPDATE_INTERVAL to DEFAULT_UPDATE_INTERVAL. 2009-11-09 17:51:03 -05:00
Christian Williams
0f610b03d2 Merge branch 'master' of git@github.com:pivotal/jasmine 2009-11-09 17:42:21 -05:00
ragaskar
8feb285ca8 Ruby runner changes. Users of previous versions with Rake tasks that make use of additional runner options (helpers, etc) may be broken. 2009-10-31 21:47:11 -07:00
ragaskar
f9d73761bb Restore Matcher prototype methods for IDE joy 2009-10-30 19:29:19 -07:00
ragaskar
827fd1da0e Pass sensible arguments in ExpectationResults 2009-10-29 20:33:47 -07:00
Ryan Dy & Rajan Agaskar
b67d2a265d major matcher refactor 2009-10-29 17:03:24 -07:00
Davis Frank & Rajan Agaskar
fa2d36c5dc Minor doc fix 2009-10-27 13:33:22 -07:00
ragaskar
2059422955 Removed jasmine.env.currentlyRunningTests, use reporter to determine if jasmine is running 2009-10-24 17:01:40 -07:00
Erik Hanson & Rajan Agaskar
b35a2acfc8 Moved currentlyRunningTests to Runner instead of spec 2009-10-21 09:33:31 -07:00
Christian Williams
970ef0cec2 Refactor. 2009-10-19 22:19:36 -07:00
Christian Williams
b6e408aab8 Remove @deprecated methods. 2009-10-19 22:17:22 -07:00
Christian Williams
5dd9c53176 Remove @deprecated methods. 2009-10-19 17:53:29 -07:00
Christian Williams
5f82bdbf1b Fix test running in IE. 2009-10-19 17:29:33 -07:00
ragaskar
3109e7a4bb Jasmine version to 0.10.0 2009-10-16 20:10:20 -07:00
ragaskar
308d02f72f Trivial Reporter improvements, runner now returns specs() 2009-10-15 18:58:52 -07:00
ragaskar
85d3b2d14b IE7 fixes 2009-10-15 17:48:28 -07:00
Rajan Agaskar & Ryan Dy
c164d58a1a Add calls accessor to spies 2009-10-13 14:28:46 -07:00
Rajan Agaskar & Ryan Dy
31bb686fd5 Merge branch 'loop-dont-recurse' of git://github.com/Xian/jasmine into xian_jasmine 2009-10-13 14:12:35 -07:00
Christian Williams
5659a1e79e jasmine.Queue iterates by looping rather than recursing, so stack overflows should be less likely. 2009-10-12 23:09:51 -05:00
Christian Williams
b7549196da Blocks which complete synchronously have the completion de-nested. Big speed improvement, not quite sure why yet. 2009-10-12 21:23:57 -05:00
Christian Williams
a3ed49a5ed Refactor. 2009-10-12 21:02:50 -05:00
Christian Williams
e1ebc1e692 Refactor Queue.js. 2009-10-12 17:22:00 -05:00
ragaskar
73c0d57c94 Tuning to prevent stack overflows in FF 2009-10-05 22:36:10 -07:00
ragaskar
250c483a6b Merged in Selenium optimizations from http://github.com/gannett/jasmine branch. Updated json2 to latest. 2009-09-29 22:09:30 -07:00
ragaskar
a394b564f4 runner-wide beforeEach, afterEach support 2009-09-28 16:24:45 -07:00
ragaskar
2588368231 Deprecate getResults() (use results()). Add some unit test coverage for jasmine.Spec. Add some unit test coverage for JsApiReporterSpec. 2009-09-28 11:13:44 -07:00
ragaskar
4620ea6a44 Merged in Xian's speed fixes 2009-09-04 10:57:08 -07:00
ragaskar
43f819e9e2 Deprecated getAllSuites 2009-09-02 07:52:11 -07:00
ragaskar
4533d6a7cd specs() refactor, added test coverage 2009-09-02 07:30:31 -07:00
ragaskar
50134eb1ac Fix 'doubled' test runs in test runner 2009-09-01 21:21:54 -07:00
ragaskar
b9ee6a9119 Version revision uses current timestamp 2009-08-27 22:23:51 -07:00
pivotal
187bde37ca dwf/cj: added function and tests to get a suite's spec count 2009-08-27 14:21:10 -07:00
ragaskar
ba5b4ab166 Fix compatibility with the ruby contrib runner 2009-08-26 15:55:08 -07:00
ragaskar
f9d61108ee Minor version changes 2009-08-21 07:00:54 -07:00
ragaskar
3993969c41 Add versioning to jasmine 2009-08-20 22:16:14 -07:00
ragaskar
96bcde80af Minor logging fix 2009-08-20 19:21:07 -07:00
ragaskar
2a4241323d Permit focused running with Queue-based runner 2009-08-19 07:55:51 -07:00
ragaskar
0a3358f249 Merge in new HTML runner. Tests green, regression on focused running. 2009-08-19 07:42:47 -07:00
xian
ab65914233 Merge branch 'master' of git@github.com:emi/jasmine into htmlreporter
Conflicts:
	lib/TrivialReporter.js
	spec/bootstrap.js
	spec/runner.html
2009-08-14 18:03:47 -07:00
Aaron Peckham & Christian Williams
8870f907e8 Fixed formatting. 2009-08-14 15:43:36 -07:00
Aaron Peckham & Christian Williams
ca077342f3 Added toBeLessThan and toBeGreaterThan matchers. 2009-08-14 15:39:28 -07:00
ragaskar
454d453207 add setTimeout to Queue so reporters get periodic updates 2009-08-13 07:52:44 -07:00
ragaskar
7b63960db0 Refactor Runner to use Queue; remove ActionCollection 2009-08-12 22:12:28 -07:00
Aaron Peckham & Christian Williams
4b244612c1 Visually group specs by suite. 2009-08-10 17:50:03 -07:00
ragaskar
0061054aaa minor runner test cleanup 2009-08-08 09:31:19 -07:00
ragaskar
56c26c5b55 Allow waits/runs in spec.after. spec.after runs in between spec end and afterEach. 2009-08-08 09:31:19 -07:00
ragaskar
8b998749f3 afterEach now allows for waits, runs blocks 2009-08-08 09:31:12 -07:00
ragaskar
b55399bd4b beforeEach now supports waits and Runs blocks 2009-08-08 09:31:07 -07:00
ragaskar
0d6c6c2a35 Re-refactored Queue to use straightforward callbacks 2009-08-08 09:31:06 -07:00
ragaskar
9475de28b3 Queue/Spec refactor 2009-08-08 09:30:59 -07:00
ragaskar
f73fd8ae95 Refactor Spec block execution into Queue 2009-08-01 14:56:29 -07:00
ragaskar
d5489a3e0d Start of before/after refactor. Yank defineGetter on nestedResults. rake build task now sorts sources to minimize jasmine.js changes post-build 2009-08-01 10:43:03 -07:00
ragaskar
60f513cbff minor Spec refactor 2009-07-30 22:31:57 -07:00
ragaskar
f84c67b98a Merge in Pivotal changes 2009-07-29 22:41:38 -07:00
ragaskar
a1a278ee69 Major refactoring of Spec. Moved QueuedFunction to Block, WaitsBlock and WaitsForBlock. Waits and WaitsFor blocks now sequentially stackable 2009-07-29 22:27:11 -07:00
pivotal
19241ed03d carl/bosh - killed bootstrap dead; refactored to have emitString for use by subclasses. 2009-07-29 11:33:23 -07:00
pivotal
1da0c1c890 carl/bosh - fixed PrettyPrinter 2009-07-28 17:57:29 -07:00
pivotal
4cfb7ddd42 carl/bosh - merge pockets pudge changes in and update bootstrap to include some missing src files 2009-07-28 17:27:52 -07:00
Christian Williams & Aaron Peckham
5b695d3deb Report spec results properly. 2009-07-10 14:35:24 -07:00
Christian Williams
f451e633cb Add reportRunnerStarting callback to reporters. 2009-07-08 18:33:15 -07:00
Christian Williams
e1408a9f58 Add jasmine.Reporter no-op base class for reporters. 2009-07-08 18:18:17 -07:00
Christian Williams
0c24c2df2e jasmine.Env should always have a reporter now, no need to check. 2009-07-08 18:01:05 -07:00
Christian Williams
a6aa9c652b Allow for registration of multiple Reporter with Jasmine. 2009-07-08 17:55:25 -07:00
Christian Williams
6b32586e1f Remove unused parameter. 2009-07-07 23:59:38 -07:00
Christian Williams
ed00c13b15 Provide a way to add more matchers in a spec or suite without affecting later specs or suites. 2009-07-07 23:57:03 -07:00
Christian Williams
662b4b94f4 jasmine.Spec.prototype.(expect|waits|waitFor) shouldn't be deprecated. 2009-07-07 23:06:18 -07:00
Davis W. Frank
19b73469dd dwf: more doc commits 2009-06-28 13:36:51 -07:00
pivotal
280c7bcf27 jb/dwf - updated Jasmine to move mock-timeout into the src dir & build; rake build simplified 2009-06-19 11:47:33 -07:00
ragaskar
853f47e4aa Added rake :build task to concat files together. Removed jsUnitMockTimeout.js 2009-06-16 07:13:45 -07:00
Davis W. Frank
9928674b37 dwf: moved test of #explodes into SpecRunningTest.js - GREEN 2009-06-14 23:41:14 -07:00
Davis W. Frank
b2cbff3bb6 dwf: monster file re-org. RED BUILD 2009-06-14 23:34:29 -07:00
Davis W. Frank
8f13a631e7 dwF: moving toNotEqual to report !this.env.equals_ instead of a straight !== 2009-06-14 23:14:20 -07:00
ragaskar
9d95483de6 Refactored into class files. Meta-tests and runner for jasmine. Stack traces available for Firefox and supported browsers. Experimental pretty print matcher support. Many other new features 2009-05-28 20:02:15 -07:00