warren/jasmine
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
1,647 Commits 1 Branch 120 Tags
b2dee5cb1c97332a6134f2e7b672012d84b8621e
Commit Graph

1647 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stanislav Kupryakhin c302545ba4 Fix jasmine setup in Electron environment 
Fix for issue  #964
 2016-03-21 08:38:27 +06:00
slackersoft 954a6a0091 Merge branch 'feat/improveErrorMessages' of https://github.com/dhoko/jasmine into dhoko-feat/improveErrorMessages 
- Merges #1026 from @dhoko
- Fixes #1025
 2016-03-18 10:59:31 -07:00
slackersoft 11cfaae42a Merge branch 'marneborn-bluebird3.0-warnings' 
- Merges #1062 from @marneborn
- Fixes #992
 2016-03-11 09:13:43 -08:00
Erik Welander 927cc011d6 Added support for ES6 sets to toContain and toEqual. 2016-03-04 02:09:59 -08:00
Mikael Arneborn 6cf2d94f73 The done function now returns null 2016-03-03 08:55:01 -08:00
Mikael Arneborn b578e72c8f Added failing test for done returning null 2016-03-03 08:54:46 -08:00
Gregg Van Hove 1da6c7cf85 Merge branch 'add-editorconfig' of https://github.com/kapke/jasmine into kapke-add-editorconfig 
- Merges #1058
- Fixes #1057
 2016-03-01 17:50:59 -08:00
Gregg Van Hove 87e808282b Always quote the browser version so nothing converts it to a float 2016-03-01 17:34:24 -08:00
dhoko 14067d0785 Improve errors with the domaine and how to use the API 2016-02-29 10:33:45 +01:00
Dominick Reinhold d1a94bcf50 When the HtmlReporter has a 'spec' query param, the spec list only shows matching specs/suites 2016-02-28 22:47:10 -08:00
Andrzej Kopeć bbf3f6825c Improve error message when passing a non-function to callFake 2016-02-28 21:37:28 +01:00
Andrzej Kopeć 9b653b9dcb Add .editorconfig file 2016-02-28 18:33:39 +01:00
Gregg Van Hove b6798cdb06 Html Reporter shows error bar for errors from a global afterAll 
Issue #811
 2016-02-25 16:12:15 -08:00
Gregg Van Hove dbd198f7d0 Allow expectations in a global beforeAll or afterAll 
- Report afterAll failures in jasmineDone
- Issue #811
 2016-02-25 15:01:47 -08:00
Gregg Van Hove 5583b6f954 Top-level specs should compute fullName the same as Suites 
- No longer include "Jasmine__TopLevel__Suite"
 2016-02-25 14:29:35 -08:00
Gregg Van Hove db8e636021 Add combined file for inherited spies 2016-02-25 14:25:40 -08:00
Andrzej Kopeć 90dea9ab38 Now spies preserve original function arity 2016-02-25 21:43:18 +01:00
Gregg Van Hove ebbefafc26 Turn the describe error spec back on and update for new code 2016-02-25 10:04:31 -08:00
Gregg Van Hove b66ffc1277 Merge branch 'spy-inherited-methods' of https://github.com/benchristel/jasmine into benchristel-spy-inherited-methods 
- Merges #1036
- Fixes #737
 2016-02-22 14:11:00 -08:00
Gregg Van Hove 5458f2f18d Array equality treats undefined elements as equal however they got in there 
- Fixes #786
 2016-02-22 11:06:59 -08:00
Gregg Van Hove 602f5bc08a Merge branch 'fallback-report' of https://github.com/mauricioborges/jasmine into mauricioborges-fallback-report 
- Merges #1009
 2016-02-22 10:20:48 -08:00
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
Mauricio Borges Silva 6489b0f400 Add support on Env to provide fallback report 2016-02-15 23:12:05 -02:00
Mauricio Borges Silva 5e3582d8e7 Add support to fallback report providing on ReportDispatcher 2016-02-15 23:12:05 -02: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
Ben Christel d6f1f8dec5 Correctly teardown spies on inherited methods 
- If the spied method is not an own property of the object being spied
  upon, the method is deleted from the object on teardown instead of
  being set to the original implementation.

- #737
 2016-02-01 17:45:47 -08: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