Commit Graph

135 Commits

Author SHA1 Message Date
Christian Williams b33b2d2cf1 toThrow()'s (and some other matchers') .not message is misleading. 2010-08-25 18:16:37 -07:00
Christian Williams e7a57606a2 Allow waitsFor() arguments to be specified in arbitrary order.
Default waitsFor() timeout is now specified in env.defaultTimeoutInterval; defaults to 5 seconds.
Deprecate waits() block in favor of waitsFor().
2010-08-25 18:04:52 -07:00
Christian Williams 55149310c3 Fixed bug: waitsFor() hangs forever if latch function never returns true. 2010-08-25 17:16:19 -07:00
Christian Williams 762f88e3c8 Some exploration and refactoring re waitsFor() bug: waitsFor() hangs forever if latch function never returns true. 2010-08-19 23:55:21 -07:00
Christian Williams b3715075e3 Add custom messages for inverted spy matchers. 2010-08-13 00:32:32 -07:00
Christian Williams 9af81b627b Missing semicolons. 2010-08-05 23:10:09 -07:00
Christian Williams 5182e00c66 Wrapped matcher functions return undefined after expect() for futureproofing; we might want to allow matcher chaining, e.g.:
expect(x).toBeGreaterThan(3).and.toBeLessThan(6));
or other stuff e.g.:
  expect(x).toBeTrue().because("it just needs to be");
2010-08-04 13:52:38 -07:00
Christian Williams 676af93bea Refactor toThrow() matcher specs. 2010-08-03 18:51:31 -07:00
Christian Williams 4d7b839473 Fix not.toThrow() matcher exception when used with no args. 2010-08-02 18:36:26 -07:00
Christian Williams 3da73bd519 Remove unused lib/consolex.js. 2010-06-30 23:49:34 -07:00
Lee Byrd & Christian Williams c533b67aa5 Remove vestiges of ruby ci code from jasmine core.
Add missing lib/jasmine-html.js.
2010-06-25 15:16:43 -07:00
Lee Byrd & Christian Williams 85351f2c1c Build html support classes (just TrivialReporter for now) into jasmine-html.js. 2010-06-24 17:33:46 -07:00
Lee Byrd & Christian Williams 22065fafad By default don't display "Jasmine Running..." console log for each spec. Re-enable by setting TrivialReporter's logRunningSpecs to true. 2010-06-24 11:10:58 -07:00
Lee Byrd & Christian Williams 2939aff80c deprecating wasCalled, wasCalledWith, wasNotCalled, wasNotCalledWith and adding toHaveBeenCalled, and toHaveBeenCalledWith 2010-06-24 10:34:03 -07:00
Lee Byrd & Christian Williams 9c8180d8d0 Fixed bug where multiple calls to jasmine.Clock.useMock cause multiple tear downs 2010-06-23 11:03:05 -07:00
Lee Byrd & Christian Williams 413be6b4ca Remove deprecated class jasmine.Reporters.
Fully deprecate old-style Matchers; will be removed in next major version.
2010-06-22 17:35:41 -07:00
Lee Byrd & Christian Williams 0539251fe6 Refactored TrivialReporter to handle duplicate suite names properly 2010-06-22 17:25:08 -07:00
Lee Byrd & Christian Williams 1154fcaf3b Refactor. 2010-06-22 16:45:35 -07:00
Lee Byrd & Christian Williams 01d842fdfd Removed references to 'window'; using jasmine.getGlobal() instead in order to better support non-browser environments.
Better protection around access to console.
The global object is now pretty-printed as "<global>", not "<window>".
Tests are a little closer to passing in node.js.
2010-06-22 16:22:09 -07:00
Lee Byrd & Christian Williams e60f22a2e5 Changed 'type' field of MessageResult and ExpectationResult to 'log' and 'expect', respectively. 2010-06-22 14:48:47 -07:00
Lee Byrd & Christian Williams e7cd6a473a jasmine.log() and Spec#log() take multiple arguments which are pretty-printed and concatted together.
Log messages are handled correctly in TrivialReporter and JsApiReporter.
2010-06-22 12:23:54 -07:00
Lee Byrd & Christian Williams 3bdc96c00a Re-enable and fix JsApiReporterSpec specs. 2010-06-22 12:04:34 -07:00
Lee Byrd & Christian Williams e30b99e7b3 JsApiReporter reports nested suites correctly.
Runner#topLevelSuites() returns only top level suites.
Suite#specs(), Suite#suites(), and Suite#children() return immediate children.
2010-06-22 10:18:22 -07:00
Pivotal 5aa306cf66 Add unit specs for WaitsForBlock 2010-06-05 10:32:41 -04:00
Pivotal 46249bf515 Fix spec failure that occured when stack traces/line numbers are available 2010-06-05 10:07:58 -04:00
Christian Williams a2041e90a6 Multiple befores/afters in a single describe should be executed in order (as declared for befores, in reverse for afters). 2010-06-04 14:41:16 -04:00
Christian Williams ed49104fad Jasmine should recover gracefully when there are errors in describe functions. 2010-06-04 14:14:31 -04:00
Christian Williams & Ian Fisher 2212d755c3 Merge commit '5f10b2e623c6c21d1b692bde4a8a5c6d4015cd44' 2010-04-01 15:57:24 -07:00
Christian Williams & Ian Fisher 5f10b2e623 Added Env#versionString; nicer styling in TrivialReporter; hide passed and skipped tests by default, but allow them to be displayed. 2010-04-01 15:56:29 -07:00
Christian Williams 1469f83262 Deprecate jasmine.include(). 2010-03-24 13:53:34 -07:00
ragaskar bf938ffc50 Correct number matching in equals_ 2010-03-18 20:32:40 -07:00
ragaskar c85079e9d0 Handle string comparisons correctly with equals_ 2010-03-17 08:19:29 -07:00
Christian Williams 184ff6fb2d Typo. 2010-03-08 22:03:57 -08:00
Christian Williams 9830952461 Evaluate custom equality testers before any others. 2010-03-08 21:56:04 -08:00
Christian Williams a661e77345 Remove jasmine.Matchers.pp(), use jasmine.pp() instead. 2010-03-05 22:34:37 -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 4b80a10969 Fix specs. 2010-02-27 12:00:35 -05:00
Christian Williams 6574dcc728 Merge branch 'master' into dot-not 2010-02-27 11:57:15 -05:00
Christian Williams 99bcfdcd0d Spec cleanup. 2010-02-27 11:37:53 -05: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 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
Christian Williams b99bd08df9 Yes, really keep that undefined equals. 2009-12-24 12:11:59 -05:00
Christian Williams 72b5ede0da Move custom matcher specs to their own suite. 2009-12-24 10:53:57 -05:00
ragaskar 21998dcb9d Update Jasmine geminstaller to use gemcutter gems 2009-12-23 21:29:34 -08:00
Nathan Wilmes & Davis W. Frank d90852336f Added wasNotCalledWith matcher, used argsForCall a bit less 2009-12-21 11:45:49 -08:00
Nate Clark 849a4efda8 adds support to run Jasmine suites on CI using Sauce Labs 2009-12-16 17:27:06 -08: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