Gregg Van Hove
4e4cd30965
Merge pull request #1047 from d-reinhold/bundle-exec-compass
...
Grunt task for compass should prefix command with 'bundle exec'
- Merges #1047
2016-02-18 17:48:10 -08:00
Gregg Van Hove
7224c6adf2
Merge branch 'fix-eq-for-edge' of https://github.com/everedifice/jasmine into everedifice-fix-eq-for-edge
...
- Merges #1041
2016-02-18 16:48:33 -08:00
Gregg Van Hove
5bdd7e8fbf
Merge branch 'issue-931-respy' of https://github.com/guy-mograbi-at-gigaspaces/jasmine into guy-mograbi-at-gigaspaces-issue-931-respy
...
- Merges #953
- Fixes #931
2016-02-18 11:40:01 -08:00
Gregg Van Hove
1e0381a495
Update describe error message to no longer assume errant args are done
...
Fixes #896
2016-02-18 09:31:31 -08:00
Gregg Van Hove
c454658c54
Merge branch 'rullopat-greater-than-or-equal-less-than-or-equal-matchers'
...
- Merges #1049
- Fixes #1013
2016-02-17 15:46:05 -08:00
Patrizio Rullo
b7d8b0de71
Add toBeGreatThanOrEqual and toBeLessThanOrEqual matchers
...
- Implements issue #1013
2016-02-18 00:13:26 +01:00
Gregg Van Hove
342f0eb9a3
Merge branch 'logankd-master'
...
- Support call count of 0 with toHaveBeenCalledTimes matcher
- Merges #1048
- Fixes #994
2016-02-17 10:33:27 -08:00
Kevin Logan
44b56093e7
#1048 - fixed toThrow expectation
2016-02-17 12:16:54 -06:00
Kevin Logan
bee8132848
#1015 - revert formatting and spacing
2016-02-17 12:09:26 -06:00
Kevin Logan
e5c744f3dc
#1015 use isNumber fuction to check for empty expected argument. This will allow 0 to be passed in.
2016-02-17 12:03:06 -06:00
Gregg Van Hove
4fb5aa14b8
Merge branch 'issue1010' of https://github.com/bodawei/jasmine into bodawei-issue1010
...
- Merges #1011
- Fixes #1010
2016-02-16 15:41:42 -08:00
Gregg Van Hove
43cd73938d
Merge branch 'remove-extra-topSuite-constructor-param' of https://github.com/jurko-gospodnetic/jasmine into jurko-gospodnetic-remove-extra-topSuite-constructor-param
...
- Merges #1006
2016-02-16 15:23:05 -08:00
Gregg Van Hove
f38e8e9235
Merge branch 'cloned-args-on-calltracker' of https://github.com/a-r-d/jasmine into a-r-d-cloned-args-on-calltracker
...
- Merges #1000
- Fixes #872
2016-02-16 15:00:49 -08:00
Gregg Van Hove
fcd5a1948b
Merge branch 'skipped-links-with-random' of https://github.com/basawyer/jasmine into basawyer-skipped-links-with-random
2016-02-16 09:43:33 -08:00
Dominick Reinhold
33151ed9eb
Grunt task for compass should prefix command with 'bundle exec'
...
- Since we're stating that compass is a development dependency in our
gemspec, and we use bundle to install it, we should make sure that
grunt is using the correct (bundled) version of compass.
- This is especially important since many of the older versions of compass
are buggy (see https://github.com/gruntjs/grunt-contrib-compass/issues/204 )
2016-02-15 11:39:21 -08:00
minhyeong-kim
3f27ff1c7c
chore: fix jshint error
2016-02-04 17:47:17 +09:00
minhyeong-kim
b59cacf131
refactor: fix Edge freezing issue for matcherUtils#eq
...
fix Microsoft Edge freezing when recursive comparing
2016-02-04 17:09:03 +09:00
Gregg Van Hove
e0541eca80
Merge pull request #1021 from pra85/2016
...
Update license year range to 2016
2016-01-17 15:24:53 -08:00
Prayag Verma
8b7cb21874
Update license year range to 2016
2016-01-18 01:13:22 +05:30
Blake Sawyer
ee0ff3b6c8
Persist randomize param in 'run all' links
2016-01-14 20:58:15 -05:00
DJ Burrowes
65241565c5
Reverse order that spies are cleared up.
...
Fixes #1010
2016-01-03 19:14:57 -08:00
Jurko Gospodnetić
a047115eef
remove extra topSuite queueRunner construction parameter
...
The `Suite` constructor function does not expect or use the its only `attrs`
parameter's `queueRunner` attribute, so setting it serves no purpose and
only clutters the code and makes it more difficult to understand.
2015-12-26 21:49:45 +01:00
Gregg Van Hove
0d4c8d13bb
build distribution file for mockDate changes
2015-12-22 15:25:38 -08:00
Gregg Van Hove
17c5e2b10d
Merge branch 'fix-clock-date' of https://github.com/andrewiggins/jasmine into andrewiggins-fix-clock-date
...
Fixes #915
Merges #980
2015-12-22 15:18:58 -08:00
Aaron DEcker
fa71928cad
changed arg cloner to be safe on older browsers
2015-12-22 00:35:36 -05:00
Aaron DEcker
3e91ac0889
add option to shallow clone args in call tracker
2015-12-22 00:27:51 -05:00
Gregg Van Hove
79206ccff5
Rename j$ to jasmineUnderTest for specs
...
- Clarifies what it is for when writing tests
- No longer named the same as the `jasmine` that is injected into live
code
2015-12-03 17:23:32 -08:00
Gregg Van Hove
a95c2cfe3f
Bump version to 2.4.1
2015-12-03 16:06:51 -08:00
Gregg Van Hove
e2e2d1b343
Revert #908
...
- Run `afterEach` in reverse order declared as before
2015-12-03 16:02:32 -08:00
Gregg Van Hove
3b53e469fd
Bump version to 2.4.0
2015-12-02 22:02:03 -08:00
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