Andre Wiggins
c8b212f278
make DelayedFunctionScheduler update the mockDate
2015-11-20 03:45:57 -08:00
Gregg Van Hove
b3f69852c1
Merge pull request #973 from brunoqc/patch-1
...
Syntax highlighting in README.md
2015-11-13 17:05:28 -08:00
Bruno Bigras
1613a376b1
Syntax highlighting in README.md
2015-11-12 12:10:21 -05:00
Gregg Van Hove
1e35e8ba95
Use git:// url for jasmine-npm dependency
2015-11-04 15:12:38 -08:00
Gregg Van Hove
a6b209bc2f
Use jasmine-npm straight from github when developing
2015-11-04 15:05:07 -08:00
Gregg Van Hove
2301914549
build combined file for jsApiReporter changes
...
[#92249258 ]
2015-11-04 14:11:39 -08:00
Gregg Van Hove
320c42b6cc
Run jasmine's specs randomly in node and performance specs
...
[#92249258 ]
2015-11-04 12:30:49 -08:00
Gregg Van Hove
df45b4fede
Run jasmine's specs in random order
...
[#92249258 ]
2015-11-04 12:06:28 -08:00
Gregg Van Hove
c1ab3c9cbe
Add support for returning run details for reporting randomness
...
[#92249258 ]
2015-11-04 12:05:29 -08:00
Gregg Van Hove
d2f2e2b870
Merge branch 'himajasuman-issue#896'
...
Fixes #896
2015-10-27 14:13:15 -07:00
Gregg Van Hove
0f6a7f04b3
Merge branch 'issue#896' of https://github.com/himajasuman/jasmine into himajasuman-issue#896
2015-10-27 14:12:31 -07:00
Gregg Van Hove
728af5e556
Remove unused queueableFn arg from onException
...
Fixes #958
2015-10-27 12:24:32 -07:00
Gregg Van Hove
018fd53c10
Merge branch 'FuzzySockets-to-throw-error-unused-param'
2015-10-27 12:22:09 -07:00
Gregg Van Hove
25d73515f3
Merge branch 'to-throw-error-unused-param' of https://github.com/FuzzySockets/jasmine into FuzzySockets-to-throw-error-unused-param
2015-10-27 12:21:42 -07:00
Gregg Van Hove
8e317d4026
Less verbose for the linter
2015-10-26 17:51:42 -07:00
Gregg Van Hove
ea4c44904d
IE 8 doesn't support defineProperty on non-DOM nodes, skip that kindof thing
2015-10-26 17:41:30 -07:00
Gregg Van Hove
77514bbb80
use safari 9 not 8.1 anymore
2015-10-26 17:18:25 -07:00
Gregg Van Hove
a85c3a4da8
Check for descriptor
2015-10-26 17:03:45 -07:00
Gregg Van Hove
0b1e1a0401
Merge branch 'StephanBijzitter-throw-for-constants'
...
Fixes #948
2015-10-26 16:30:01 -07:00
Gregg Van Hove
3374415add
Merge pull request #954 from matthewhuff89/remove_goals_md
...
Removed GOALS_2.0.md, doesn't seem to be needed anymore
2015-10-26 14:58:03 -07:00
Richard Harrington
c2ae3b6b12
Remove unused parameter from toThrowError
2015-10-26 11:43:31 -04:00
Himaja
110cacab19
Added a throw error block in describe incase a function with arguments is passed in describe
2015-10-25 14:13:14 -04:00
Matthew D. Huff
db7879a478
Removed GOALS_2.0.md, doesn't seem to be needed anymore
2015-10-25 13:03:46 -04:00
guy-mograbi-at-gigaspaces
e7dbc75fc2
feat(spy): add option to respy
...
will not throw error if spyOn called on a spy
fixes #931
2015-10-24 08:37:33 +03:00
Stephan Bijzitter
a81466d9e7
Abort spying when the target cannot be spied on
2015-10-21 12:44:52 +02:00
Gregg Van Hove
48f42eaa7d
Merge branch 'lalunamel-master'
...
Merges #942
Fixes #930
Fixes #912
2015-10-15 09:21:57 -07:00
Cody Sehl
e5c2572753
Change #xit so that it will output a more BDD-style pending message
2015-10-14 21:03:47 -06:00
Gregg Van Hove
141fd910f2
Use className instead of class when creating DOM elements
2015-10-06 09:10:22 -07:00
Gregg Van Hove
a93bfd2120
Merge branch 'marcioj-random-tests'
2015-10-04 14:03:30 -07:00
Gregg Van Hove
4221b2d2c4
Merge branch 'random-tests' of https://github.com/marcioj/jasmine into marcioj-random-tests
2015-10-04 14:03:17 -07:00
Gregg Van Hove
6ee7fd6ced
Merge branch 'toString_fallback' of https://github.com/myitcv/jasmine into myitcv-toString_fallback
2015-10-04 13:47:27 -07:00
Gregg Van Hove
878325e2cf
Merge branch 'James-Dunn-patch-1'
2015-10-04 13:45:10 -07:00
James
80c4f87dd5
Fix circles/x from getting cut off on Mac/chrome
2015-09-27 17:01:08 +04:00
Marcio Junior
3f3fa484b2
Allow tests to run in random order
2015-09-26 14:53:08 -03:00
Paul Jolly
d0ad9b98cd
Use toString for objects if it has been overriden
2015-09-25 20:19:48 +01:00
Gregg Van Hove
375a6f9fda
Merge branch 'danielalexiuc-master'
...
- Fixes #924
- Fixes #917
2015-09-24 12:58:56 -07:00
danielalexiuc
c017f0000d
Postpone find() until it is needed
...
This is a fix for issue #917 .
It seems that 'symbols' was originally included as a performance optimization, to avoid repeated find() calls for '.jasmine-symbol-summary'. However this find() occasionally fails during initialize if the dom has not loaded completely.
This change will not affect performance, as symbols is still cached. However it improves upon the original code in that the find happens at a stage much later than initialize.
2015-09-16 11:52:05 +10:00
Gregg Van Hove
4097718b66
Merge pull request #906 from soycode/master
...
check for global before assigning
2015-09-03 13:38:21 -07:00
Gregg Van Hove
825dab32ff
Merge pull request #908 from mcamac/master
...
Reverse suite afterEach behavior to match semantics?
2015-09-01 21:33:52 -07:00
Martin Camacho
f3a7396845
afterEach behavior
2015-08-18 17:55:03 -04:00
soycode
850bee5492
check for global before assigning
2015-08-17 14:20:52 -07:00
Gregg Van Hove
6028a5d92c
Merge branch 'SimenB-badges'
2015-08-10 10:39:39 -07:00
Simen Bekkhus
93a13ab791
Use badges from shields.io
2015-08-08 07:54:15 +02:00
Greg Chattin-McNichols and Gregg Van Hove
542f483228
Force the safari 8.1 version to be a string for sauce
2015-08-04 15:11:39 -07:00
Greg Chattin-McNichols and Gregg Van Hove
459b4c29b6
Drop Safari 5 on OS-X from the build matrix
...
- SauceLabs no longer supports it
- Add Safari 8.1
2015-08-04 09:40:37 -07:00
Greg Chattin-McNichols and Gregg Van Hove
750a9aac6d
Merge pull request #869 from ljwall/jasmine
...
Fixes #855
2015-08-03 15:01:43 -07:00
Greg Chattin-McNichols and Gregg Van Hove
cd55f03912
concat files for toHaveBeenCalledTimes matcher
2015-08-03 14:57:52 -07:00
Gregg Van Hove
79954311fb
Merge pull request #892 from obastemur/patch-1
...
Update glob to latest
2015-07-16 12:10:21 -07:00
Oguz Bastemur
3f71bcdb2d
Update glob to latest
...
Fixes https://github.com/jasmine/jasmine/issues/891
2015-07-15 02:37:36 +03:00
Gregg Van Hove
06f05ac57b
Add notes about "ready for work" label
2015-07-02 14:52:17 -07:00
