Commit Graph

  • 9a41154e3b Merge branch 'apla-master' Gregg Van Hove 2019-09-23 16:47:33 -07:00
  • fc3eb0fbd8 Handle node.js assert as an error in your specs ivan baktsheev 2019-04-12 18:46:12 +03:00
  • 223924a7a1 Fixed matchersUtil.contains test to fail correctly Steve Gravrock 2019-09-21 11:37:16 -07:00
  • 99799f72b3 Still need some ruby stuff around to release the jasmine-core gem v3.5.0 Gregg Van Hove 2019-09-20 17:15:47 -07:00
  • e8263e38aa bump version to 3.5.0 Gregg Van Hove 2019-09-20 16:57:20 -07:00
  • 53561ae71f Show details of syntax (etc) errors when loading Jasmine's own specs Steve Gravrock 2019-09-11 13:27:59 -07:00
  • 68f25a758d Don't create env instances in beforeEach Steve Gravrock 2019-09-11 13:21:38 -07:00
  • 96ba66ad60 Built distribution Steve Gravrock 2019-09-10 11:23:27 -07:00
  • ba4a8d1d00 Fixed jsdocs Steve Gravrock 2019-09-10 11:23:11 -07:00
  • 65d9e93a88 Removed broken & long-disabled JsApiReporter integration specs Steve Gravrock 2019-09-10 09:38:38 -07:00
  • 2d3ac38df8 toBeRejectedWithError can expect the error to be Error, not just a subtype Steve Gravrock 2019-09-06 14:17:52 -07:00
  • 5a219da848 Added basic integration tests for all built-in matchers Steve Gravrock 2019-09-06 13:44:15 -07:00
  • f056f3b86c Fixed indentation Steve Gravrock 2019-09-06 12:27:43 -07:00
  • aeb0b73008 Merge branch 'dtychshenko-1740-fail-on-no-expectations' Steve Gravrock 2019-09-05 09:48:24 -07:00
  • 7263a38c3f Adds new configuration option to failSpecWithNoExpectations that will report specs without expectations as failures if enabled Dmitriy T 2019-08-22 16:08:43 -04:00
  • e8870db8d3 Merge branch 'fix-missing-asynchronous-stacktrace' of https://github.com/prantlf/jasmine into prantlf-fix-missing-asynchronous-stacktrace Gregg Van Hove 2019-09-04 17:37:33 -07:00
  • 35d15085e3 Show argument diffs in toHaveBeenCalledWith failure messages Steve Gravrock 2019-09-03 17:12:35 -07:00
  • 19292e4ea4 Stop testing against PhantomJS Steve Gravrock 2019-09-03 15:40:53 -07:00
  • ba71989d4b Fixed code formatting Steve Gravrock 2019-09-03 15:39:00 -07:00
  • f8e5ea14bc Fail the CI build if the promise returned from jasmineBrowser.runSpecs is rejected Steve Gravrock 2019-09-03 15:34:56 -07:00
  • 92dfbdcdc9 Depend on acorn to work around broken deduping Steve Gravrock 2019-09-03 15:30:42 -07:00
  • 8ad1dd163b Merge branch 'arrayContaining-actuals-must-be-arrays' of https://github.com/divido/jasmine Steve Gravrock 2019-08-30 13:11:21 -07:00
  • ded8b760aa Merge branch 'UziTech-patch-1' Steve Gravrock 2019-08-30 10:27:21 -07:00
  • 07318fba37 docs change Tony Brix 2019-08-30 12:14:19 -05:00
  • c42358c686 Fixed test failure on IE Steve Gravrock 2019-08-30 09:13:12 -07:00
  • f77ee32c56 Add custom async matchers Tony Brix 2019-07-08 15:13:06 -05:00
  • 0bd636b5d2 Updated arrayContaining to require actual values to be arrays David Diederich 2019-08-30 01:09:53 -04:00
  • 008b80adc5 Merge branch 'enelson/default' of https://github.com/elliot-nelson/jasmine Pivotal 2019-08-29 13:48:58 -07:00
  • 1a63ab4677 Accept configurations with Promise: undefined. Steve Gravrock 2019-08-26 15:45:13 -07:00
  • 3a7fc63879 Pick the error instance to pass to error handlers in QueueRunner Ferdinand Prantl 2019-08-11 09:32:31 +02:00
  • 527619b0aa Restore the original global error hanler to pass all parameters along Ferdinand Prantl 2019-08-11 09:31:43 +02:00
  • 2369c8dba7 fix(env): Throw if nested describe has no children. johnjbarton 2019-08-07 17:44:57 -07:00
  • 0449b35f5a Merge branch 'tobe-tostring' of https://github.com/johnjbarton/jasmine into johnjbarton-tobe-tostring Gregg Van Hove 2019-08-07 12:01:26 -07:00
  • e50a7b6985 Merge branch 'add-map-set-matchers' of https://github.com/eventlistener/jasmine Steve Gravrock 2019-08-03 12:18:35 -07:00
  • b2d9aab2b8 Use the same spec file pattern for both node and browser Steve Gravrock 2019-08-03 12:15:55 -07:00
  • b01d86840a mapContaining and setContaining asymmetric matchers Olga Kozlova 2019-08-03 22:14:17 +03:00
  • 385ad33f60 Merge pull request #1736 from olleolleolle/patch-1 sgravrock 2019-08-03 08:58:01 -07:00
  • 18195a868c Updated async timeout message Steve Gravrock 2019-08-03 08:25:57 -07:00
  • 7c3434723e Use the documented interface to pick the error instance from the global error handler Ferdinand Prantl 2019-07-21 23:46:14 +02:00
  • 4858a62fdc Add a unit test for the global error handling including stacktrace Ferdinand Prantl 2019-07-16 12:00:09 +02:00
  • df4b6e58e2 Pass the error including stacktrace to error handlers and reporters Ferdinand Prantl 2019-07-15 14:43:22 +02:00
  • d68b47b76d Gemspec: Drop EOL'd property rubyforge_project Olle Jonsson 2019-07-14 10:38:36 +02:00
  • c100bb6242 Made output of toHaveBeenCalledWith more readable Steve Gravrock 2019-07-13 10:05:20 -07:00
  • c37e9b9db0 Add saucelabs badge to readme Gregg Van Hove 2019-07-07 19:37:09 -07:00
  • 5e87e1410d update to newer jasmine-browser-runner Gregg Van Hove 2019-07-07 19:20:45 -07:00
  • 0cd5d9339b Use node 10 for browser based builds Gregg Van Hove 2019-07-07 19:01:36 -07:00
  • 6324fda065 PrettyPrinter survives if objects throw in toString johnjbarton 2019-06-27 10:35:59 -07:00
  • 066162d6bc Merge branch 'enelson/spyobjproperty' of https://github.com/elliot-nelson/jasmine into elliot-nelson-enelson/spyobjproperty Gregg Van Hove 2019-06-25 16:25:19 -07:00
  • ab01fa1978 Merge pull request #1721 from elliot-nelson/enelson/gitattributes Gregg Van Hove 2019-06-24 16:16:37 -07:00
  • 65e6df55ee Linting fixes Elliot Nelson 2019-06-20 07:34:31 -04:00
  • 45475f6d1e Allow users to pass property names to createSpyObj Elliot Nelson 2019-06-20 07:33:10 -04:00
  • a536ca19f2 Don't attempt to normalize PNGs Elliot Nelson 2019-06-20 06:46:51 -04:00
  • 9a6262e3cd bump browser runner to new version Gregg Van Hove 2019-06-14 16:42:10 -07:00
  • e7d0d742a8 only turn on sauce_connect for jobs that need it (I think) Gregg Van Hove 2019-06-14 15:43:14 -07:00
  • 031515db23 rejigger travis again to not run sauce jobs for PRs Gregg Van Hove 2019-06-14 15:27:24 -07:00
  • 49fd22ffe6 move everything we can into the env matrix for travis Gregg Van Hove 2019-06-14 15:15:29 -07:00
  • 5c058b5bc4 Don't include node 10 & 12 in matrix, we're explicit later Gregg Van Hove 2019-06-14 15:11:41 -07:00
  • 18dbbca436 Refactor travis matrix to compress a bit more Gregg Van Hove 2019-06-14 15:10:16 -07:00
  • 3e888105f0 Calculate total suite run time inside the env and report in jasmineDone Gregg Van Hove 2019-06-14 14:59:33 -07:00
  • 15f969bee7 Add @since to most JSDoc comments Gregg Van Hove 2019-06-12 16:23:12 -07:00
  • 984018bfdf Make no expectations in HTML Reporter message a warning Gregg Van Hove 2019-06-12 13:31:25 -07:00
  • 0f4e53d0e6 Update ci script to pass linting Gregg Van Hove 2019-06-12 12:15:34 -07:00
  • c73c5a9dbd WIP Gregg Van Hove 2019-06-12 11:42:47 -07:00
  • 243adfd4ce Use jasmine-browser-runner to execute browser tests Gregg Van Hove 2019-06-12 11:33:14 -07:00
  • e07da96354 Apply prettier Elliot Nelson 2019-06-07 23:33:06 -04:00
  • 96786c793f Allow users to set a default spy strategy Elliot Nelson 2019-06-02 09:05:45 -04:00
  • d610d0bdad Use browser-runner to start server in CI Gregg Van Hove 2019-06-06 14:46:19 -07:00
  • 0644731680 Switch to using new jasmine-browser-runner to server files for local testing Gregg Van Hove 2019-03-11 17:27:46 -07:00
  • 8da1fd1ed1 Merge branch 'master' of https://github.com/pixelpax/jasmine into pixelpax-master Gregg Van Hove 2019-05-30 17:47:16 -07:00
  • 8af669677a Cleanup spy promise strategies to be more consistent with Jasmine at large Gregg Van Hove 2019-05-23 17:29:12 -07:00
  • b4cbe9850f add prettier and eslint Gregg Van Hove 2019-05-21 17:44:38 -07:00
  • cf2c5c9acc Merge branch 'enelson/src-cleanup-2' of https://github.com/elliot-nelson/jasmine into elliot-nelson-enelson/src-cleanup-2 Gregg Van Hove 2019-05-21 17:44:48 -07:00
  • 4e10cf84d5 Adds in the source-- whoops! Gabriel Elkind 2019-05-20 23:51:29 -05:00
  • 9f875ce666 Older versions don't support const, use var Gregg Van Hove 2019-05-20 17:56:27 -07:00
  • df6a71e37d Merge branch 'spy-to-string' of https://github.com/johnjbarton/jasmine into johnjbarton-spy-to-string Gregg Van Hove 2019-05-20 17:21:14 -07:00
  • 32a3288c9d Merge branch 'elliot-nelson-enelson/pp' Gregg Van Hove 2019-05-20 17:18:04 -07:00
  • b12981a3e7 build dist for rounding fix Gregg Van Hove 2019-05-20 17:17:55 -07:00
  • cbbdd360f8 Merge branch 'enelson/pp' of https://github.com/elliot-nelson/jasmine into elliot-nelson-enelson/pp Gregg Van Hove 2019-05-20 17:13:41 -07:00
  • 3a89cc92fb Merge branch 'paulvanbrenk-fix-1695' Gregg Van Hove 2019-05-20 17:09:46 -07:00
  • 88c8c905ba Adds width to root level html-reporter class Gabriel Elkind 2019-05-20 15:25:38 -05:00
  • d1adbdc72b fix(PrettyPrint): jasmine.createSpyObj('obj', ['toString']); johnjbarton 2019-05-20 09:12:05 -07:00
  • 8225bb935f Explicitly test pretty printing objects with nested invalid toString Elliot Nelson 2019-05-20 09:09:07 -04:00
  • 9f704b6f3a PrettyPrinter handles objects with invalid toString implementations Elliot Nelson 2019-05-20 09:01:10 -04:00
  • 69a7449e50 Fix toBeCloseTo matcher for Node.js 12 and Chrome 74 Paul van Brenk 2019-05-19 12:46:32 -04:00
  • b1da6e3960 Cleanup: unused vars, dangling commas, negation Elliot Nelson 2019-05-18 08:11:47 -04:00
  • 1e855aa9b8 Cleanup: whitespace Elliot Nelson 2019-05-18 08:10:11 -04:00
  • e04d3d8a62 Fix bad merge for spyOnProperty error message Gregg Van Hove 2019-05-17 17:07:47 -07:00
  • 06814769c6 Merge branch 'enelson/spyregerrors' of https://github.com/elliot-nelson/jasmine into elliot-nelson-enelson/spyregerrors Gregg Van Hove 2019-05-17 16:33:47 -07:00
  • 309e6df8fd Use Object.create to make an object with null prototype Gregg Van Hove 2019-05-17 16:31:15 -07:00
  • ea1bac5b74 Merge branch 'enelson/spyonproperty' of https://github.com/elliot-nelson/jasmine into elliot-nelson-enelson/spyonproperty Gregg Van Hove 2019-05-17 16:20:19 -07:00
  • befb8995e6 spyOnProperty jasmine-style error messages with usage note Elliot Nelson 2019-05-17 12:02:44 -04:00
  • 1e13039478 spyOnProperty respects the allowRespy flag Elliot Nelson 2019-05-17 11:43:22 -04:00
  • 11b0d95a7d Merge branch 'enelson/toBeInstanceOf' of https://github.com/elliot-nelson/jasmine into elliot-nelson-enelson/toBeInstanceOf Gregg Van Hove 2019-05-16 17:31:13 -07:00
  • 95f6ba5fa2 Merge branch 'elliot-nelson-enelson/ci-errors' Gregg Van Hove 2019-05-15 17:54:50 -07:00
  • d331e9cc38 Merge branch 'enelson/ci-errors' of https://github.com/elliot-nelson/jasmine into elliot-nelson-enelson/ci-errors Gregg Van Hove 2019-05-15 17:54:24 -07:00
  • 0129a7d007 Update contributing doc based on some of the newer tooling Gregg Van Hove 2019-05-15 17:34:57 -07:00
  • 0fded24d35 Introduce matchers#toBeInstanceOf Elliot Nelson 2019-05-15 11:51:46 -04:00
  • c88c772ffb Print global errors encountered during CI runs Elliot Nelson 2019-05-15 11:39:45 -04:00
  • 3dde56bbd8 Merge branch 'enelson/spyonall' of https://github.com/elliot-nelson/jasmine into elliot-nelson-enelson/spyonall Gregg Van Hove 2019-05-14 18:00:20 -07:00
  • e377f1caae Merge branch 'elliot-nelson-enelson/ci' Gregg Van Hove 2019-05-14 17:21:28 -07:00