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
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
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
40577433aa
carl/bosh - fixed runner.html (</head> was too early); cleanup of script files that no longer existed; use passed getter
2009-07-29 10:04:55 -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
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
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
ragaskar
275b83cc52
Re-arranged files so that lib represents a standalone drop-in of Jasmine. Killed JSON reporter because it has been succeeded by TrivialReporter.js. Using mock-timeout in src for mock-timeout functionality (instead of maintaining two copies
2009-06-24 07:44:40 -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
ff5e1d337a
Fixed bootstrap tests
2009-06-16 07:19:15 -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
a5cf424f08
dwf: finished ExceptionsTest.js - BOOTSTRAP is red, not sure why
2009-06-15 13:47:05 -07:00
Davis W. Frank
6a2602f243
dwf: started moving Exceptions tests from bootstrap to runner
2009-06-15 08:28:14 -07:00
Davis W. Frank
95b52b9f82
dwf: moved runner finished & callback test to suites
2009-06-15 08:14:55 -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
