github-migration/jasmine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
487 Commits 6 Branches 14 Tags 2.3 MiB
master
Commit Graph

175 Commits

Author SHA1 Message Date
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
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
60ea562560 Reuse an 'it' block. 2009-11-13 13:21:40 -05:00
Christian Williams
b0326d3078 Reorganizing spy matcher specs. 2009-11-13 12:30:22 -05:00
Christian Williams
752b91f118 Reorganizing spy matcher specs. 2009-11-13 12:21:34 -05:00
Christian Williams
b0ae461139 Nicer pretty printing of spy objects. 2009-11-12 16:49:48 -05:00
Christian Williams
ee5905d237 Fix html escaping of matcher failure messages. 2009-11-12 16:13:44 -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
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
827fd1da0e Pass sensible arguments in ExpectationResults 2009-10-29 20:33:47 -07:00
ragaskar
328cc89980 Add deadlyicon console fix for safari 2009-10-29 19:48:23 -07:00
Ryan Dy & Rajan Agaskar
b67d2a265d major matcher refactor 2009-10-29 17:03:24 -07:00
ragaskar
8b23698852 TrivialReporter matcher message spec. Simplified TrivialReporter createDom. 2009-10-27 22:18:38 -07:00
pivotal
6a467fc00e added tests for mockclock 2009-10-27 16:49:23 -07:00
Christian Williams
97ce2070d1 Remove version.json. 2009-10-19 22:18:51 -07:00
Christian Williams
b6e408aab8 Remove @deprecated methods. 2009-10-19 22:17:22 -07:00
Christian Williams
6b3bf1b3ba Merge branch 'master' of git@github.com:pivotal/jasmine 
Conflicts:
	spec/runner.html
 2009-10-19 22:02:05 -07:00
Christian Williams
5dd9c53176 Remove @deprecated methods. 2009-10-19 17:53:29 -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
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
d27684d280 Oops, only report results once. 2009-10-12 17:15:57 -05:00
Christian Williams
f9b3eff5ab Got standalone HTML test page working again. 2009-10-12 17:13:54 -05:00
Christian Williams
34b479a1a4 Revert "Removed jasmine spec HTML runner (easier to use Rake tasks)" 
Let's keep it around though so we can run tests without Ruby, eh?

This reverts commit e33ecf3665.
 2009-10-12 17:13:41 -05:00
Christian Williams
6ee8ed02a9 Revert "Removed jasmine spec HTML runner (easier to use Rake tasks)" 
Let's keep it around so we can still run tests without Ruby, eh?

This reverts commit e33ecf3665.
 2009-10-10 10:18:35 -07: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
e33ecf3665 Removed jasmine spec HTML runner (easier to use Rake tasks) 2009-09-09 18:26:05 -07:00
ragaskar
26fdc7cc91 Fix for jasmine rake tasks, fix for window.eval issues 2009-09-09 18:18:00 -07:00
ragaskar
11f356e375 Integrate JasmineHelper 2009-09-04 23:04:48 -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
pivotal
187bde37ca dwf/cj: added function and tests to get a suite's spec count 2009-08-27 14:21:10 -07:00
ragaskar
7a446d53c0 Reorg. Added examples/ with html and ruby test runner examples 2009-08-26 22:13:30 -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
9b9a4b6835 Add test coverage for empty suite handling 2009-08-20 19:32:15 -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
e9126fdd9b Fix some problems with merge. 2009-08-14 18:04:52 -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
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
Erik Hanson
4410c7cd94 added failure count to top of trivial reporter 2009-08-12 10:15:15 -07:00
Aaron Peckham & Christian Williams
4b244612c1 Visually group specs by suite. 2009-08-10 17:50:03 -07:00
Aaron Peckham & Christian Williams
b1a007dfb5 Move specFilter function to TrivialReporter. 2009-08-10 16:00:42 -07:00
Aaron Peckham & Christian Williams
e476f2375a Allow individual specs to be rerun; show skipped tests in gray. 2009-08-10 15:39:48 -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