d2d60a798d
Merge remote-tracking branch 'bigfix/after_waitsFor'
...
* bigfix/after_waitsFor:
Test that show that afterEach and after are not being called when a waitsFor times out.
Test that afterEach is called after a failing spec.
Consolidate all waitsFor specs in the same describe block.
2012-07-24 16:36:28 -04:00
442f3bf872
Don't assume exports is defined when window is undefined
...
The current code makes the assumption that if window is undefined it is
being run in an environment which supports the CommonJS Modules spec.
This is not the case when Jasmine is being run in rhino or SpiderMonkey
(smjs) without EnvJS.
The fix is simply to check that exports is an object.
Signed-off-by: Kevin Locke <kevin@kevinlocke.name >
2012-07-19 14:10:39 -06:00
f910df00bb
Added toBeNaN matcher
2012-07-12 20:04:14 -06:00
500b856cfa
update jsdoc for jasmine.Matchers.prototype.toThrow
...
expected argument is optional
2012-07-10 15:12:32 +04:00
dad4865fbf
Merge pull request #221 from rupurt/no_try_catch_multi_commit
...
No try catch multi commit
2012-06-28 09:56:39 -07:00
1771ec3c63
Add checkbox to test runner which toggles catching of exceptions during tests
2012-06-24 00:02:52 -04:00
2385acedd8
Add config option which stops jasmine from capturing exceptions in a test
2012-06-23 23:12:31 -04:00
4c28bef387
Fix swapped template values in build_standalone_runner.rb.
...
`example_source_tags` and `example_spec_tags` each returned what the other
should have returned. I noticed this bug because it made the comments in
SpecRunner.html about where to include spec and source files incongruous with
the example tags that followed.
2012-06-16 17:49:43 -07:00
7bbcf51d45
Removed Frank for GHPages generation. Now using Rocco and a Thor task to build it
2012-05-27 13:16:20 -07:00
b6f96bc121
Version 1.2.0
...
- Bump version
- Update pages submodule
2012-05-14 07:35:47 -07:00
feebfbba68
Update README.markdown
2012-05-09 09:51:29 -07:00
8e4bd86865
Merge pull request #220 from moonmaster9000/patch-1
...
update the copyright and remove the blank "what's here" section.
2012-05-02 10:51:26 -07:00
4f218f7d6a
cover spy on on undefined method
2012-05-02 14:11:22 +02:00
bb1a4428db
update the copyright and remove the blank "what's here" section.
2012-04-13 23:30:12 -03:00
079740ca2c
Make Thor tasks more visible; Init Pages submodule when not present if about to run tests that require it
2012-04-09 22:21:09 -07:00
fbbccf6ef7
Bump to 1.2.0.rc3
2012-04-04 09:48:00 -07:00
7ad75c13d4
Fix Matchers.any specs in Firefox
...
- Firefox adds whitespace to the resulting to_string function, necessary
to remove it for the match to occur correctly.
2012-04-04 08:41:59 -07:00
d46ca4f506
correct for 1.2.0.rc2
2012-04-03 15:35:08 -07:00
ee7af4496c
Pages updated for 1.2.0.rc1
2012-04-02 18:37:35 -07:00
e22c4492a5
release prep for 1.2.0.rc1
2012-04-02 18:34:59 -07:00
d63836afb4
Fix for copying built Github pages to the submodule properly
2012-04-02 18:33:38 -07:00
06f1edc197
Merge branch 'master' of github.com:pivotal/jasmine
2012-04-01 17:03:06 -07:00
3a6b233a2e
Merge pull request #209 from mark-rushakoff/ruby187fix
...
fix JasmineDev#has_node? for Ruby 1.8.7
2012-04-01 17:02:20 -07:00
d15964b7dc
fix JasmineDev#has_node? for Ruby 1.8.7
2012-04-01 15:44:36 -07:00
6e22754c10
1.2.0.rc1 commit
2012-04-01 13:19:24 -07:00
bab4538404
Fix to name the standalone distribution from the version number
2012-04-01 13:11:53 -07:00
06d191af74
Merge branch 'master' of github.com:pivotal/jasmine
2012-04-01 13:08:55 -07:00
ad78d0d0d8
Fixed bug where version for Ruby gem wasn't correct
2012-04-01 13:08:42 -07:00
733a6a4ae4
Merge pull request #208 from mark-rushakoff/ansicolor-cleanup
...
Remove remaining references to term-ansicolor
2012-04-01 13:00:57 -07:00
3e0cad41f5
Remove remaining references to term-ansicolor
2012-04-01 12:30:38 -07:00
885832e920
Forgot to update Contribute to include new Thor tasks
2012-04-01 11:36:29 -07:00
3a0ada034b
Move sources order to Ruby, which is where it's used.
2012-04-01 11:28:57 -07:00
674197aef8
Removed TermAnsiColor gem (uses GPL and isn't needed anymore)
2012-04-01 10:51:04 -07:00
626da5a112
Re-implemented all development Rake tasks in Thor. Now actually tested.
...
Fixes:
* https://www.pivotaltracker.com/story/show/25484287 & https://github.com/pivotal/jasmine/issues/183
* https://www.pivotaltracker.com/story/show/25485401 & https://github.com/pivotal/jasmine/issues/189
* https://www.pivotaltracker.com/story/show/25485953 & https://github.com/pivotal/jasmine/issues/159
2012-04-01 10:47:29 -07:00
a3ccd8b0d3
less confusing messages for toHaveBeenCalledWith
2012-03-02 19:28:15 -08:00
4a1a2123a3
Fixes https://github.com/pivotal/jasmine-gem/issues/65 and https://www.pivotaltracker.com/story/show/24902023
2012-02-25 11:58:54 -08:00
c87cf71f4f
Merge pull request #156 from cathoderay/master
...
fixing typo
2012-01-08 12:46:14 -08:00
e4c557faae
Merge pull request #158 from grosser/contribute-markup
...
fix task list not displaying properly on github for contribute.markdown
2012-01-08 12:45:50 -08:00
6559c5b43a
Merge pull request #157 from grosser/license
...
add license to gemspec so automated tools can pick it up
2012-01-08 12:45:21 -08:00
912397120b
Merge pull request #170 from edtsech/patch-1
...
Remove double negative in docs (not.toNotContain, not.toNotEqual)
2012-01-08 12:41:46 -08:00
551464b8d2
Remove double negative in docs (not.toNotContain, not.toNotEqual)
2012-01-04 16:21:54 +01:00
8a298e5c0e
Merge pull request #168 from thedeeno/linux_open_browser
...
add linux support to ``rake spec:browser``
2012-01-03 17:07:17 -08:00
94a153ed15
add linux support to rake spec:browser
2012-01-03 17:12:20 -05:00
b4439f74d5
Merge pull request #100 from gvanhove/objectContaining
...
Merging after verifying locally that all specs are green (node, browser)
2011-11-18 13:26:04 -08:00
d70e733f70
remove unwanted spaces in it calls, and make the spec counting regex tolerate them if they exist so counts match even when using bad style
2011-11-14 18:43:13 -08:00
ac096f9911
convert objectContaining to use jasmineMatches and jasmineToString
2011-11-14 18:29:30 -08:00
08d72926ff
More renaming of hash
2011-11-14 18:29:30 -08:00
67ec0af254
use jasmineMatches for equality testing of complicated matchers
2011-11-14 18:29:30 -08:00
4f2fcff15a
Use jasmineToString for printing out complicated matchers
2011-11-14 18:29:30 -08:00
7158fc2426
Rename hashContaining to objectContaining, since this is javascript. Also call the toString from prettyPrinter
2011-11-14 18:26:48 -08:00
rgould