Steve Gravrock
98c2f019c6
Bump version to 4.0.0
2022-01-01 12:43:29 -08:00
Steve Gravrock
507dad6d87
Set -npm and -browser-runner dev dependencies back to main
2022-01-01 12:10:24 -08:00
Steve Gravrock
6da7a32442
Merge branch '4.0'
2022-01-01 12:00:46 -08:00
Steve Gravrock
58d13570ac
Bump version to 3.99.0
2022-01-01 10:47:59 -08:00
Steve Gravrock
005648acd8
Built distribution
2022-01-01 10:46:15 -08:00
Steve Gravrock
ff14c03a40
Test against the latest Node 12
2022-01-01 08:44:28 -08:00
Steve Gravrock
ff848c812a
Merge branch 'main' into 4.0
2021-12-31 15:07:03 -08:00
Steve Gravrock
d963be5eec
Log a deprecation warning on reentrant calls to Clock#tick
...
See #1929
2021-12-31 11:38:01 -08:00
Steve Gravrock
8444faab72
Use the clock from jasmineUnderTest in specs
2021-12-31 10:00:14 -08:00
Steve Gravrock
883f400074
Merge branch '4.0' of https://github.com/thw0rted/jasmine into 4.0
...
* Fixes handling of reentrant calls to `jasmine.clock().tick()`
* Merges #1948 from @thw0rted
* Fixes #1929
2021-12-31 09:50:09 -08:00
Steve Gravrock
3c16caa413
Link to the CONTRIBUTING guide from the PR template
2021-12-31 09:47:46 -08:00
Steve Gravrock
5d0be2e6cf
Updated the contributing guide for 4.0
...
* Moved "Before Submitting a Pull Request" to the top
* Removed discussion of the standard Github PR workflow
(Contributors who don't know how to create PRs on Github at all can find
that information elsewhere. For the rest, it's just noise.)
* Misc copy edits
2021-12-31 09:43:46 -08:00
James Bromwell
c56631175f
Fix time-travel in delayed function scheduler
2021-12-29 17:50:48 +01:00
Steve Gravrock
cef738966c
Updated dev dependencies
2021-12-21 17:51:28 -08:00
Steve Gravrock
5fd0e49ccf
Removed unused ejs dev dependency
2021-12-21 17:00:10 -08:00
Steve Gravrock
c431590d65
Fixed reporting of suites that are skipped due to a beforeAll failure
2021-12-20 13:39:24 -08:00
Steve Gravrock
656e6614da
Built distribution
2021-12-15 20:36:44 -08:00
Steve Gravrock
24408a16ed
Removed initialization of unused Promise config property
2021-12-15 20:34:00 -08:00
Steve Gravrock
ca90c76d12
Merge branch '3.99' into 4.0
2021-12-14 08:27:05 -08:00
Steve Gravrock
57c294b307
Added a migration guide link to multiple done call deprecations
2021-12-14 08:16:06 -08:00
Steve Gravrock
e73eb18753
Test against jasmine-browser-runner 1.0.0-dev
2021-12-13 21:41:09 -08:00
Steve Gravrock
0411b0567d
Added a mention of 4.0 migration to the README
2021-12-11 16:13:51 -08:00
Steve Gravrock
30b93ccdbb
Updated jsdocs for Env#execute
2021-12-11 15:53:25 -08:00
Steve Gravrock
067b91b3ef
Removed IE/PhantomJS support code
2021-12-11 14:57:41 -08:00
Steve Gravrock
0b1385c3d3
Report start and end events for specs/suites that are skipped due to a beforeAll error
...
This is noisier, but it maintains compatibility with reporters that assume
(quite reasonably) that all specs and suites are either filtered out or
reported.
2021-12-11 12:34:23 -08:00
Steve Gravrock
f1cf6ee419
Resolve the execute() promise to the entire JasmineDoneInfo
...
This matches jasmine-npm.
2021-12-09 18:18:36 -08:00
Steve Gravrock
b37d989f13
Removed past-EOL Firefox versions
2021-12-07 18:16:00 -08:00
Steve Gravrock
89151d6e64
Dropped Safari 13 from build matrix
2021-12-07 17:04:19 -08:00
Steve Gravrock
75e3e14861
Merge remote-tracking branch 'upstream/safari-15' into 4.0
2021-12-07 17:03:40 -08:00
Steve Gravrock
ce7460d8d4
Fixed stack trace filtering on Safari 15
2021-12-07 16:50:07 -08:00
Steve Gravrock
b8dabf96ff
HTML: Include top suite failures in the reported failure count
2021-12-03 08:18:18 -08:00
Steve Gravrock
40fac8b6a2
Renamed the trace feature to debugLog[s]
...
"trace" was ambiguous and could easily be understood to have something
to do with stack traces.
2021-12-02 14:46:56 -08:00
Steve Gravrock
5eb42d67a7
Added a note about async testing style to contributing guide
2021-12-02 12:40:14 -08:00
Steve Gravrock
d739c23401
Resolve the promise returned by Env#execute to the overall status
2021-12-02 12:40:14 -08:00
Steve Gravrock
42e6c45efa
Allow use without creating globals
...
* Fixes #1235
2021-11-29 20:37:07 -08:00
Steve Gravrock
5942654856
Merge branch '3.99' into 4.0
2021-11-26 13:27:57 -08:00
Steve Gravrock
f3b26a0688
Merge branch 'main' into 3.99
2021-11-26 13:25:14 -08:00
Steve Gravrock
8804ddb8cf
Updated boot file lists for the Ruby gem and Python egg
...
This prevents consumers that rely on those lists (especially the Jasmine
gem and egg) from getting a deprecation warning about boot.js.
2021-11-24 15:38:40 -08:00
Steve Gravrock
439be97c34
Rephrased note about verboseDeprecations
2021-11-24 11:45:32 -08:00
Steve Gravrock
871ba99a30
Allow custom spy strategies to be inherited like other runnable resources
2021-11-17 12:50:16 -08:00
Steve Gravrock
7a685b16f6
Removed duplicate message from errors (incl. matcher failures) on V8
2021-11-16 12:52:07 -08:00
Steve Gravrock
2a049015b0
Use custom equality testers in Spy#withArgs
...
Fixes #1836 .
2021-11-15 18:55:09 -08:00
Steve Gravrock
c48fb0b0e7
Added Firefox 91 (current ESR) to CI matrix
2021-11-14 14:18:06 -08:00
Steve Gravrock
4c47bf6c0b
Merge branch '3.10.1' into main
2021-10-22 16:34:57 -07:00
Steve Gravrock
e86a7f00a6
Bump version to 3.10.1
2021-10-22 16:15:54 -07:00
Jan Molak
504ef27899
Fixed result.pendingReason for specs marked with xit. Closes #1939
2021-10-22 14:12:28 -07:00
Steve Gravrock
2a39339755
Merge branch 'fix/pending-reason' of https://github.com/jan-molak/jasmine into main
...
* Fixes missing pendingReason in pending spec results
* Fixes #1939
* Merges #1940 from @jan-molak
2021-10-22 14:09:48 -07:00
Jan Molak
2c440b8e44
Fixed result.pendingReason for specs marked with xit. Closes #1939
2021-10-22 17:58:31 +01:00
Steve Gravrock
8e74529631
Merge branch '3.99' into 4.0
2021-10-15 10:37:51 -07:00
Steve Gravrock
b13329114c
Set version to 3.99.0-dev
2021-10-15 10:33:21 -07:00
Steve Gravrock
ab34f272da
Merge branch 'main' into 3.99
2021-10-15 10:29:50 -07:00
Steve Gravrock
1af0e62ef7
Revert "Revert "Dogfood the new jasmine-npm completion interface""
...
This reverts commit 4c043717a9 .
2021-10-14 07:07:10 -07:00
Steve Gravrock
572452a15a
Added supported environments to 3.10.0 release notes
2021-10-13 16:47:48 -07:00
Steve Gravrock
896412367a
Bump version to 3.10.0
2021-10-13 15:46:21 -07:00
Steve Gravrock
503a7409f0
Merge branch 'issue-1854-asyncerror' of https://github.com/AndreWillomitzer/jasmine into main
...
* Improves error message when an async expectation occurs after the spec
finishes
* Merges #1937 from @AndreWillomitzer
* Fixes #1854
2021-10-12 17:15:53 -07:00
Steve Gravrock
c1db8f2f82
Clarified deprecation message for this in describes
2021-10-12 15:40:13 -07:00
Andre Willomitzer
bb9175cb66
added additional error msg for delayedExpectation
...
added matching error msgs in jasmine objects
Ran prettier.
removed indenting, formatted column length < 80
2021-10-12 13:17:24 -04:00
Steve Gravrock
41f5c53959
Consistently identify clenaup fns by a type tag, not position
...
This was already done for everything except spec cleanup fns, since the
various skip policies need to know the difference between afterEach and
afterAll.
2021-10-11 18:05:57 -07:00
Steve Gravrock
25c3f06839
Run afterAll fns after failure even if stopOnSpecFailure is true
...
[#160905297 ]
2021-10-08 14:19:56 -07:00
Steve Gravrock
976928c7ae
Set version to 4.0.0-pre.0
2021-10-08 08:48:22 -07:00
Steve Gravrock
36a4ddf433
Revert "Removed jsdoc entry for SpecResult#trace"
...
This reverts commit 4482355885 .
2021-10-07 10:56:52 -07:00
Steve Gravrock
53b1cd37b6
Merge branch '3.99' into 4.0
2021-10-07 10:56:41 -07:00
Steve Gravrock
8cadfbd829
Fixed deprecation warning in spec
2021-10-07 10:51:06 -07:00
Steve Gravrock
86aeb5c88a
Merge branch 'main' into 3.99
2021-10-07 10:38:35 -07:00
Steve Gravrock
469b557828
Merge branch 'fix/ie' of https://github.com/nicojs/jasmine into main
...
* Merges #1936 from @nicojs
2021-10-07 10:17:16 -07:00
Nico Jansen
503715c275
test(ie): refactor promises to callbacks
2021-10-07 10:23:52 +02:00
Steve Gravrock
d4c15b8df4
No longer test Node <12.17
2021-10-06 17:58:28 -07:00
Steve Gravrock
6f0c51260f
Depend on the 4.0 branch of -npm
2021-10-06 17:54:54 -07:00
Steve Gravrock
4482355885
Removed jsdoc entry for SpecResult#trace
...
Deferred to 4.0.
2021-10-06 11:31:29 -07:00
Steve Gravrock
6542364381
Merge branch 'feat/support-multiple-runs' of https://github.com/nicojs/jasmine into main
...
* Merges #1934 from @nicojs
* Fixes #1925
2021-10-06 11:20:34 -07:00
Nico Jansen
1fc911e0fa
Support running jasmine multiple times
...
Add support for running jasmine multiple times.
```js
const Jasmine = require('jasmine');
async function main() {
const jasmine = new Jasmine({ projectBaseDir: process.cwd() });
let specId = 'spec0';
jasmine.loadConfigFile('./spec/support/jasmine.json');
jasmine.env.configure({
specFilter(sp) {
return sp.id === specId;
},
autoCleanClosures: false
});
jasmine.exit = () => {};
await jasmine.execute();
specId = 'spec2';
await jasmine.execute();
}
main().catch((err) => {
console.error(err);
process.exitCode = 1;
});
```
With `jasmine.env.configure({ autoCleanClosures: false })` you disable Jasmine's feature to automatically clean closures (functions) during the test run. This is a requirement to be able to rerun.
When `execute` is called more than once, the `topSuite.reset` is called, which will reset the state for the next run as well as reset any child suites.
Add a function `exclude` to the `Suite` and `Spec` clases. This functions similar to `pend`, but will allow the "pending" state to persist over multiple runs. This is useful when `xit` is used.
Revert changes to jasmine.js
fix: make sure to call hooks during second run
Remove jsdoc from private apis
Fix elint issue
Add new line
2021-10-06 20:12:45 +02:00
Steve Gravrock
15710937b8
Added a test that verifies skip to cleanup fns after pending()
...
Because pending() is implemented via the standard exception handling
path, we effectively got this feature for free as a result of the changes
for #1533 , particularly 457a2727 .
* [#178598493 ]
* Fixes #1579
2021-10-06 11:07:53 -07:00
Steve Gravrock
1a9d16715d
Clarify which behaviors are specific to different stopSpecOnExpectationFailure values
...
* #1533
2021-10-06 08:55:01 -07:00
Steve Gravrock
b67a3043c7
Skip afterEach fns in nested suites when a beforeEach fn errors
...
This matches the behavior of beforeAll errors.
* #1533
2021-10-06 08:55:01 -07:00
Steve Gravrock
5f1ef5ac2b
Skip everything except afterAll fns when a beforeAll fn errors
...
* Fixes #1533
2021-10-06 08:55:01 -07:00
Steve Gravrock
5eaeeb0b6c
Moved fn skipping policy out of QueueRunner
...
This should allow us to more easily support complex skipping strategies
like skipping nested cleanup fns when the corresponding befores were
skipped, or skipping specs and suites when a beforeAll fails.
* #1533
2021-10-06 08:55:01 -07:00
Steve Gravrock
457a2727ba
Skip to afterEach fns when a beforeEach fn errors
...
* #1533
2021-10-06 08:55:01 -07:00
Steve Gravrock
a1f14efac6
Improved specs for stopSpecOnExpectationFailure
...
* #1533
2021-10-06 08:55:01 -07:00
Steve Gravrock
b2067d9ce0
Fixed references to Env#trace in jsdocs
2021-10-02 09:58:47 -07:00
Steve Gravrock
47081258cd
Revert "Revert "Added the ability to associate trace information with failing specs""
...
This reverts commit fdad8849df .
2021-10-02 09:56:25 -07:00
Steve Gravrock
9c03d4d3e9
Merge branch '3.99' into 4.0
2021-10-02 09:52:43 -07:00
Steve Gravrock
7f0087b805
Merge branch 'main' into 3.99
2021-10-02 09:47:30 -07:00
Steve Gravrock
fdad8849df
Revert "Added the ability to associate trace information with failing specs"
...
Pushing this back to 4.0 in hopes of increasing the chance that third
party reporters will notice it and add support.
This reverts commit 7a289f1de7 .
2021-10-02 09:45:15 -07:00
Steve Gravrock
7a289f1de7
Added the ability to associate trace information with failing specs
...
This is meant to aid in debugging failures, particularly intermittent
failures, in cases where interactive debugging or console.log aren't
suitable.
2021-09-25 16:19:28 -07:00
Steve Gravrock
ef981bb794
Run the browser-flakes build on the debugging branch
2021-09-25 15:50:34 -07:00
Steve Gravrock
c3fb3e985a
Reject timeout values that are too large for setTimeout
...
See #1930
2021-09-25 15:43:31 -07:00
Steve Gravrock
7fc3408051
Expanded jsdocs for jasmine.DEFAULT_TIMEOUT_INTERVAL
2021-09-25 13:29:44 -07:00
Steve Gravrock
af1b43eeff
Merge branch 'patch-1' of https://github.com/trusktr/jasmine into main
...
* Merges #1931 from @trusktr
* Adds discussion of max timeout value to jsdocs
2021-09-25 13:28:34 -07:00
Steve Gravrock
4c043717a9
Revert "Dogfood the new jasmine-npm completion interface"
...
This works, but until the -npm 3.10.0 is out, it creates a chicken and egg
problem where each of core 3.10.0 and -npm 3.10.0 needs to be released
after the other.
This reverts commit 1c9382c990 .
2021-09-25 12:11:20 -07:00
Steve Gravrock
35064cf60e
Merge branch '3.99' into 4.0
2021-09-24 14:31:02 -07:00
Steve Gravrock
fb4c16b23e
Merge branch 'main' into 3.99
2021-09-24 14:27:15 -07:00
Steve Gravrock
3b28ee7c29
Fixed extra deprecation when passing custom equality testers to MatchersUtil#contains
2021-09-24 14:25:54 -07:00
Steve Gravrock
40be00310d
Don't immediately move to the next queueable fn on async error
...
This allows assertion failures and other errors that occcur after the async
error to be routed to the correct spec/suite.
Previously, Jasmine treated global errors and unhandled promise rejections
just like exceptions thrown from a synchronous spec: it recorded the error
as a spec failure and moved on. Now, global errors and uhandled rejections
are recorded as failures but the current queueable fn will continue until
it either signals completion or times out. Global errors and unhandled
rejections are different from synchronous exceptions: it's common for the
queueable fn that caused them to continue executing. Immediately moving on
often meant that the queueable fn would produce expectation failures or
other errors when a different spec or suite was running, thus causing
those failures to be routed to the wrong place.
2021-09-24 11:22:04 -07:00
Steve Gravrock
3a77ae3dfe
Throw if the argument to jasmine.clock().mockDate() is not a Date
2021-09-23 16:10:59 -07:00
Steve Gravrock
1332f01ca4
Merge branch '3.99' into 4.0
2021-09-23 16:08:44 -07:00
Steve Gravrock
64d58ed1f0
Deprecate non-Date arguments to jasmine.clock().mockDate()
2021-09-23 16:04:39 -07:00
Steve Gravrock
497a7fc3e5
Merge branch 'main' into 3.99
2021-09-23 15:49:47 -07:00
Steve Gravrock
1f318c3c93
Added missing @since annotations
2021-09-23 13:38:52 -07:00
Steve Gravrock
be29aa95eb
Improved jsdocs for asymmetric equality testers
2021-09-23 11:59:20 -07:00
Steve Gravrock
e3c9a59c6c
Added a stringContaining asymmetric equality tester
...
* Fixes #1923 .
2021-09-22 11:28:24 -07:00
Joe Pea
b312ed4940
update base.js docs, mention setting DEFAULT_TIMEOUT_INTERVAL to a high number while debugging
...
This info is useful because if someone does not set the number to a high enough value while stepping through test code, before or after hooks may be triggered mid-test while the user is debugging which will be confusing.
2021-09-21 21:39:21 -07:00
Steve Gravrock
8d302d8dca
Merge branch '3.99' into 4.0
2021-09-20 15:57:37 -07:00
Steve Gravrock
00f6708e1f
Removed unused submodule
2021-09-18 09:43:02 -07:00
Steve Gravrock
760f2d9003
Removed additional Ruby support files
2021-09-18 09:40:30 -07:00
Steve Gravrock
6e10f22403
Don't display late errors as AfterAll errors in the HTML reporter
2021-09-11 08:57:50 -07:00
Steve Gravrock
d092a59bd1
Treat multiple calls to done callbacks as errors
2021-09-10 18:07:35 -07:00
Steve Gravrock
af5984d5d6
Fixed flake list
2021-09-10 17:53:59 -07:00
Steve Gravrock
15f7013f85
Merge branch '3.99' into 4.0
2021-09-08 21:04:10 -07:00
Steve Gravrock
be23836c9d
Deprecate multiple calls to done callbacks
2021-09-08 20:58:25 -07:00
Steve Gravrock
7944250290
Merge branch 'main' into 3.99
2021-09-06 17:39:28 -07:00
Steve Gravrock
3a47a3bd04
Fixed flaky spec
2021-09-06 15:35:37 -07:00
Steve Gravrock
1c9382c990
Dogfood the new jasmine-npm completion interface
2021-09-04 13:39:17 -07:00
Steve Gravrock
394be99832
Fixed sass deprecation warnings
...
See <https://sass-lang.com/documentation/breaking-changes/slash-div >.
[#179260511 ]
2021-09-03 15:51:51 -07:00
Steve Gravrock
bbcb5ff42f
Fixed linter & formatter issues in boot files
2021-09-03 15:46:23 -07:00
Steve Gravrock
6603ed7ddc
Don't distribute boot src files
...
[#179017951 ]
2021-09-03 15:42:06 -07:00
Steve Gravrock
d61800c5c8
Removed support for custom promise libraries
...
All supported platforms now provide promises, so there's no longer a need
for Jasmine to be able to create them via a user-provided library. Jasmine
can still consume non-native promises but will always use the built-in
Promise object to create promises.
[#179078103 ]
2021-08-30 19:07:26 -07:00
Steve Gravrock
37b9f8e420
Removed Ruby support
...
[#179247162 ]
2021-08-30 18:53:13 -07:00
Steve Gravrock
a63b0b0368
Merge branch '3.99' into 4.0
2021-08-30 18:44:32 -07:00
Steve Gravrock
de9815f436
Merge branch 'main' into 3.99
2021-08-30 18:41:02 -07:00
Steve Gravrock
62a667a8e3
Added a deprecation notice to the gem's description
...
[#179330717 ]
2021-08-30 18:37:31 -07:00
Steve Gravrock
d277827d5e
Fixed typo in 3.9.0 release notes
2021-08-21 19:09:01 -07:00
Steve Gravrock
644c175338
Print a deprecation message when the jasmine-core gem is loaded
...
[#179247158 ]
[#179247160 ]
2021-08-21 18:35:38 -07:00
Steve Gravrock
a6d7eb2a06
Bump version to 3.9.0
2021-08-21 12:00:23 -07:00
Steve Gravrock
2fd9d7b13f
Merge branch 'main' into 3.99
2021-08-17 17:08:34 -07:00
Steve Gravrock
dd8a65cb60
Better reporting of unhandled promise rejections with truthy but non-Error reasons on Node
...
[#179227413 ]
2021-08-14 14:03:03 -07:00
Steve Gravrock
e72d161fab
Return a promise from Env#execute in environments that support promises
...
[#178373231 ]
2021-08-07 13:05:55 -07:00
Steve Gravrock
4e96514634
Deprecated the Promise config setting
...
4.0 will only support environments that have native promises, so there will
no longer be a need for a user-supplied promise library
2021-08-07 12:04:14 -07:00
Steve Gravrock
d8862aa583
Removed the failFast and oneFailurePerSpec config properties
2021-07-31 09:28:14 -07:00
Steve Gravrock
2480a0a93a
Merge branch '3.99' into 4.0
2021-07-31 09:15:12 -07:00
Steve Gravrock
9c9836c5b3
Don't use deprecated config prooperties in boot*.js
2021-07-31 09:09:46 -07:00
Steve Gravrock
20b914c554
Deprecated the failFast and oneFailurePerSpec config properties
2021-07-31 08:42:01 -07:00
Steve Gravrock
058e77b824
Merge branch 'main' into 3.99
2021-07-31 08:15:29 -07:00
Steve Gravrock
dcaac62a6c
Updated deprecaton messages for Env#throwOnExpectationFailure() and Env#stopOnSpecFailure()
2021-07-31 08:02:39 -07:00
Steve Gravrock
b696bec9e3
Renamed failFast and oneFailurePerSpec config props to stopOnSpecFailure and stopSpecOnExpectationFailure
...
The new names are more self-explanatory and consistent with jasmine-npm. The
old names are deprecated but still work.
[#178682783 ]
2021-07-31 07:51:50 -07:00
Steve Gravrock
13dfcacbb0
Remove access to non-public properties of suites and specs returned by describe, it, etc.
...
[#179064612 ]
2021-07-30 17:36:50 -07:00
Steve Gravrock
6d002d22af
Merge branch '3.99' into 4.0
2021-07-29 21:46:48 -07:00
Steve Gravrock
799d9897fd
Deprecated access to non-public members in specs and suites returned from it(), describe(), etc.
2021-07-29 21:28:47 -07:00
Steve Gravrock
2a2a671b65
Don't deprecate access to Suite#id and Spec#id
2021-07-29 20:15:04 -07:00
Steve Gravrock
a0b4f3748d
Merge branch 'main' into 3.99
2021-07-29 20:09:25 -07:00
Steve Gravrock
43073b3bc5
Added API docs for Suite#id and Spec#id
...
These properties are the only way to obtain runnable IDs, without which
you can't call the form of Env#execute that takes an array of IDs.
2021-07-29 19:32:15 -07:00
Steve Gravrock
09d2ce9bc9
Removed more code that supported browsers we no longer run on
2021-07-27 17:53:09 -07:00
Steve Gravrock
e9bddc7a06
Removed obsolete timing function hacks from boot1.js
2021-07-26 19:04:43 -07:00
Steve Gravrock
310e4d5e6c
Removed legacy boot.js file
2021-07-26 18:29:54 -07:00
Steve Gravrock
0424d4ae99
Removed Python support
2021-07-26 18:28:38 -07:00
Steve Gravrock
0720c88252
Merge branch '3.99' into 4.0
2021-07-26 18:20:24 -07:00
Steve Gravrock
f26b005807
Deprecated the legacy boot.js file
2021-07-26 18:20:07 -07:00
Steve Gravrock
1206952ca6
Merge branch 'main' into 3.99
2021-07-26 18:19:11 -07:00
Steve Gravrock
286524959b
Split boot.js in two to allow the env to be configured in between
...
This is mainly intended to support jasmine-browser-runner, which will load
a script that configures the env in between the two boot files (boot0.js and
boot1.js). The single-file boot.js is retained for now but will be removed
in a future release.
2021-07-26 18:05:36 -07:00
Steve Gravrock
c73df57720
MatchersUtil#contains uses deep equality rather than === for set members
...
[#169001712 ]
2021-07-24 14:23:05 -07:00
Steve Gravrock
0170005015
Treat any argument to the done callback as an error
...
This reduces the risk of incorrectly passing a spec due to not correctly
detecting that an argument is an `Error` instance. Detecting Error instances
in a way that's reliable and portable across different browsers, TrustedTypes,
and frames is difficult.
[Finishes #178267587 ]
2021-07-24 09:30:39 -07:00
Steve Gravrock
6f04044417
Merge branch '3.99' into 4.0
2021-07-24 09:25:19 -07:00
Steve Gravrock
70d49e5b57
Deprecate non-Error arguments passed to done()
...
[Finishes #178267600 ]
2021-07-24 09:18:24 -07:00
Steve Gravrock
ed9363f477
Removed bower.json
...
Bower itself has been deprecated for four years, so we should drop support
for it in 4.0.
[Finishes #178512921 ]
2021-07-24 08:23:09 -07:00
Steve Gravrock
fe0a83ba87
Removed support for Internet Explorer
2021-07-23 21:46:15 -07:00
Steve Gravrock
623eecdcec
Removed json2.js
...
Environments that don't provide a JSON parser are ancient history.
2021-07-22 21:37:57 -07:00
Steve Gravrock
2c32dd5703
Run browser-flakes build before regular cron build
2021-07-20 17:57:54 -07:00
Steve Gravrock
a27280e9e7
Merge branch '3.99' into 4.0
2021-07-20 17:55:18 -07:00
Steve Gravrock
10601f5af6
Merge branch 'main' into 3.99
2021-07-20 17:47:17 -07:00
Steve Gravrock
c10ab4e704
Updated deprecation links
2021-07-20 16:50:31 -07:00
Steve Gravrock
c1d1d69be2
Fixed test failures in Chrome and Edge
2021-07-19 12:08:40 -07:00
Steve Gravrock
3513249d73
Built distribution
2021-07-19 12:08:18 -07:00
Steve Gravrock
21bfbbb721
Merge branch 'iserror-tt' of https://github.com/bjarkler/jasmine into main
...
* Fixes Trusted Types error in Chromium-based browsers
* Merges #1921 from @bjarkler
* Fixes #1910
2021-07-19 12:06:12 -07:00
Steve Gravrock
88b90ec258
Backfilled unit tests for j$.isError_
2021-07-19 10:31:53 -07:00
Steve Gravrock
e399953174
Removed obsolete timing function hacks from boot.js
2021-07-17 17:49:53 -07:00
Steve Gravrock
4edac7d3d1
Dropped Safari <13 from test matrix
2021-07-10 09:21:41 -07:00
Steve Gravrock
9b3d4a2bf2
Merge branch '3.99' into 4.0
2021-07-10 09:13:28 -07:00
Steve Gravrock
17826cd044
Fixed deprecations in matchersUtilSpec
2021-07-10 09:11:10 -07:00
Steve Gravrock
6cb9507f62
Merge branch 'main' into 3.99
2021-07-10 08:58:14 -07:00
Steve Gravrock
50c88e7774
Mark Env#hideDisabled deprecated in jsdocs
2021-07-08 18:53:21 -07:00
Steve Gravrock
3e64ce3310
Removed property tests for MatchersUtil#equals
...
These might be useful for a function with a more restricted domain. But for
equals, which accepts two of literally anything, the short run was too short
to catch any problems and the long run tended to exceed the CircleCi timeout.
2021-07-03 08:37:15 -07:00
Steve Gravrock
00586e50e0
Bump version to 3.8.0
2021-07-01 17:06:14 -07:00
Bjarki
dc80a282ba
Make j$.isError_ compatible with Trusted Types
...
The isError_ check uses a heuristic that calls the Function constructor
to determine if the given value is an Error object. This results in a
runtime violation in test suites that enforce Trusted Types.
Since Trusted Types are only supported in modern browsers (currently,
Chromium-based browsers), we can use a more straightforward heuristic in
environments where Trusted Types are supported.
Fixes #1910 . See that thread for more details.
2021-07-01 20:21:44 +00:00
Steve Gravrock
27c650ec08
Updated package description
2021-06-30 17:10:51 -07:00
Steve Gravrock
56daa6f461
Merge branch 'select-spec' of https://github.com/jlpstolwijk/jasmine into main
...
* Merges #1920 from @jlpstolwijk
* Fixes spec filtering in Karma
* Fixes #1906
2021-06-29 17:10:06 -07:00
Joris Stolwijk
e4c7d8af45
new attempt for fixing #1906 : add window.location.pathname to hrefs + comments + fixed tests
2021-06-29 14:03:25 +02:00
Steve Gravrock
ee88ecc614
Revert "add url pathName in toQueryString function - fixes ( https://github.com/jasmine/jasmine/issues/1906 ) + comment + test"
...
Reverted because it breaks the option checkboxes in the HTML reporter, both
in the standalone distribution and in jasmine-browser-runner.
Reopens #1906 .
This reverts commit 1e4f0d1545 .
2021-06-28 12:42:05 -07:00
Steve Gravrock
ec038273f1
Updated contributing guide
...
* Removed outdated steps
* Replaced list of environments with a pointer to the README
* Misc copy edits
2021-06-26 11:33:03 -07:00
Steve Gravrock
c5bdd79a1e
Added TS typings and jasmine-browser-runner to issue template
2021-06-26 11:21:19 -07:00
Steve Gravrock
dbc1a0aa56
Added expectAsync(...).already
...
* Causes async matchers to immediately fail if the promise is pending
* Fixes #1845
2021-06-23 20:13:01 -07:00
Steve Gravrock
5862b22aef
Include rejection details in failure messages for toBeResolved and toBeResolvedWith
...
[#178559119 ]
2021-06-21 16:43:51 -07:00
Steve Gravrock
163f93d6ff
Removed constructors from jsdocs of classes that aren't user-constructable
2021-06-21 14:19:31 -07:00
Steve Gravrock
1893bf6c16
Added jsdocs for asymmetric equality testers
2021-06-21 14:09:14 -07:00
Steve Gravrock
095745ab12
Removed gulp-jasmine-browser mention from README
2021-06-21 13:31:28 -07:00
Steve Gravrock
68db3f6fcf
Merge branch 'select-spec' of https://github.com/jlpstolwijk/jasmine into main
...
* Merges #1907 from @jlpstolwijk
* Fixes #1906
* Fixes spec filtering in karma-jasmine-html-reporter
2021-06-14 17:59:29 -07:00
Joris Stolwijk
1e4f0d1545
add url pathName in toQueryString function - fixes ( https://github.com/jasmine/jasmine/issues/1906 ) + comment + test
2021-06-14 15:05:12 +02:00
Steve Gravrock
c546d2cb6d
Merge branch 'patch-1' of https://github.com/eltociear/jasmine into main
...
* Fixes typo in spec name
* Merges #1918 from @eltociear
2021-06-13 09:57:23 -07:00
Steve Gravrock
6e097528f5
Include only specified files in the NPM package
2021-06-13 09:52:01 -07:00
Ikko Ashimine
4e1f36cbb0
Fix typo in SpySpec.js
...
ommitted -> omitted
2021-06-12 10:00:36 +09:00
Steve Gravrock
0aee81cfb9
Remvoed checks for typed array support in the test suite
...
All supported browsers have all typed arrays except for Uint8ClampedArray,
BigInt64Array, and BigUint64Array.
2021-06-05 13:31:26 -07:00
Steve Gravrock
1e50b49092
Fixed test failures on IE 10
2021-06-05 13:13:46 -07:00
Steve Gravrock
6aecf16cde
Test coverage for MatchersUtil#equals with typed arrays
2021-06-05 12:03:11 -07:00
Steve Gravrock
f2de1be96a
Fixed "stop spec on expectation failure" checkbox in standalone
...
Fixes [#178248968 ].
2021-06-01 08:49:34 -07:00
Steve Gravrock
a0f6b77c3e
Remove access to non-public Suite and Spec members via Env#topSuite
2021-05-29 18:57:56 -07:00
Steve Gravrock
3f3fb38cf1
Merge branch '3.99' into 4.0
2021-05-29 18:42:31 -07:00
Steve Gravrock
00c1e3d608
Deprecate access to non-public Suite and Spec members via Env#topSuite
...
The deprecation warning relies on Proxy, and won't work in environments
that don't have it. Among Jasmine's supported environments, that's Safari 9,
Safari 8, and all versions of IE.
2021-05-29 15:45:10 -07:00
Steve Gravrock
6a2a30d540
Improved & unified deprecation handling
...
* De-duplication now happens in core, not in reporters. This ensures that
the console doesn't get flooded.
* Stack traces are opt-out, not opt-in.
* The current runnable is not reported or logged for certain deprecations
where it's irrelevant.
* HtmlReporter shows stack traces in expandable widgets.
* Env#deprecated and Env#deprecatedOnceWithStack are merged.
2021-05-29 15:39:28 -07:00
Steve Gravrock
5f4a1c4276
Merge branch 'issue/1897' of https://github.com/Dari-K/jasmine into main
...
* Adds option for spyOnAllFunctions to include non-enumerable props
* Merges #1909 from @Dari-k
* Fixes #1897
2021-05-26 17:44:54 -07:00
Darius Keeley
a4ef3687ee
Add optional param to spyOnAllFunctions to include non-enumerable properties
2021-05-25 11:37:24 +01:00
Steve Gravrock
e4e232864d
Don't expose Suite objects as this of describe functions
...
This was a holdover from 1.x that should have been removed in 2.0,
but was missed. Suite is meant to be private, and almost none of
its methods can be safely called by user code.
2021-05-22 09:15:22 -07:00
Steve Gravrock
5acddcda4a
Merge branch '3.99' into 4.0
2021-05-22 09:09:03 -07:00
Steve Gravrock
61fb353197
Deprecate access to Suite objects via this in describes
...
Jasmine 1.x exposed Suite objects to user code as the `this` in describe
functions. That should have been removed in 2.0 but it was missed. It
will be removed in 4.0. This change adds a deprecation warning if anything
on a describe's `this` is accessed.
The deprecation warning relies on Proxy, and won't work in environments
that don't have it. Among Jasmine's supported environments, that's Safari 9,
Safari 8, and all versions of IE. In those browsers, a describe's `this`
will still be a Suite for now, but there will be no deprecation warnings.
2021-05-22 09:07:31 -07:00
Steve Gravrock
9065b4c3b7
Added a jsdoc cross-reference from Configuration to its usage
2021-05-21 17:13:07 -07:00
Steve Gravrock
752441a66f
Merge branch '3.99' into 4.0
2021-05-18 17:12:29 -07:00
Steve Gravrock
3e2872a1df
Merge branch 'main' into 3.99
2021-05-18 17:07:34 -07:00
Steve Gravrock
140225e7c3
Isolate specs that are flaky in browsers
...
* Don't run them in browsers in the regular CI build
* Run them in browsers in a special nightly build
* Run them in Node in the regular CI build
* Run them when developers manually run the suite
This should allow the regular CI build to give us a more useful signal,
while keeping us from losing sight of the flaky specs.
2021-05-15 07:44:25 -07:00
Steve Gravrock
8b38389d56
Test against Node 16
...
* Replaced node-sass dependency that isn't compatible with Node 16
* Added Node 16 to CI matrix
* Fixes #1894
2021-05-13 17:18:57 -07:00
Steve Gravrock
b7c2a2f6fb
Removed unused dev dependencies
2021-05-13 12:52:44 -07:00
Steve Gravrock
c5d4a40219
Deprecated Python
2021-05-08 12:06:49 -07:00
Steve Gravrock
c7c8b6b93e
Added Chrome back to CI browser list
2021-05-04 17:24:06 -07:00
Steve Gravrock
8a42437059
Added a note about testing on Windows to the releasing instructions
2021-05-04 09:28:35 -07:00
Steve Gravrock
cacc6f4278
Skip the middle Safari versions to speed up CI
2021-04-24 15:07:23 -07:00
Steve Gravrock
d815e99456
Added jsdocs for Spy.callData.returnValue
2021-04-24 14:57:33 -07:00
Steve Gravrock
5e3f937221
Added a note about correct usage of async matchers
2021-04-24 12:43:25 -07:00
Steve Gravrock
1b97795684
Merge branch '3.99' into 4.0
2021-04-23 08:41:12 -07:00
Steve Gravrock
5504965bea
Merge branch 'main' into 3.99
2021-04-23 08:40:25 -07:00
Steve Gravrock
d666f1efbb
Run browser tests on push, except for PRs
2021-04-23 08:39:02 -07:00
Steve Gravrock
4515b76f07
Run browser tests on all non-PR branches
2021-04-23 08:37:29 -07:00
Steve Gravrock
0897e31a2d
Run cron builds on 3.99 and 4.0 branches
2021-04-23 08:37:18 -07:00
Steve Gravrock
c2a714f168
Removed support for IE 10 and Safari 8
2021-04-23 08:14:19 -07:00
Steve Gravrock
c2b558a2da
Fail specs that try to combine two forms of async
2021-04-22 22:44:37 -07:00
Steve Gravrock
235efe52f1
Fixed test failure in IE
2021-04-22 22:43:48 -07:00
Steve Gravrock
1e8619df88
Removed deprecated env methods
2021-04-22 22:38:08 -07:00
Steve Gravrock
4b2a14f1f3
Removed deprecated custom matcher, matchersUtil, pp, etc interfaces
2021-04-22 22:29:20 -07:00
Steve Gravrock
66189d742b
Merge branch 'no-children' of https://github.com/johnjbarton/jasmine into 4.0
...
* Merges #1742 from @johnjbarton
2021-04-22 21:35:58 -07:00
Steve Gravrock
fb05da1fc3
Merge branch 'main' into 3.99
2021-04-22 17:23:08 -07:00
Steve Gravrock
9555cb9842
Pass Sauce tunnel identifier correctly
2021-04-17 16:14:45 -07:00
Steve Gravrock
d6fa9dd1a0
Fixed jsdocs for Spy#calls#thisFor
2021-04-17 12:32:59 -07:00
Steve Gravrock
25fbe0646a
Merge branch 'spy-calls-thisFor' of https://github.com/ajvincent/jasmine into main
...
* Merges #1903 from @ajvincent
* Adds Spy#calls#thisFor
2021-04-17 12:14:41 -07:00
Steve Gravrock
316ce1e2d3
Updated contributing guide etc.
2021-04-17 11:54:11 -07:00
Steve Gravrock
82cc1083b6
Migrated from Travis to Circle CI
2021-04-17 11:34:56 -07:00
Steve Gravrock
c2f04ba627
Further compensate for clock jitter
2021-04-17 11:34:56 -07:00
Steve Gravrock
97a46f4560
Fixed test failures on Safari 8 and 9
2021-04-17 11:34:56 -07:00
Steve Gravrock
113134cdbd
Fixed test failure in Firefox 68 ESR
2021-04-17 11:34:56 -07:00
Steve Gravrock
dad5f5fd6b
Fixed test failure in Safari 8
2021-04-17 11:34:53 -07:00
Alexander J. Vincent
fa72544974
CallTracker.thisFor(): add test for undefined context object.
2021-04-13 18:35:04 -07:00
Alexander J. Vincent
e303de52ed
Implement CallTracker.thisFor().
2021-04-11 22:59:43 -07:00
Steve Gravrock
5f9315731e
Improved handling of unhandled promise rejections with no error in Node
...
* Fixes #1759
2021-04-06 18:48:56 -07:00
Steve Gravrock
ce850c472a
API docs for Env#topSuite and Suite
2021-04-03 11:09:30 -07:00
Steve Gravrock
8b3a6561b1
Merge branch 'main' into 3.99
2021-04-02 11:35:30 -07:00
Steve Gravrock
2fc5182ddc
Added missing jsdocs
...
* Env#execute
* Env#allowRespy
* Enough of Spec to support spec filters
2021-03-31 18:16:58 -07:00
Steve Gravrock
6be2102b64
Built distribution
2021-03-26 17:27:14 -07:00
Steve Gravrock
c6a79d3ab7
Merge branch 'patch-2' of https://github.com/UziTech/jasmine into main
...
* Merges #1892 from @UziTech
* Fixes config.seed type in jsdocs
2021-03-26 17:25:30 -07:00
Tony Brix
3f232fba80
docs: seed can be number or string
2021-03-26 00:10:15 -05:00
Tony Brix
cde6ea79a3
docs: fix jsdoc seed type
2021-03-25 22:05:02 -05:00
Steve Gravrock
0782a73a98
Merge branch 'array_buffer' of https://github.com/Finesse/jasmine into main
...
* Adds support for ArrayBuffers to matchersUtil.equals
* Merges #1891 from @Finesse
* Merges #1689 from @dankurka
* Fixes #1687
2021-03-22 13:06:40 -07:00
Surgie Finesse
37073e2768
Fix the review notices
2021-03-22 19:26:33 +10:00
Surgie Finesse
f7f928fdd3
Merge remote-tracking branch 'upstream/main' into array_buffer
...
# Conflicts:
# spec/core/matchers/matchersUtilSpec.js
2021-03-22 18:33:50 +10:00
Steve Gravrock
503b653a10
Travis browser matrix updates
...
* Added latest Safari
* Added the Firefox version that's closest to current ESR
2021-03-21 11:30:21 -07:00
Steve Gravrock
cb044aa273
Bump version to 3.7.1
2021-03-18 17:28:04 -07:00
Steve Gravrock
5c17456925
Updated release instructions
2021-03-17 19:44:16 -07:00
Steve Gravrock
592fba22b8
Bump version to 3.7.0
2021-03-17 18:38:34 -07:00
Steve Gravrock
58ef707bc6
Added jasmine.isSpy to the public interface
...
* Fixes #1880
2021-03-17 17:58:51 -07:00
Steve Gravrock
050c1f051c
Fixed intermittent test failures
2021-03-14 12:23:17 -07:00
Steve Gravrock
8d0c52e2ec
Temporarily removed global error handler stack validation
...
This fails somewhat frequently (every 2-4 runs of Jasmine's own test
suite) on Safari. Until we get to the bottom of that, it's removed.
2021-03-14 11:46:23 -07:00
Steve Gravrock
de91427356
Fixed instructions for running Jasmine's ci script
2021-03-14 11:43:38 -07:00
Steve Gravrock
324bc201c2
Built distribution
2021-03-13 13:52:10 -08:00
Steve Gravrock
76f34e90dc
Allow custom object formatters to be added in beforeAll
...
Fixes #1876 .
2021-03-13 13:49:30 -08:00
Steve Gravrock
46e7158c77
Removed unused util.htmlEscape
2021-03-04 12:46:23 -08:00
Steve Gravrock
9ab039e330
Merge branch 'expectAllTruthyAndFalsy' of https://github.com/yasinkocak/jasmine into main
...
* Merges #1875 from @yasinkocak
* Adds additional assertions to tests for toBeTruthy and toBeFalsy
2021-02-27 10:31:31 -08:00
Yasin Kocak
3f5c47dff3
expect all truthy and falsy
2021-01-02 10:55:14 +01:00
Steve Gravrock
1320b0614f
Merge branch 'use-global-onerror' into main
...
* Merges #1860 from @greghuc
* Allows specs to disable Jasmine's global error handling by overwriting
`onerror`.
2020-11-24 11:13:24 -08:00
Gregory Huczynski
905e3fc3f9
Enable custom promise error handling through overriding of global.onerror
2020-11-24 11:04:04 -08:00
Steve Gravrock
89331bb1bb
Fixed comparison between URL objects
...
* Fixes #1866
2020-11-21 13:47:44 -08:00
Steve Gravrock
88de272c89
Merge branch 'main' of https://github.com/JannesMeyer/jasmine into main
...
* Merges #1862 from @JannesMeyer
* Adds support for stack traces created by `node --enable-source-maps`
with tools like the Typescript compiler.
2020-11-09 12:15:37 -08:00
Jannes Meyer
60bbe68148
Support source maps
2020-11-05 11:40:04 +01:00
Steve Gravrock
623e638cd4
Updated supported Node versions in README
2020-11-02 16:26:55 -08:00
Steve Gravrock
b1bcd6e825
Pointed Travis badge at travis-ci.com, not .org
2020-10-29 15:10:54 -07:00
Steve Gravrock
204acf7297
Updated Node versions in .travis.yml
2020-10-20 14:14:24 -07:00
Steve Gravrock
cd1131354b
Merge branch 'enumerable' of https://github.com/DCtheTall/jasmine into main
...
* Merges #1859 from DCtheTall
* Fixes #1837
2020-10-10 18:01:48 -07:00
Steve Gravrock
c24aef15b1
Built distribution
2020-10-10 18:00:09 -07:00
DCtheTall
d5d5d1965f
Have properties added by createSpyObj() be enumerable.
2020-10-02 13:49:34 -04:00
Steve Gravrock
d27bb8fa96
Run Prettier on all files
2020-09-29 18:05:38 -07:00
Steve Gravrock
7d5ca27b9d
Check for forgotten console and debugger statements
2020-09-17 13:33:25 -07:00
Steve Gravrock
7a38db2e32
Fixed deprecations triggered from within asymmetricEqualityTesterArgCompatShim
2020-09-17 13:26:35 -07:00
Steve Gravrock
a1f1b4ae0f
Merge branch 'main' into 3.99
2020-09-14 18:39:32 -07:00
Steve Gravrock
795651d3b6
Removed debugger statements
2020-09-13 13:40:15 -07:00
Steve Gravrock
e7daa429a1
Show the name of the spec/suite that caused a deprecation
2020-09-13 12:59:25 -07:00
Steve Gravrock
51ad18cb28
Warn if a runable both takes a callback and returns a promise
2020-09-13 12:47:24 -07:00
Steve Gravrock
0b81705c11
Detect global error handler stack corruption
2020-09-02 14:43:17 -07:00
Steve Gravrock
00feef8632
Fixed global error handler stack corruption in Jasmine's own tests
2020-09-02 14:01:57 -07:00
Steve Gravrock
5a715aecee
Removed unnecessary console.log
2020-09-01 15:25:44 -07:00
Steve Gravrock
8cb44582bc
Don't overwrite MatchersUtil methods with ones that were added to Array.prototype, esp. contains
...
Fixes #1849 .
2020-09-01 15:18:53 -07:00
Steve Gravrock
53d8073707
Allow generator functions to be passed to .and.callFake
...
Fixes #1848 .
2020-08-29 13:15:14 -07:00
Steve Gravrock
e0eb4755cb
Merge branch 'fix-to-be-pending-typo' of https://github.com/SnailCoil/jasmine into main
...
* Merges #1847 from @SnailCoil
2020-08-20 17:51:02 -07:00
Aaron Snailwood
6277046213
fix typo in asyncMatcher toBePending comment
2020-08-20 10:07:35 -07:00
Steve Gravrock
6b9739030d
Fixed future deprecations
2020-08-02 12:57:28 -07:00
Steve Gravrock
b0d949e0d5
Merge branch 'patch-1' of https://github.com/snowman/jasmine into main
...
* Merges #1839 from @snowman
* Fixes script and CSS URLs in standalone example
2020-07-25 09:21:08 -07:00
snowman
dfdcfc5be5
Update README.md
...
Remove extra "jasmine/" directory in code example
2020-07-25 13:27:00 +08:00
Steve Gravrock
e5bb89847f
Use jasmine-browser from npm
...
The current released version now works with IE, so we no longer need to
depend on main.
2020-07-23 17:29:14 -07:00
Steve Gravrock
1f68ed836e
Updated the release docs
2020-07-23 17:26:43 -07:00
Steve Gravrock
c4e65e4a9a
wip
2020-07-23 16:50:54 -07:00
Steve Gravrock
0cfeb0b9c3
Fixed link to custom object formatter tutorial
2020-07-23 16:36:56 -07:00
Steve Gravrock
d51da18808
Bump version to 3.6.0
2020-07-23 16:02:30 -07:00
Steve Gravrock
6f3e85f755
Only run long property tests once on CI
2020-07-16 13:03:04 -07:00
Steve Gravrock
d04b813cab
Merge https://github.com/buildgroundwork/jasmine
...
* Merges #1766 from @amilligan
2020-07-16 10:18:08 -07:00
Steve Gravrock
70c416d5c9
Fixed jsdocs for recent additions
2020-07-10 15:41:02 -07:00
Steve Gravrock
226d3ba939
Added IE back to the Travis matrix
...
Now that jasmine-browser works correctly with IE, we can resume testing
against it.
2020-07-09 11:42:29 -07:00
Steve Gravrock
aa6cc31057
Show diffs involving root-level asymmetric equality testers
...
* Fixes #1831
2020-07-08 17:02:11 -07:00
Steve Gravrock
f8ae3eaeaa
Built distribution
2020-07-08 16:53:53 -07:00
Steve Gravrock
db6aa8f3f8
Use a version of eslint that works on Node 8
2020-07-02 08:49:23 -07:00
Steve Gravrock
4e2f703615
Check for syntax and standard library objects that don't work in IE
2020-07-01 17:34:59 -07:00
Steve Gravrock
ba2aae63be
Run eslint against all files
2020-07-01 16:09:14 -07:00
Steve Gravrock
fb23277367
Removed IE from Travis build matrix
...
We still support IE 10 and 11, but the Node selenium-webdriver has
serious problems with it. Until that's fixed or worked around, IE builds
won't pass. This gets us otherwise green so we can easily see if
anything else is broken.
2020-07-01 12:30:24 -07:00
Steve Gravrock
8cd4873e48
Removed broken Sauce status image
2020-06-29 14:37:08 -07:00
Steve Gravrock
11b63e4e3e
Fixed references to master in docs
2020-06-29 14:36:00 -07:00
Steve Gravrock
b3ab9fad9d
Updated toHaveBeenCalledOnceWith for new matcher interface
2020-06-26 15:14:02 -07:00
Steve Gravrock
13b967b59c
Merge branch 'feat/to-have-been-called-once-with' of https://github.com/Maximaximum/jasmine into pr-merge
...
* Merges #1801 from @Maximaximum
* Fixes #1717
2020-06-26 15:05:04 -07:00
Steve Gravrock
0253d4fb71
Merge branch 'update-throwError-to-throw-objects' of https://github.com/terencehonles/jasmine
...
* Merges #1822 from @terencehonles
2020-06-26 15:00:32 -07:00
Steve Gravrock
44875673c1
Merge branch '1821-tests' of https://github.com/dasch-swiss/jasmine
...
* Merges #1829 from @tobiasschweizer
* Fixes #1821
2020-06-26 14:56:08 -07:00
Terence D. Honles
3943cc2ddb
allow spy throwError to throw an Object
...
When using the following code to simulate a node error:
spyOn(process, 'kill').and.throwError({code: 'ESRCH'})
The object passed in will be converted to a string by the Error
constructor and result in '[object Object]' which is not very useful.
This PR changes the ``throwError`` spy strategy to only convert
strings into an Error object, but any other objects which are passed
in will be thrown as is. This means the spy strategy can never emulate
throwing a bare string ``throw 'error'``, but this would be a backward
incompatible change.
2020-06-25 18:12:00 -07:00
Steve Gravrock
f4753ac0a4
Fixed syntax errors in IE 10
2020-06-25 07:36:06 -07:00
Tobias Schweizer
ce2161ca32
Add additional test for equals matcher
2020-06-25 09:41:39 +02:00
Steve Gravrock
17eda7a2de
Depend on head of jasmine-browser
...
This should fix CI, and can be reverted once a new version of
jasmine-browser that contains 33bd0fcb0ba990102dcd846e673d07b11041dd44
has been published.
2020-06-24 17:50:16 -07:00
Steve Gravrock
7119720fc7
Merge branch 'dp/missing-punctation' of https://github.com/dirkpuge/jasmine
...
* Merges #1828 from @dirkpuge
2020-06-23 17:02:47 -07:00
Steve Gravrock
f4e192a428
Merge branch 'expose-property' of https://github.com/johnjbarton/jasmine
...
* Merges #1820 from @johnjbarton
2020-06-23 16:58:54 -07:00
Dirk Puge
45ad7fd13c
Added missing periods
2020-06-21 11:48:05 -04:00
johnjbarton
0cb304131f
fix(env): expose setSpec/SuiteProperty on interface
2020-05-26 14:50:01 -07:00
Steve Gravrock
8a731e17a7
Improved jsdocs for user-specified spec/suite properties
2020-05-05 17:58:16 -07:00
Steve Gravrock
7416c176a7
Merge branch 'properties' of https://github.com/johnjbarton/jasmine
...
* Merges #1763 from @johnjbarton
2020-05-05 17:45:43 -07:00
Maksym Kobieliev
0f6ebaa784
Merge branch 'master' into feat/to-have-been-called-once-with
2020-04-14 22:08:13 +03:00
Maksym Kobieliev
f14f620e15
Merge pull request #1 from jasmine/master
...
Merge master
2020-04-14 22:07:34 +03:00
Maksym Kobieliev
e94e6c5b75
Fix failing unit test
2020-04-14 22:01:56 +03:00
johnjbarton
f90d9943fe
feat(env): setSpecProperty/setSuiteProperty(key, value) to attach data to tests
...
Use setSpecProperty to attach key/value pairs to spec results that can be
picked up in specialized jasmine reporters. Example use-cases
include:
* Tagging specs with URLs or string-tokens referencing test-plan docs.
* Recording performance information for blocks of JS.
Similarly setSuiteProperty attaches key/value pairs to suite results
2020-04-14 11:27:14 -07:00
Steve Gravrock
8991b1bba3
Fixed toHaveSize matcher on IE 10 & 11
2020-04-12 21:22:14 -07:00
Steve Gravrock
78c3a007ad
Fixed test failure in Firefox 74
2020-04-11 12:08:49 -07:00
Steve Gravrock
30b31096b8
Merge branch 'master' of https://github.com/chivesrs/jasmine
...
* Merges #1802 from @chivesrs
2020-04-11 11:32:08 -07:00
Steve Gravrock
2b318a6154
Merge branch 'master' of https://github.com/parloti/jasmine
...
* Merges #1807 from @parloti
* Fixes #1775
* Prevents undesired reloads when karma-jasmine-html-reporter is used
2020-04-11 11:30:25 -07:00
Steve Gravrock
41293714fd
Merge branch 'tobepending' of https://github.com/DCtheTall/jasmine
...
* Merges #1808 from @DCtheTall
* Fixes #1803
2020-04-11 11:17:49 -07:00
DCtheTall
08779f2657
add missing trailing newline
2020-04-09 15:20:23 -04:00
DCtheTall
76a99aef86
add missing trailing newline
2020-04-09 15:19:47 -04:00
DCtheTall
6b213a958d
Add expectAsync().toBePending()
2020-04-09 15:13:33 -04:00
Alex Parloti
9a7dfb15d2
fix #26
...
fix #26
Returning false will cause 'zone.js' to invoke e.preventDefault(), preventing the page from reloading.
2020-04-02 21:01:56 +02:00
Maksym Kobieliev
ec9904bf52
Fix test
2020-04-02 21:38:54 +03:00
Maksym Kobieliev
bcc28d7063
Output a diff if there was only one call, but with wrong parameters
2020-04-02 21:31:17 +03:00
Gregg Van Hove
79d55216fc
Use internal type checks instead of instanceof to support browsers that don't include the types
2020-03-18 08:57:44 -07:00
Gregg Van Hove
7e940542f8
Merge branch 'wokier-toHaveSize'
...
- Merges #1796 from @wokier
2020-03-18 08:13:50 -07:00
Gregg Van Hove
ec3ebcb7bb
Clean up toHaveSize
2020-03-18 08:13:21 -07:00
Francois Wauquier
c521b4d47c
toHaveSize
2020-03-18 08:13:10 -07:00
Chives
66fe69a149
Add test for resolveTo/rejectWith with empty parameters
2020-03-16 03:15:58 -04:00
Maksym Kobieliev
e13fd13529
Add a toHaveBeenCalledOnceWith matcher
2020-03-13 20:41:24 +02:00
Gregg Van Hove
f1eac6fb04
Merge branch 'chivesrs-master'
...
- Merges #1797 from @chivesrs
2020-03-12 12:28:08 -07:00
Chives
6440ca434d
Add trailing newlines to example code
2020-02-29 04:30:03 -05:00
Steve Gravrock
93ad31e0af
Correctly report spec and suite duration
...
Previously, suite duration was always reported as 0 and spec duration
was always reported as null. Suites always used a no-op timer, and
specs set their result.duration after the result had already been sent
to reporters.
Fixes #1676 .
2020-02-22 16:53:36 -08:00
Steve Gravrock
a6a9550d1e
Fixed 'since' versions for MatchersUtil
2020-02-13 10:52:54 -08:00
Steve Gravrock
6c68715554
Removed unnecessary uses of new
2020-02-13 09:26:33 -08:00
Steve Gravrock
c39c110eca
Deprecate describes with no children
2020-02-12 16:44:44 -08:00
Steve Gravrock
18b2646d1d
Allow libraries to avoid "Passing custom equality testers to MatchersUtil#contains is deprecated" while remaining compatible with older jasmine versions
...
Previously, a custom matcher library that wanted to remain compatible with
Jasmine <= 3.5.x could not know whether or not Jasmine expected it to pass
custom equality testers to MatchersUtil#contains. Passing them would produce
a deprecation warning in newer versions and not passing them would break
compatibility with older versions. Now we use matcher factory arity to
determine whether to pass custom equality testers to the factory, which
allows libraries to do something like this:
function matcherFactory(util) {
const customEqualityTesters = arguments[1];
// customEqualityTesters will be undefined in newer versions of Jasmine
// and defined in older versions that expect it to be passed back to
// MatchersUtil#equals.
}
2020-02-12 15:24:43 -08:00
Steve Gravrock
9aed55bb91
Improved readability of matcher-related deprecations
...
* Include stack traces. This makes it easier to find the matcher that
needs to be updated, particularly when it comes from a library rather
than the user's own code.
* Show each deprecation only once unless `config.verboseDeprecations`
is set. Since matchers are often added in a global `beforeEach`, logging
deprecations every time can be overwhelming.
2020-02-12 15:24:43 -08:00
Steve Gravrock
90d6f9d73c
Added deprecation messages to interfaces that will be removed in 4.0
...
* `jasmine.pp`
* `jasmine.matchersUtil`
* Matchers that expect to receive custom equality testers
* Passing custom equality testers to `matchersUtil.contains`
* Passing custom equality testers to `matchersUtil.equals`
2020-02-12 15:24:42 -08:00
Steve Gravrock
258d55469e
Merge branch 'cof-merge-candidate'
...
* Simplifies the matcher interface
* Adds support for custom object formatters
2020-02-12 15:16:28 -08:00
Steve Gravrock
5096d9af4e
Don't construct unnecessarily asymmetricEqualityTesterArgCompatShims
...
This speeds up MatchersUtil#equals by about 6-7x.
2020-02-12 14:23:03 -08:00
Steve Gravrock
3be797c8d8
Fixed diffs involving jasmine.objectContaining
2020-02-12 14:22:51 -08:00
Gregg Van Hove
d10e8c2ddf
Merge branch 'enelson/callThrough-constructor' of https://github.com/elliot-nelson/jasmine into elliot-nelson-enelson/callThrough-constructor
...
- Merges #1782 from @enelson
- Fixes #1760
2020-02-12 11:39:29 -08:00
Steve Gravrock
c2ada1af95
Merge branch 'custom-object-formatters' into cof-merge-candidate
2020-02-11 13:51:17 -08:00
Pivotal
ea3dd9dffc
Refer to MatchersUtil instances as matchersUtil, not util
2020-02-10 17:26:05 -08:00
Steve Gravrock
d41139fea2
Added jsdocs for MatchersUtil
2020-02-10 17:26:05 -08:00
Steve Gravrock
873d1c2945
Use custom object formatters for any part of a diff, not just leaf nodes
2020-02-10 17:26:00 -08:00
Steve Gravrock
25816a6e77
Added support for custom object formatters
...
Custom object formatters allow users to customize how an object is
stringified in matcher failure messages. This can already be done by
adding a `jasmineToString` method to the objects in question. But
it's not always desirable or possible to do that, particularly when
objects of a given "type" do not inherit from a specific prototype.
For instance, suppose a web service returns a list of foos that are
deserialized from JSON, e.g.:
{ fooId: 42, /* more properties */ }
The only way to define `jasmineToString` on those is by writing code to
add it to each instance at runtime. But a custom object formatter can
recognize that the object it's looking at is a foo and format it
accordingly:
jasmine.addCustomObjectFormatter(function(obj) {
if (typeof obj.fooId !== 'number') {
return undefined;
}
return '[Foo with ID ' + obj.fooId + ']';
});
Unlike `jasmineToString`, custom object formatters are scoped to a
particular spec or suite and don't require any changes to the code
under test.
2020-02-10 17:26:00 -08:00
Steve Gravrock
1f23f1e4d2
Inject a per-runable pretty printer into MatchersUtil
...
This will allow us to add support for custom object formatters, which
will be a per-runable resource like custom matchers, by injecting them
into the pretty-printer.
2020-02-10 17:26:00 -08:00
Steve Gravrock
dec67bd535
Don't require matchers and asymmetric equality testers to pass custom object formatters back to Jasmine
...
This makes it easier to write high quality matchers and asymmetric equality
testers, and is also a step toward supporting custom object formatters.
Previously, Jasmine passed custom object formatters as the second argument
to matcher factories and as and the second argument to asymmetric equality
testers' `asymmetricMatch` method. Matchers and asymmetric equality testers
were responsible for passing the custom object formatters to methods like
`matchersUtil#equals`:
function toEqual(util, customEqualityTesters) {
return {
compare: function(actual, expected) {
// ...
result.pass = util.equals(actual, expected, customEqualityTesters, diffBuilder);
And:
ArrayContaining.prototype.asymmetricMatch = function(other, customTesters) {
// ...
for (var i = 0; i < this.sample.length; i++) {
var item = this.sample[i];
if (!j$.matchersUtil.contains(other, item, customTesters)) {
return false;
}
}
With this change, that is no longer necessary. Matchers and asymmetric
equality testers can ignore the existence of custom equality testers and
still fully support them:
function toEqual(util) {
return {
compare: function(actual, expected) {
// ...
result.pass = util.equals(actual, expected, diffBuilder);
And:
ArrayContaining.prototype.asymmetricMatch = function(other, matchersUtil) {
// ...
for (var i = 0; i < this.sample.length; i++) {
var item = this.sample[i];
if (!matchersUtil.contains(other, item)) {
return false;
}
}
The old interfaces are still supported, for now, but will be deprecated
in a future commit and removed in the next major release after that.
In addition to making matchers and custom equality testers simpler,
this change sets the stage for adding support for custom object
formatters. Those will be architecturally similar to custom equality
testers, and by injecting a `MatchersUtil` instance everywhere we can
add them without requiring user code to pass them around as used to be
the case with custom object formatters.
2020-02-10 17:25:50 -08:00
Steve Gravrock
83b336d9d1
Merge branch 'matcher-integration-tests'
2020-02-06 18:16:06 -08:00
Elliot Nelson
be3c8275d4
Tidy up SpyStrategy#exec
2020-02-06 10:34:55 -05:00
Elliot Nelson
bf4694333c
Improve wrapper function and parameter naming
2020-02-06 10:29:02 -05:00
Elliot Nelson
9febe3159d
Allow callThrough to call constructor functions without errors
2020-01-28 19:40:44 -05:00
Steve Gravrock
5e98ee951c
Realign the browser testing matrix to match current reality
...
* Use Windows instead of Linux so we can get current browsers from Sauce.
* Test against the version of Firefox that corresponds to ESR as well as
latest.
* Test the latest Edge rather than a specific older version.
* Test Safari 8 and 13 instead of 8, 9 and 10. What works in those versions
is likely to work in the ones in between.
2020-01-20 12:08:01 -08:00
Steve Gravrock
fd5b9ce1ae
Fixed spec failure in IE
2020-01-20 11:40:26 -08:00
Steve Gravrock
58c63e98bb
Include stack traces in unhandled promise rejection messages
2020-01-20 10:50:42 -08:00
Steve Gravrock
7f392d188e
Don't leak global error handlers between Jasmine's own tests
2020-01-20 10:18:29 -08:00
Steve Gravrock
6baf3a9270
Merge branch 'unhandledrejection' of https://github.com/johnjbarton/jasmine into browser-unhandled-rejections
...
* Merges #1778 from @johnjbarton
* Fixes #1777
2020-01-15 22:10:50 -08:00
johnjbarton
1545112744
feat(GlobalErrors): Route unhandledrejections to onerror
...
Fixes #1777
2020-01-14 09:38:59 -08:00
Steve Gravrock
8a5216401f
Built distribution
2020-01-11 14:29:24 -08:00
Steve Gravrock
fffb8abb24
Moved property tests to the main suite
...
Property tests can only run in Node, so they were previously in another
directory that only gets run in Node. Now they're next to the related
non-property tests and marked pending in the browser. This makes it more
likely that a developer who normally only runs tests in the browser will
notice and run them.
2020-01-11 10:49:37 -08:00
Steve Gravrock
17e9088ac5
Merge branch 'add-it-naming' of https://github.com/johnlinp/jasmine
...
* Merges #1772 from @johnlinp
2020-01-11 09:17:45 -08:00
Steve Gravrock
d19ffcc231
Merge branch 'consider-all-error-messages' of https://github.com/vhermannitk/jasmine
...
* Merges #1776 from @vhermannitk
* Fixes #1771
2020-01-11 09:14:20 -08:00
Valentin Hermann
0b4a9edff8
Added some tests and modified the source code instead of the build product
2020-01-08 10:55:14 +01:00
Valentin Hermann
e02c24d151
Revert "Improves method messagePrefixLength. Now error messages like ReferenceError or TypeError are considered, too"
...
This reverts commit 913ad50a76 .
2020-01-08 08:47:08 +01:00
Valentin Hermann
913ad50a76
Improves method messagePrefixLength. Now error messages like ReferenceError or TypeError are considered, too
2020-01-07 15:49:43 +01:00
Valentin Hermann
c395c525dc
Revert "Improves method messagePrefixLength. Now error messages like ReferenceError or TypeError are considered as well"
...
This reverts commit 12fefa4b3d .
2020-01-07 15:41:02 +01:00
Valentin Hermann
12fefa4b3d
Improves method messagePrefixLength. Now error messages like ReferenceError or TypeError are considered as well
2020-01-07 15:23:37 +01:00
Steve Gravrock
88b98277bc
Fixed Travis build
2020-01-04 16:15:18 -08:00
Steve Gravrock
4eded6ab61
Added basic property tests for matchersUtil.equals
...
* See #1764 from @dubzzz
* Property tests are only run in Node, not browser.
* The Travis build sets JASMINE_LONG_PROPERTY_TESTS to enable much more
thorough (but slow) testing.
2020-01-04 14:52:34 -08:00
John Lin
6c766b7785
Describe the naming for the function it()
...
When I first saw it(), I was wondering if the name "it" is
an abbreviation of anything. After some search, I finally
realized that the name is only a pronoun. Therefore, I
think it's worthwhile to include it in the documentation.
2019-12-16 12:50:18 +08:00
Adam Milligan
13ff1e037e
Make changes in source files
2019-11-22 17:47:20 -05:00
Steve Gravrock
a00f995c68
Added integration tests for existing matcher interfaces
2019-11-17 15:11:58 -08:00
Steve Gravrock
795a80ec66
Added integration tests for asymmetric equality testers
2019-11-17 15:11:53 -08:00
Adam Milligan
3d1a96e020
Extend Jasmine env into correct global
2019-11-05 10:54:46 -05:00
Adam Milligan
076093c16c
Properly import jasmineRequire object before using
2019-11-04 11:38:53 -05:00
Steve Gravrock
8d53f4d202
Fixed objectContaining to not match when the expected is the empty object and the actual is a non-object
2019-11-02 14:38:06 -07:00
Steve Gravrock
71631a6529
Test IE before other browsers on Travis
...
If the tests only fail on one browser, it's usually IE. So testing
IE first gives us faster feedback in cases where we're actively
watching the Travis build.
2019-11-02 13:14:49 -07:00
Steve Gravrock
bed56a76f8
Merge branch 'fix/number-compare-failure' of https://github.com/dubzzz/jasmine
...
* Merges #1764 from @dubzzz
2019-11-02 11:52:01 -07:00
Nicolas DUBIEN
97fe2e7c95
Fix: Jasmine reports toEqual(0, Number.MIN_VALUE) to be true
2019-10-31 00:31:27 +01:00
Steve Gravrock
ef3f127d27
Fixed comparison between ObjectContaining and non-objects on IE
2019-09-28 18:39:43 -07:00
Steve Gravrock
472f61ab37
Provide better diffs for object graphs that include objectContaining
...
Turns this output:
Expected $[0].foo = Object({ a: 4, b: 5 }) to equal <jasmine.objectContaining(Object({ a: 1, c: 3 }))>.
into this:
Expected $[0].foo.a = 4 to equal 1.
Expected $[0].foo.c = undefined to equal 3.
And turns this output:
Expected spy jasmineDone to have been called with:
[ ... snipped very long expected call ]
but actual calls were:
[ ... snipped very long actual call ]
Call 0:
Expected $[0] = Object({ overallStatus: 'failed', totalTime: 1, incompleteReason: undefined, order: Order({ random: true, seed: '88732', sort: Function }), failedExpectations: [ Object({ matcherName: 'toBeResolved', passed: false, message: 'Suite "a suite" ran a "toBeResolved" expectation after it finished.
Did you forget to return or await the result of expectAsync?', error: undefined, errorForStack: Error, actual: [object Promise], expected: [ ], globalErrorType: 'lateExpeztation' }) ], deprecationWarnings: [ ] }) to equal <jasmine.objectContaining(Object({ failedExpectations: [ <jasmine.objectContaining(Object({ passed: false, globalErrorType: 'lateExpectation', message: 'Suite "a suite" ran a "toBeResolved" expectation after it finished.
Did you forget to return or await the result of expectAsync?', matcherName: 'toBeResolved' }))> ] }))>.
into this:
Expected spy jasmineDone to have been called with:
[ ... snipped very long expected call ]
but actual calls were:
[ ... snipped very long actual call ]
Call 0:
Expected $[0].failedExpectations[0].globalErrorType = 'lateExpeztation' to equal 'lateExpectation'.
2019-09-28 18:03:12 -07:00
Steve Gravrock
10dbf8be98
Indent multiline failure messages in the output of withContext
...
This makes it easier to see where each failure message begins and ends.
Before:
Some context: a
multiline
message
After:
Some context:
a
multiline
message
2019-09-28 12:38:28 -07:00
Steve Gravrock
a497d0942a
Report async expectations that complete after the runable completes
...
It's very easy to forget to `await` or `return` the promise returned
from `expectAsync`. When that happens, the expectation failure will
occur after the spec or suite's result has been reported to reporters,
and the failure will typically not be shown to the user. This change
adds a top-level suite failure in that case, similar to the way we
report unhandled exceptions or promise rejections that occur after the
runable completes. Adding the error at the top level gives us the best
chance of getting in before the set of failures we add it to is sent
to reporters.
See #1752 .
2019-09-27 18:31:01 -07:00
Gregg Van Hove
9a41154e3b
Merge branch 'apla-master'
...
- Merges #1678 from @apla
2019-09-23 16:48:22 -07:00
ivan baktsheev
fc3eb0fbd8
Handle node.js assert as an error in your specs
2019-09-23 16:47:07 -07:00
Steve Gravrock
223924a7a1
Fixed matchersUtil.contains test to fail correctly
2019-09-22 08:44:15 -07:00
Gregg Van Hove
99799f72b3
Still need some ruby stuff around to release the jasmine-core gem
2019-09-20 17:15:47 -07:00
Gregg Van Hove
e8263e38aa
bump version to 3.5.0
2019-09-20 16:57:20 -07:00
Steve Gravrock
53561ae71f
Show details of syntax (etc) errors when loading Jasmine's own specs
2019-09-11 13:31:01 -07:00
Steve Gravrock
68f25a758d
Don't create env instances in beforeEach
2019-09-11 13:31:01 -07:00
Steve Gravrock
96ba66ad60
Built distribution
2019-09-10 11:23:27 -07:00
Steve Gravrock
ba4a8d1d00
Fixed jsdocs
2019-09-10 11:23:11 -07:00
Steve Gravrock
65d9e93a88
Removed broken & long-disabled JsApiReporter integration specs
2019-09-10 09:38:38 -07:00
Steve Gravrock
2d3ac38df8
toBeRejectedWithError can expect the error to be Error, not just a subtype
2019-09-06 14:17:52 -07:00
Steve Gravrock
5a219da848
Added basic integration tests for all built-in matchers
2019-09-06 14:10:16 -07:00
Steve Gravrock
f056f3b86c
Fixed indentation
2019-09-06 13:43:30 -07:00
Steve Gravrock
aeb0b73008
Merge branch 'dtychshenko-1740-fail-on-no-expectations'
...
* Merges #1743 from @dtychshenko
* Fixes #1740
2019-09-05 09:50:12 -07:00
Dmitriy T
7263a38c3f
Adds new configuration option to failSpecWithNoExpectations that will report specs without expectations as failures if enabled
2019-09-05 09:47:38 -07:00
Gregg Van Hove
e8870db8d3
Merge branch 'fix-missing-asynchronous-stacktrace' of https://github.com/prantlf/jasmine into prantlf-fix-missing-asynchronous-stacktrace
...
- Merges #1738 from @prantlf
- Fixes #1728
2019-09-04 17:42:07 -07:00
Steve Gravrock
35d15085e3
Show argument diffs in toHaveBeenCalledWith failure messages
...
* Fixes #1641
2019-09-03 17:18:07 -07:00
Steve Gravrock
19292e4ea4
Stop testing against PhantomJS
...
PhantomJS is at end of life, and the last version of Selenium that supported
it was 3.6.0, released almost three years ago. We can't test Jasmine against
PhantomJS without pinning key pieces of the project to increasingly outdated
versions of key libraries.
2019-09-03 15:40:53 -07:00
Steve Gravrock
ba71989d4b
Fixed code formatting
2019-09-03 15:39:00 -07:00
Steve Gravrock
f8e5ea14bc
Fail the CI build if the promise returned from jasmineBrowser.runSpecs is rejected
2019-09-03 15:34:56 -07:00
Steve Gravrock
92dfbdcdc9
Depend on acorn to work around broken deduping
...
See <https://github.com/eslint/espree/issues/393 >.
2019-09-03 15:30:42 -07:00
Steve Gravrock
8ad1dd163b
Merge branch 'arrayContaining-actuals-must-be-arrays' of https://github.com/divido/jasmine
...
* Merges #1746 from @divido
* Fixes #1745
2019-08-30 13:12:47 -07:00
Steve Gravrock
ded8b760aa
Merge branch 'UziTech-patch-1'
...
* Merges #1732 from @UziTech
2019-08-30 10:27:53 -07:00
Tony Brix
07318fba37
docs change
2019-08-30 12:14:19 -05:00
Steve Gravrock
c42358c686
Fixed test failure on IE
2019-08-30 09:30:23 -07:00
Tony Brix
f77ee32c56
Add custom async matchers
2019-08-30 09:30:14 -07:00
David Diederich
0bd636b5d2
Updated arrayContaining to require actual values to be arrays
...
If the actual value of a test was a string, this was matching against arrays
that contained the strings. This was due to the use of the contains matcher,
which against string looks for substrings, when it was intended to look for
array elements.
2019-08-30 01:09:53 -04:00
Pivotal
008b80adc5
Merge branch 'enelson/default' of https://github.com/elliot-nelson/jasmine
...
* Merges #1716 from @elliot-nelson
2019-08-29 13:50:27 -07:00
Steve Gravrock
1a63ab4677
Accept configurations with Promise: undefined.
...
Fixes Karma and anything else that uses Env#configuration
as a starting point for a Jasmine config.
2019-08-26 15:45:13 -07:00
Ferdinand Prantl
3a7fc63879
Pick the error instance to pass to error handlers in QueueRunner
...
The first number is the error message in HTML5 browser, which does not include
the call stack. The error instance allows logging the complete call stack in
reporters.
2019-08-11 09:32:31 +02:00
Ferdinand Prantl
527619b0aa
Restore the original global error hanler to pass all parameters along
2019-08-11 09:31:43 +02:00
johnjbarton
2369c8dba7
fix(env): Throw if nested describe has no children.
...
Users would like an error if it() is acciddently moved within a before/afterEach/All function.
The it() function calls ensureIsNotNested to report such an error. But if the user has no
other it() functions in the Suite, it() and thus ensureIsNotNested() is never called.
Here we check nested Suites for children; if none are found we throw.
2019-08-07 18:01:34 -07:00
Gregg Van Hove
0449b35f5a
Merge branch 'tobe-tostring' of https://github.com/johnjbarton/jasmine into johnjbarton-tobe-tostring
...
- Merges #1718 from @johnjbarton
- Fixes #1726
2019-08-07 12:03:46 -07:00
Steve Gravrock
e50a7b6985
Merge branch 'add-map-set-matchers' of https://github.com/eventlistener/jasmine
...
* Merges #1741 from @eventlistener
2019-08-03 12:18:35 -07:00
Steve Gravrock
b2d9aab2b8
Use the same spec file pattern for both node and browser
2019-08-03 12:17:52 -07:00
Olga Kozlova
b01d86840a
mapContaining and setContaining asymmetric matchers
2019-08-03 22:14:48 +03:00
sgravrock
385ad33f60
Merge pull request #1736 from olleolleolle/patch-1
...
Gemspec: Drop EOL'd property rubyforge_project
2019-08-03 08:58:01 -07:00
Steve Gravrock
18195a868c
Updated async timeout message
...
There are now multiple ways to do async functions, and callbacks
are probably the least common in new code, so the message should
be more general rather than referring to callbacks.
2019-08-03 08:25:57 -07:00
Ferdinand Prantl
7c3434723e
Use the documented interface to pick the error instance from the global error handler
2019-07-21 23:46:14 +02:00
Ferdinand Prantl
4858a62fdc
Add a unit test for the global error handling including stacktrace
2019-07-16 12:00:09 +02:00
Ferdinand Prantl
df4b6e58e2
Pass the error including stacktrace to error handlers and reporters
...
The global window error handler is used to handle errors thrown from within asynchronous functions and tests. The first parameter is the error; the fifth parameter is the full error object including the stacktrace. Searching for the first occurrence of an error instance to work with browsers, which may not comply with the HTML5 standard.
2019-07-15 14:43:22 +02:00
Olle Jonsson
d68b47b76d
Gemspec: Drop EOL'd property rubyforge_project
2019-07-14 10:38:36 +02:00
Steve Gravrock
c100bb6242
Made output of toHaveBeenCalledWith more readable
...
This breaks each call out onto its own line, so that it's much easier to
see where each call starts and how they differ. E.g. previously the output
would be:
Expected spy foo to have been called with [ 'bar', 'baz', 'qux' ] but actual calls were [ [ 42, 'wibble' ], [ 'bar' 'qux' ], [ 'grault '] ]
Now it's:
Expected spy foo to have been called with:
[ 'bar', 'baz', 'qux' ]
but actual calls were:
[ 42, 'wibble' ],
[ 'bar' 'qux' ],
[ 'grault '].
2019-07-13 10:37:05 -07:00
Gregg Van Hove
c37e9b9db0
Add saucelabs badge to readme
2019-07-07 19:37:09 -07:00
Gregg Van Hove
5e87e1410d
update to newer jasmine-browser-runner
2019-07-07 19:20:45 -07:00
Gregg Van Hove
0cd5d9339b
Use node 10 for browser based builds
2019-07-07 19:01:36 -07:00
johnjbarton
6324fda065
PrettyPrinter survives if objects throw in toString
2019-06-27 10:35:59 -07:00
Gregg Van Hove
066162d6bc
Merge branch 'enelson/spyobjproperty' of https://github.com/elliot-nelson/jasmine into elliot-nelson-enelson/spyobjproperty
...
- Merges #1722 from @elliot-nelson
- Closes #1569
- Fixes #1442
2019-06-25 16:26:43 -07:00
Gregg Van Hove
ab01fa1978
Merge pull request #1721 from elliot-nelson/enelson/gitattributes
...
Fix: don't attempt to normalize PNGs (gitattributes)
2019-06-24 16:16:37 -07:00
Elliot Nelson
65e6df55ee
Linting fixes
2019-06-20 07:34:31 -04:00
Elliot Nelson
45475f6d1e
Allow users to pass property names to createSpyObj
2019-06-20 07:33:10 -04:00
Elliot Nelson
a536ca19f2
Don't attempt to normalize PNGs
2019-06-20 06:46:51 -04:00
Gregg Van Hove
9a6262e3cd
bump browser runner to new version
2019-06-14 16:42:10 -07:00
Gregg Van Hove
e7d0d742a8
only turn on sauce_connect for jobs that need it (I think)
2019-06-14 15:43:14 -07:00
Gregg Van Hove
031515db23
rejigger travis again to not run sauce jobs for PRs
2019-06-14 15:27:24 -07:00
Gregg Van Hove
49fd22ffe6
move everything we can into the env matrix for travis
2019-06-14 15:15:29 -07:00
Gregg Van Hove
5c058b5bc4
Don't include node 10 & 12 in matrix, we're explicit later
2019-06-14 15:11:41 -07:00
Gregg Van Hove
18dbbca436
Refactor travis matrix to compress a bit more
2019-06-14 15:10:16 -07:00
Gregg Van Hove
3e888105f0
Calculate total suite run time inside the env and report in jasmineDone
2019-06-14 14:59:33 -07:00
Gregg Van Hove
15f969bee7
Add @since to most JSDoc comments
...
- See jasmine/jasmine.github.io#117
2019-06-12 16:23:12 -07:00
Gregg Van Hove
984018bfdf
Make no expectations in HTML Reporter message a warning
...
- Fixes #1704
2019-06-12 13:31:25 -07:00
Gregg Van Hove
0f4e53d0e6
Update ci script to pass linting
2019-06-12 12:15:34 -07:00
Gregg Van Hove
c73c5a9dbd
WIP
2019-06-12 11:42:47 -07:00
Gregg Van Hove
243adfd4ce
Use jasmine-browser-runner to execute browser tests
2019-06-12 11:33:14 -07:00
Elliot Nelson
e07da96354
Apply prettier
2019-06-07 23:33:06 -04:00
Elliot Nelson
96786c793f
Allow users to set a default spy strategy
2019-06-07 23:32:13 -04:00
Gregg Van Hove
d610d0bdad
Use browser-runner to start server in CI
2019-06-06 14:46:19 -07:00
Gregg Van Hove
0644731680
Switch to using new jasmine-browser-runner to server files for local testing
2019-06-06 14:07:30 -07:00
Gregg Van Hove
8da1fd1ed1
Merge branch 'master' of https://github.com/pixelpax/jasmine into pixelpax-master
...
- Merges #1713 from @pixelpax
2019-05-30 17:47:16 -07:00
Gregg Van Hove
8af669677a
Cleanup spy promise strategies to be more consistent with Jasmine at large
...
- Rename `resolveWith` to `resolveTo` to match `toBeResolvedTo`
- No longer wrap non-Errors in `rejectWith`
- Fixes #1715
2019-05-23 17:29:12 -07:00
Gregg Van Hove
b4cbe9850f
add prettier and eslint
2019-05-21 18:23:48 -07:00
Gregg Van Hove
cf2c5c9acc
Merge branch 'enelson/src-cleanup-2' of https://github.com/elliot-nelson/jasmine into elliot-nelson-enelson/src-cleanup-2
...
- Merges #1708 from @elliot-nelson
2019-05-21 17:45:46 -07:00
Gabriel Elkind
4e10cf84d5
Adds in the source-- whoops!
2019-05-20 23:51:29 -05:00
Gregg Van Hove
9f875ce666
Older versions don't support const, use var
2019-05-20 17:56:27 -07:00
Gregg Van Hove
df6a71e37d
Merge branch 'spy-to-string' of https://github.com/johnjbarton/jasmine into johnjbarton-spy-to-string
...
- Merges #1712 from @johnjbarton
2019-05-20 17:22:05 -07:00
Gregg Van Hove
32a3288c9d
Merge branch 'elliot-nelson-enelson/pp'
2019-05-20 17:18:29 -07:00
Gregg Van Hove
b12981a3e7
build dist for rounding fix
2019-05-20 17:17:55 -07:00
Gregg Van Hove
cbbdd360f8
Merge branch 'enelson/pp' of https://github.com/elliot-nelson/jasmine into elliot-nelson-enelson/pp
...
- Merges #1711 from @elliot-nelson
- Closes #1700
- Closes #1575
2019-05-20 17:13:41 -07:00
Gregg Van Hove
3a89cc92fb
Merge branch 'paulvanbrenk-fix-1695'
...
- Merges #1710 from @paulvanbrenk
- Fixes #1695
2019-05-20 17:10:39 -07:00
Gabriel Elkind
88c8c905ba
Adds width to root level html-reporter class
2019-05-20 15:25:38 -05:00
johnjbarton
d1adbdc72b
fix(PrettyPrint): jasmine.createSpyObj('obj', ['toString']);
...
The PrettyPrint handler for scalars uses toString() but if that method
has been spyed on, then the stringify fails with
TypeError: Cannot read property 'length' of undefined.
By hanlding this case earlier in format() we avoid the error.
Add unit test covering this case.
2019-05-20 09:33:47 -07:00
Elliot Nelson
8225bb935f
Explicitly test pretty printing objects with nested invalid toString
2019-05-20 09:09:07 -04:00
Elliot Nelson
9f704b6f3a
PrettyPrinter handles objects with invalid toString implementations
2019-05-20 09:01:10 -04:00
Paul van Brenk
69a7449e50
Fix toBeCloseTo matcher for Node.js 12 and Chrome 74
2019-05-19 12:46:32 -04:00
Elliot Nelson
b1da6e3960
Cleanup: unused vars, dangling commas, negation
2019-05-18 08:11:47 -04:00
Elliot Nelson
1e855aa9b8
Cleanup: whitespace
2019-05-18 08:10:11 -04:00
Gregg Van Hove
e04d3d8a62
Fix bad merge for spyOnProperty error message
2019-05-17 17:07:47 -07:00
Gregg Van Hove
06814769c6
Merge branch 'enelson/spyregerrors' of https://github.com/elliot-nelson/jasmine into elliot-nelson-enelson/spyregerrors
...
- Merges #1706 from @elliot-nelson
2019-05-17 16:44:26 -07:00
Gregg Van Hove
309e6df8fd
Use Object.create to make an object with null prototype
2019-05-17 16:31:15 -07:00
Gregg Van Hove
ea1bac5b74
Merge branch 'enelson/spyonproperty' of https://github.com/elliot-nelson/jasmine into elliot-nelson-enelson/spyonproperty
...
- Merges #1705 from @elliot-nelson
2019-05-17 16:21:17 -07:00
Elliot Nelson
befb8995e6
spyOnProperty jasmine-style error messages with usage note
2019-05-17 12:02:44 -04:00
Elliot Nelson
1e13039478
spyOnProperty respects the allowRespy flag
2019-05-17 11:43:22 -04:00
Gregg Van Hove
11b0d95a7d
Merge branch 'enelson/toBeInstanceOf' of https://github.com/elliot-nelson/jasmine into elliot-nelson-enelson/toBeInstanceOf
...
- Merges #1697 from @elliot-nelson
2019-05-16 17:35:09 -07:00
Gregg Van Hove
95f6ba5fa2
Merge branch 'elliot-nelson-enelson/ci-errors'
2019-05-15 17:54:50 -07:00
Gregg Van Hove
d331e9cc38
Merge branch 'enelson/ci-errors' of https://github.com/elliot-nelson/jasmine into elliot-nelson-enelson/ci-errors
...
- Merges #1701 from @elliot-nelson
2019-05-15 17:54:24 -07:00
Gregg Van Hove
0129a7d007
Update contributing doc based on some of the newer tooling
...
- Fixes #1702
2019-05-15 17:34:57 -07:00
Elliot Nelson
0fded24d35
Introduce matchers#toBeInstanceOf
2019-05-15 11:51:46 -04:00
Elliot Nelson
c88c772ffb
Print global errors encountered during CI runs
2019-05-15 11:39:45 -04:00
Gregg Van Hove
3dde56bbd8
Merge branch 'enelson/spyonall' of https://github.com/elliot-nelson/jasmine into elliot-nelson-enelson/spyonall
...
- Merges #1699 from @elliot-nelson
- Fixes #1677
2019-05-14 18:01:27 -07:00
Gregg Van Hove
e377f1caae
Merge branch 'elliot-nelson-enelson/ci'
...
- Merges #1598 from @elliot-nelson
2019-05-14 17:21:28 -07:00
Elliot Nelson
91fe87ca56
Simplify error checks in ci.js
2019-05-14 06:57:46 -04:00
Elliot Nelson
ee15309a8f
Extend spyOnAllFunctions to include prototype and parent methods
2019-05-11 18:20:13 -04:00
Elliot Nelson
49c03d4a22
Improve error handling in CI test launcher
2019-05-10 06:18:35 -04:00
Gregg Van Hove
9a18fdca27
Merge branch 'enelson/spystrategies' of https://github.com/elliot-nelson/jasmine into elliot-nelson-enelson/spystrategies
...
- Merges #1688 from @enelson
- See #1590
2019-05-09 17:30:45 -07:00
Elliot Nelson
b2fb92eedd
Promise-based strategies are now named resolveWith and rejectWith
2019-05-09 06:12:06 -04:00
Elliot Nelson
df818f3fbc
rejectValue wraps non-Errors like throwError does
2019-05-08 09:36:12 -04:00
Elliot Nelson
4731b4ee4d
Keep all Promise implementation details internal
2019-05-08 09:13:41 -04:00
Gregg Van Hove
eb30e8179a
Update deprecation messages to indicate _future_ removal
...
- Fixes #1628
2019-05-07 17:10:04 -07:00
Elliot Nelson
95e1890e64
Improved resolveValue/rejectValue error messages
2019-05-07 16:30:48 -04:00
Elliot Nelson
72aa0bbe4d
Add resolveValue and rejectValue spy strategies
2019-05-05 08:08:34 -04:00
Steve Gravrock
17a9a6417a
Fixed test failure in Firefox 66.0.2
2019-05-04 10:51:34 -07:00
Gregg Van Hove
d856b0548a
Merge branch 'megahertz-feature-to-be-rejected-with-error'
...
- Merges #1686 from @megahertz
- Fixes #1625
2019-05-03 16:36:37 -07:00
Alexey Prokhorov
8ab46566ac
Fix failure messages for toBeRejectedWithError matcher
2019-05-03 09:37:11 +04:00
Daniel Kurka
2745d7d515
Add support for ArrayBuffers to matcherUtil.equals.
...
Fixes #1687
2019-05-02 09:49:21 -07:00
Alexey Prokhorov
35968e4a60
Add toBeRejectedWithError matcher
2019-04-26 01:46:56 +04:00
Gregg Van Hove
afb24d1050
Ignore internal ci.js from npm package
...
- See #1684
2019-04-22 18:10:43 -07:00
Gregg Van Hove
c6d637dcb3
Bump some dependencies
2019-04-22 18:03:37 -07:00
Gregg Van Hove
2fbeb201bc
Fix failure messages for positive/negative infinity matchers
...
- Fixes #1674
2019-04-16 17:40:07 -07:00
Gregg Van Hove
fd60b5737c
Merge pull request #1680 from acinader/patch-1
...
nit: fix typo
2019-04-15 17:56:23 -07:00
Gregg Van Hove
b994a17039
Merge branch 'FelixRilling-boolean-matcher'
...
- Merges #1679 from @FelixRilling
2019-04-15 17:48:49 -07:00
Arthur Cinader
74fa38bdfb
nit: fix typo
2019-04-14 10:33:51 -05:00
Felix Rilling
369e810791
added #toBeTrue and #toBeFalse matchers
2019-04-14 10:17:59 +02:00
Gregg Van Hove
8fca3b4c11
Fix links in 3.4 release notes
2019-04-03 17:13:18 -07:00
Gregg Van Hove
e636f5f822
Bump version to 3.4
2019-04-03 17:03:07 -07:00
Gregg Van Hove
74fd0e08e7
No fit in the suite
2019-04-01 21:01:22 -07:00
Gregg Van Hove
618e24b2f8
Handle WebSocket events in IE when detecting Errors
...
- Fixes #1623
2019-04-01 18:52:27 -07:00
Gregg Van Hove
5c7e25e228
Allow excluded specs in CI without breaking the output
2019-04-01 18:52:01 -07:00
Gregg Van Hove
54af109d40
Merge branch 'wood1986-fix/npm-audit-dependencies-and-fast-glob-only-failed-tests'
...
- Merges #1672 from @wood1986
2019-03-26 17:12:53 -07:00
wood
873a237e3d
Consolidate some dev dependencies and use more maintained versions
2019-03-26 17:12:21 -07:00
Gregg Van Hove
8ca4463e01
Make node execution default and override for browsers
2019-03-25 18:37:50 -07:00
Gregg Van Hove
449eb516cc
Fix sauce status codes and try travis built-in node support
2019-03-25 18:33:39 -07:00
Gregg Van Hove
a5df5a6ee9
Use the correct env var from travis for tunnels
2019-03-25 18:12:15 -07:00
Gregg Van Hove
be583232b4
bump dependencies for security fixes
2019-03-25 18:01:13 -07:00
Gregg Van Hove
d389d3c002
Merge branch 'wood1986-features/no-ruby'
...
- Merges #1658 from @wood1986
- Fixes #883
2019-03-25 17:56:19 -07:00
Gregg Van Hove
994d11d4f3
update node CI script to work with SauceLabs
2019-03-25 17:56:06 -07:00
wood
828d14f48e
Use node.js for browser-based CI
2019-03-25 17:55:53 -07:00
Gregg Van Hove
f5663a9076
Merge branch 'johnjbarton-duration'
...
- Merges #1660 from @johnjbarton
- Fixes #1646
2019-03-14 19:12:39 -07:00
johnjbarton
a8c2399dd8
feat(result.duration): report test duration in ms
...
Wrap spec start/complete in Timer start/elapsed.
configuration.timeSpecDuration = false will disable feature.
* Add Suite result.duration, elapsed time in ms
* Remove timeSpecDuration option.
* Respond to review, use noopTimer
2019-03-14 09:13:57 -07:00
Gregg Van Hove
7c0f013003
Merge branch 'johnjbarton-noop-timer'
...
- Merges #1669 from @johnjbarton
2019-03-13 17:34:12 -07:00
johnjbarton
ca2b62b00e
refactor(Timer): share htmlReporter noopTimer via Timer.js
2019-03-12 16:26:04 -07:00
Gregg Van Hove
4108deca02
Build distribution for various typo PRs
2019-03-11 17:39:03 -07:00
Gregg Van Hove
def278f90f
Merge branch 'typo-suites' of https://github.com/FelixRilling/jasmine into FelixRilling-typo-suites
...
- Merges #1666 from @FelixRilling
2019-03-11 17:38:29 -07:00
Gregg Van Hove
6bd4a29360
Merge branch 'jsdoc-validation' of https://github.com/FelixRilling/jasmine into FelixRilling-jsdoc-validation
...
- Merges #1667 from @FelixRilling
2019-03-11 17:37:43 -07:00
Gregg Van Hove
fd037f53a3
Merge branch 'typo-comments' of https://github.com/FelixRilling/jasmine into FelixRilling-typo-comments
...
- Merges #1665 from @FelixRilling
2019-03-11 17:34:44 -07:00
Gregg Van Hove
348242b712
Merge branch 'FelixRilling-typo-received'
...
- Merges #1664 from @FelixRilling
- Fixes #1663
2019-03-11 17:32:32 -07:00
Felix Rilling
b74e0abee1
Fixed flipped JSDoc.
2019-03-10 11:17:50 +01:00
Felix Rilling
e33b12b17c
Fixed typos in test suite descriptions.
2019-03-10 11:07:40 +01:00
Felix Rilling
dde93ade18
Fixed typos in comments.
2019-03-10 11:04:33 +01:00
Felix Rilling
63f900287c
Fixed typo "receieved" to "received", Adapted test.
2019-03-10 10:59:56 +01:00
Gregg Van Hove
239a615770
No longer run Node.js v4 on Travis
...
- Jasmine should still work in Node.js v4, but the jshint task isn't
working correctly
2019-02-11 13:38:00 -08:00
Gregg Van Hove
92d5957a59
Attempt to skip jshint for node.js v4
2019-02-11 09:46:36 -08:00
Gregg Van Hove
4991f2a713
Merge branch 'print_global_error_type' of https://github.com/jbunton-atlassian/jasmine into jbunton-atlassian-print_global_error_type
...
- Merges #1632 from @jbunton-atlassian
2019-02-11 09:02:16 -08:00
Gregg Van Hove
0d6db64eb1
Merge branch 'onerror' of https://github.com/johnjbarton/jasmine into johnjbarton-onerror
...
- Merges #1644 from @jognjbarton
2019-01-30 17:38:27 -08:00
Gregg Van Hove
489fb79d6e
fall back to older jshint for older node
2019-01-09 11:08:32 -08:00
Gregg Van Hove
eba8c775f3
update npm dependencies
2019-01-08 17:47:53 -08:00
johnjbarton
c36a005893
Support Error.stack in globalErrors.
...
See https://developer.mozilla.org/en-US/docs/Web/API/GlobalEventHandlers/onerror#window.onerror
2019-01-03 16:14:23 -08:00
Gregg Van Hove
37dfe50d99
Stop treating objects with a nodeType as if they are DOM Nodes
...
- Fixes #1638
2018-12-17 17:10:53 -08:00
Gregg Van Hove
c67a5b830c
Fix 3.0 breaking changes list to include note about Spy identity
2018-12-11 17:56:17 -08:00
James Bunton
d803bd12a6
When catching a global error in Node.js, print the type of error
2018-12-11 08:32:45 +11:00
Gregg Van Hove
a621d05fa7
Merge branch 'Havunen-fix-to-equal-ie'
...
- Merges #1621 from @Havunen
- Fixes #1618
2018-12-03 17:45:06 -08:00
Sampo Kivistö
473f5cd359
Re-use attr variable
2018-11-04 10:44:54 +02:00
Sampo Kivistö
a81e9626df
Fixes issue where PhantomJS 2 and IE 10 - 11 crashed when reporting SVG element equality
2018-11-04 10:31:33 +02:00
Gregg Van Hove
b3ccd4312c
Bump version to 3.3.0
2018-10-25 09:47:09 -07:00
Gregg Van Hove
5524207658
Add api docs for .not and .withContext
2018-10-24 16:49:31 -07:00
Gregg Van Hove
1b5e0c0c10
Merge branch 'expect-context'
...
- Fixes #641
2018-10-24 16:32:28 -07:00
Gregg Van Hove
2d303a6e46
Merge common async/sync expectation stuff
2018-10-24 16:17:30 -07:00
Gregg Van Hove
1e47dcf2cc
Pull async matchers out to their own functions
...
- Makes AsyncExpectation closer to Expectation
2018-10-23 16:02:31 -07:00
Gregg Van Hove
ba1e8f8008
Implement withContext for async expectations too
2018-10-22 16:42:36 -07:00
Gregg Van Hove
a91db0dfc2
more rejected to -> rejected with
2018-10-22 16:08:57 -07:00
Gregg Van Hove
1d130036f4
Merge branch 'master' into expect-context
2018-10-22 14:55:20 -07:00
Gregg Van Hove
e6a60a7bef
Merge branch 'codymikol-toBeRejectedWith'
...
- Merges #1615 from @codymikol
- Closes #1600
- Fixes #1595
2018-10-22 11:20:03 -07:00
Gregg Van Hove
fe042fdf82
Use toBeRejectedWith instead of toBeRejectedTo
2018-10-22 11:18:56 -07:00
Gregg Van Hove
06854fe435
Merge branch 'toBeRejectedWith' of https://github.com/codymikol/jasmine into codymikol-toBeRejectedWith
2018-10-22 11:15:05 -07:00
Gregg Van Hove
7b9fc80b8f
Merge branch 'tdurtschi-master'
...
- Merges #1616 from @tdurtshi
- Fixes #1614
2018-10-22 10:59:03 -07:00
Gregg Van Hove
3c47e71619
Also show tip for .not cases
2018-10-22 10:57:16 -07:00
Teagan Durtschi
7cbedcdda7
Add custom message for toBe() matcher when object equality check fails
2018-10-21 12:46:49 -04:00
Cody Mikol
3aa0115ae4
feat(toBeRejectedTo): implement toBeRejectedTo functionality
...
add functionality to determine whether a promise has been rejected to a
specific value via expectAsync
Fixes : #1595
2018-10-19 23:23:42 -04:00
Gregg Van Hove
440b6934aa
Merge branch 'codymikol-assertAsync-promiseLike-support'
...
- Merges #1613 from @codymikol
- Fixes #1612
2018-10-19 16:24:30 -07:00
Cody Mikol
591bf1144b
bugfix(assertAsync): add promiseLike support for angularJS promises
...
implement a promiseLike method so libraries using non-browser promise
implementations can still utilize assertAsync functionality.
Fixes : #1612
2018-10-18 21:28:32 -04:00
Gregg Van Hove
3ae61b14ad
Merge branch 'm1010j-m1010j-add-status-marks-to-standalone'
...
- Merges #1610 from @m1010j
- Fixes #1596
2018-10-01 12:25:23 -07:00
Matthias Jenny
705a6508d4
Add status marks to standalone
2018-09-26 21:10:20 -04:00
Gregg Van Hove
306882f636
Merge branch 'nitobuendia-patch-1'
2018-09-25 17:29:10 -07:00
Gregg Van Hove
16fef04629
Merge branch 'patch-1' of https://github.com/nitobuendia/jasmine into nitobuendia-patch-1
...
- Merges #1601 from @nitobuendia
- Fixes #1594
2018-09-25 17:28:57 -07:00
Gregg Van Hove
d180c2026e
Merge branch 'master' of https://github.com/Havunen/jasmine into Havunen-master
...
- Merges #1599 from @Havunen
2018-09-25 17:14:49 -07:00
Gregg Van Hove
92d0882a32
Introduce a configuration object to Env deprecating old single use functions
...
[finishes #159158038 ]
2018-09-25 17:08:41 -07:00
Nito Buendia
04679622b0
Add tests for formatting empty content errors.
2018-09-13 20:02:30 +08:00
Nito Buendia
b4cd1ec1ae
Format according to style.
2018-09-13 19:48:53 +08:00
Nito Buendia
963b1cca22
Add tests for new unnamed errors.
2018-09-13 19:48:10 +08:00
Nito Buendia
d4f9b41eda
Print error message when available
...
With the current set up, error message is only printed out when error name is available.
There are situations where the ErrorEvent object does not have a `name` property, but the message is still relevant.
For more details see #1594
2018-09-11 23:25:28 +08:00
Sampo Kivistö
1019b045cd
Optimized clearTimeout cpu usage
2018-09-06 21:11:05 +03:00
Gregg Van Hove
6b9ae2db7e
Merge pull request #1597 from limonte/patch-1
...
chore(package.json): http -> https
2018-09-04 12:27:05 -07:00
Limon Monte
33d8d2d3f4
chore(package.json): http -> https
2018-09-01 10:16:30 +03:00
Gregg Van Hove
12f56fdb7d
bump version to 3.2.1
2018-08-14 17:19:23 -07:00
Gregg Van Hove
afa18e554c
Correctly expost spyOnAllFunctions
...
- See #1581
2018-08-14 17:11:50 -07:00
Gregg Van Hove
7205d07c67
Merge pull request #1588 from fossabot/master
...
Add license scan report and status
2018-08-08 19:04:21 -07:00
Gregg Van Hove
83ba2eb4d6
Link to the correct repo in release notes
2018-08-08 17:41:24 -07:00
Gregg Van Hove
87865f00a3
Add issue links to release notes
2018-08-08 17:39:10 -07:00
Gregg Van Hove
112672c4a9
bump version to 3.2.0
2018-08-08 17:33:50 -07:00
fossabot
f05ab79731
Add license scan report and status
...
Signed-off-by: fossabot <badges@fossa.io >
2018-08-07 17:47:31 -07:00
Gregg Van Hove
3a52c444f8
Merge branch 'aeisenberg-spy-all'
...
- Merges #1581 from @aeisenberg
- Fixes #1421
2018-07-24 17:55:44 -07:00
Andrew Eisenberg
f62eb3b1a8
Add spyOnAllFunctions function
...
This function will spy on all writable and configurable functionss of
an object that is passed in. It can be used like this:
spyOnAllFunctions(obj);
This commit addresses https://github.com/jasmine/jasmine/issues/1421
2018-07-20 07:58:17 -07:00
Gregg Van Hove
110c092c9e
Fix regular expressions for different browsers
2018-06-18 17:55:24 -07:00
Gregg Van Hove
8bb0e2d494
Merge branch 'ikonst-set-timeout-error-message'
...
- Merges #1567 from @ikonst
2018-06-18 17:37:39 -07:00
Ilya Konstantinov
8c1b80daae
Improve Jasmine timeout error message
2018-06-18 17:36:43 -07:00
Steve Gravrock
ac07c9ea97
Simplified ExpectationFilterChain#modifyFailureMessage
2018-06-09 12:34:30 -07:00
Steve Gravrock
0842a80c68
Cleanup
2018-06-09 12:26:34 -07:00
Gregg Van Hove
e2895a92dc
Fix JSDoc naming for Env functions
...
- See #1565
2018-06-06 17:13:52 -07:00
Gregg Van Hove
03998c1b20
Add documentation for more public functions on Env
...
- Fixes #1565
2018-06-05 17:13:58 -07:00
Steve Gravrock
9472df0db4
Added a basic set of async matchers
...
- Fixes #1447
- Fixes #1547
2018-06-04 21:07:44 -07:00
Steve Gravrock
8a01e1f26c
.withContext() works with .not
2018-06-02 22:06:53 -07:00
Steve Gravrock
321f161ce5
Made ExpectationFilterChain immutable
2018-06-02 13:57:29 -07:00
Steve Gravrock
202a677637
ExpectationFilterChain WIP
2018-06-02 13:57:07 -07:00
Gregg Van Hove
8f7327cb4d
Properly cascade StopExecutionError's up the tree
...
- Fixes #1563
2018-05-30 17:32:14 -07:00
Gregg Van Hove
3636014917
Merge branch 'hide-grey-specs' of https://github.com/SamFare/jasmine into SamFare-hide-grey-specs
...
- Merges #1561 from @SamFare
2018-05-23 17:15:40 -07:00
SamFare
92d33c79c7
Implemented hiding of disabled specs
2018-05-22 13:30:33 +01:00
Steve Gravrock
e2897ce619
Added expect().withContext() to provide additional information in failure messages
2018-05-14 21:18:55 -07:00
Steve Gravrock
282c436463
Implemented matcher negation as a filter
2018-05-13 23:01:55 -07:00
Steve Gravrock
5cc22740c9
Test the public-ish interface
2018-05-13 22:48:58 -07:00
Steve Gravrock
533bda5d24
Split Expectation#wrapCompare into several smaller functions
2018-05-13 22:48:58 -07:00
Steve Gravrock
9fe9569b24
Additional tests for negated matcher failure messages
2018-05-13 22:48:20 -07:00
Steve Gravrock
e2d9eefccd
Line-break long expectation failure messages
...
This makes failures somewhat easier to read. We still preserve whitespace
within lines to make whitespace-only failures readable, e.g.
expect('foo bar').toEqual('foo bar'). See #296 .
2018-05-12 09:42:38 -07:00
Gregg Van Hove
ced2b114e4
Better detection of DOM Nodes for equality
...
- Also use JSDom if a real one isn't present to get some more coverage
there
- Fixes #1172
2018-05-04 18:01:08 -07:00
Gregg Van Hove
f7097281c9
IE doesn't support .name on a function
2018-05-03 17:34:15 -07:00
Gregg Van Hove
01a1113387
Merge branch 'yinm-fix-typo'
...
- Merges #1555 from @yinm
2018-05-03 17:21:18 -07:00
yinm
4d0b47ac4c
Fix typo from incimplete to incomplete
2018-05-03 17:46:49 +09:00
Gregg Van Hove
d6cfc4a9b5
Merge branch 'riophae-master'
...
- Merges #1551 from @riophae
2018-05-02 17:52:03 -07:00
Fangzhou Li
fbcdbf5ab1
Allow omitting the name argument: createSpy(func)
2018-04-29 06:07:22 +08:00
Gregg Van Hove
7e14a97371
Explicitly pass in timing functions in mock clock integration specs
...
- This way we can make sure that clear stack always works no matter
how long the suite in the spec is
[fixes #153518103 ]
2018-04-23 17:25:11 -07:00
Gregg Van Hove
c440d13754
Use the same global for everything in Env
...
- No longer use `getGlobal` for clearStack and QueueRunner
2018-04-13 17:14:48 -07:00
Gregg Van Hove
8e8f09b41f
Force reinstall bundler and include firefox again
2018-04-03 17:33:20 -07:00
Gregg Van Hove
1decb14807
Ensure rubygems is up-to-date on travis
...
- See travis-ci/travis-ci#8969
2018-04-03 17:13:27 -07:00
Gregg Van Hove
a978f50f1d
name new global status stuff correctly in API docs
2018-04-02 17:20:39 -07:00
Steve Gravrock
74287c578c
Check for accidental global variable creation
2018-03-25 12:01:50 -07:00
Steve Gravrock
7f1cdc2d02
Fixed global variable leak
...
- Fixes #1534
2018-03-25 12:00:56 -07:00
Steve Gravrock
847a959b13
Merge branch 'handle-rejection' of https://github.com/johnjbarton/jasmine
...
- Merges #1521 from @johnjbarton
2018-03-24 19:49:58 -07:00
Steve Gravrock
05015a8b3e
Correctly format stack traces for errors with multiline messages
...
- Fixes #1526
2018-03-10 12:03:08 -08:00
Steve Gravrock
6f960d8662
Merge branch 'better-array-errors' of https://github.com/majidmade/jasmine
...
- Merges #1527 from @majidmade
- Fixes #1485
2018-03-10 07:42:34 -08:00
Majid Razvi
11b8b59e03
Change message for extra elements at end of actual array. #1485
2018-03-10 00:05:07 -07:00
johnjbarton
f1ebe05f1d
Report unhandled rejections as globalErrors.
...
Extend existing support for uncaughtExceptions to unhandledRejections now that many tests are async.
2018-03-01 16:47:50 -08:00
Gregg Van Hove
85b2a8c6c4
add some links to more tutorials from the api docs
2018-03-01 10:48:18 -08:00
Gregg Van Hove
557fb4ed72
proper links in release notes
2018-02-27 12:01:28 -08:00
Gregg Van Hove
ee52023b3d
Bump version to 3.1
2018-02-27 11:57:20 -08:00
Gregg Van Hove
91296a44f2
Remove Safari 7 from Travis matrix
2018-02-27 11:10:07 -08:00
Gregg Van Hove
1923461b09
Ignore more browser fields when formatting Errors
...
- description from IE
- column from Safari
2018-02-27 09:52:19 -08:00
Gregg Van Hove
71116d3957
don't lock to 2.99 in dev
2018-02-27 09:33:10 -08:00
Gregg Van Hove
63cc7cafc8
Use Jasmine's arrayContains, instead of includes for better support
2018-02-26 17:57:37 -08:00
Gregg Van Hove
fdecf02472
Merge branch 'print_exception_properties' of https://github.com/jbunton-atlassian/jasmine into jbunton-atlassian-print_exception_properties
...
- Merges #1516 from @jbunton-atlassian
2018-02-26 17:48:28 -08:00
Gregg Van Hove
11f4d894a6
Merge branch 'node-load-errors'
...
- See #1519
2018-02-26 16:44:45 -08:00
James Bunton
1149d4edde
Use j$.pp instead of JSON.stringify() for pretty printing
2018-02-27 10:22:06 +11:00
James Bunton
9ee85c35d2
Remove duplicate ignored property
2018-02-27 10:21:50 +11:00
Steve Gravrock
0367ca5294
Merge branch 'patch-closing-statement' of https://github.com/Sylhare/jasmine
...
- Merges #1512 from @Sylhare
2018-02-23 19:17:50 -08:00
James Bunton
763a83c833
Display error properties for failed specs
2018-02-23 14:43:47 +11:00
sylhare
7fb53dcdfa
Fixing missing semi-colons
2018-02-21 09:01:24 -05:00
sgravrock
a9a112e88f
Fixed release notes link
2018-02-18 21:08:52 -08:00
sgravrock
0184808a86
Updated README for 3.0
2018-02-18 21:06:51 -08:00
Steve Gravrock
1ac2a6f608
Allow node to report load time errors
...
[Fixes #153466462 ]
2018-02-17 15:45:42 -08:00
Gregg Van Hove
785f62c7a0
Fix naming and check functions for empty/notEmpty specs
2018-02-15 17:43:03 -08:00
Gregg Van Hove
d8c154a2c6
Update empty and notEmpty specs for better IE11 support
2018-02-15 17:23:44 -08:00
Gregg Van Hove
c974c4740c
Merge branch 'master' of https://github.com/sjolicoeur/jasmine into sjolicoeur-master
...
- Merges #1460 from @sjolicoeur
2018-02-15 16:00:33 -08:00
Gregg Van Hove
2b27bd393f
Add API docs for async reporters
2018-02-15 14:36:29 -08:00
Gregg Van Hove
3b77f38188
Return <anonymous> for functions that have no actual words between keyword and (
...
- Also fixes a potential catastrophic backtracking if someone has
severely damaged their own `toString` during test execution.
2018-02-15 12:31:10 -08:00
Steve Gravrock
11827572d3
Moved toHaveClass matcher into core so that it can be used in Karma
...
- Fixes #1503
2018-02-13 17:09:42 -08:00
Gregg Van Hove
8326ecf919
Merge branch 'deprecation-object' of https://github.com/UziTech/jasmine into UziTech-deprecation-object
...
- Merges #1498 from @UziTech
2018-02-13 16:57:24 -08:00
Gregg Van Hove
cd6a0de852
Merge pull request #1505 from codetriage-readme-bot/codetriage-badge
...
Add CodeTriage badge to jasmine/jasmine
2018-02-13 09:48:37 -08:00
codetriage-readme-bot
148d94558d
Add CodeTriage badge to jasmine/jasmine
...
Adds a badge showing the number of people helping this repo on CodeTriage.
[](https://www.codetriage.com/jasmine/jasmine )
## What is CodeTriage?
CodeTriage is an Open Source app that is designed to make contributing to Open Source projects easier. It works by sending subscribers a few open issues in their inbox. If subscribers get busy, there is an algorithm that backs off issue load so they do not get overwhelmed
[Read more about the CodeTriage project](https://www.codetriage.com/what ).
## Why am I getting this PR?
Your project was picked by the human, @schneems. They selected it from the projects submitted to https://www.codetriage.com and hand edited the PR. How did your project get added to [CodeTriage](https://www.codetriage.com/what )? Roughly 8 months ago, [alopezsanchez](https://github.com/alopezsanchez ) added this project to CodeTriage in order to start contributing. Since then, 2 people have subscribed to help this repo.
## What does adding a badge accomplish?
Adding a badge invites people to help contribute to your project. It also lets developers know that others are invested in the longterm success and maintainability of the project.
You can see an example of a CodeTriage badge on these popular OSS READMEs:
- [](https://www.codetriage.com/rails/rails ) https://github.com/rails/rails
- [](https://www.codetriage.com/crystal-lang/crystal ) https://github.com/crystal-lang/crystal
## Have a question or comment?
While I am a bot, this PR was manually reviewed and monitored by a human - @schneems. My job is writing commit messages and handling PR logistics.
If you have any questions, you can reply back to this PR and they will be answered by @schneems. If you do not want a badge right now, no worries, close the PR, you will not hear from me again.
Thanks for making your project Open Source! Any feedback is greatly appreciated.
2018-02-13 10:29:49 -06:00
Gregg Van Hove
83beca6899
Merge branch '2.99-patch'
2018-02-09 09:32:09 -08:00
Gregg Van Hove
3c6308f1dc
Don't include the specs in the ruby gem
...
- Bump to 2.99.2 for gem
2018-02-09 09:22:35 -08:00
Tony Brix
6193bc113b
throw errors
2018-02-08 15:12:14 -06:00
Gregg Van Hove
fa6a80b76e
Merge branch 'master' of https://github.com/aptx4869/jasmine into aptx4869-master
...
- Merges #1501 from @aptx4869
2018-02-08 10:22:36 -08:00
Gregg Van Hove
c861f6c6c2
Merge pull request #1499 from bcaudan/patch-1
...
Fix release note typo
2018-02-08 10:16:57 -08:00
aptx4869
4fcd4099ad
Resolve merge conflict
...
Fixes #1500
2018-02-08 15:07:29 +08:00
Bastien Caudan
1d495587ff
Fix release note typo
2018-02-08 08:02:13 +01:00
Tony Brix
c859128537
add tests
2018-02-07 23:58:26 -06:00
Tony Brix
a8a5b839ab
allow adding a deprecation object
2018-02-07 22:44:32 -06:00
Gregg Van Hove
4e5d947faa
Also lock for selenium runner
2018-02-07 14:58:14 -08:00
Gregg Van Hove
c2603efeb4
Specify Jasmine Gem 2.99 tag for bundle install
2018-02-07 14:55:28 -08:00
Gregg Van Hove
fbec3cc230
Only show deprecation for catch exceptions if you tell Jasmine not to catch
...
- Fixes #1497
2018-02-07 14:47:10 -08:00
Gregg Van Hove
1acbd1ef96
Add notes for environments that have lost support
...
- #1495
2018-02-07 09:19:33 -08:00
Gregg Van Hove
3d8e379fa6
bump dev dependency for npm
2018-02-06 15:37:21 -08:00
Gregg Van Hove
55267e11f6
Make sure ruby version is a string when passing to sauce labs
2018-02-06 13:37:12 -08:00
Gregg Van Hove
09a6e3714a
Bump travis ruby version
2018-02-06 12:29:12 -08:00
Gregg Van Hove
8ec4d54685
no longer run specs for docs in CI
2018-02-06 11:54:25 -08:00
Gregg Van Hove
516fe68759
Merge branch '3.0-features'
2018-02-06 11:22:41 -08:00
Gregg Van Hove
4530f9431f
Generate combined file with new version numbers
2018-02-06 10:33:39 -08:00
Gregg Van Hove
d4b76a4d3b
version bump to 3.0
2018-02-06 09:33:49 -08:00
Gregg Van Hove
764d58a7f5
Merge branch 'master' into 3.0-features
...
- cleaning up 2.99 deprecations
2018-02-06 09:31:51 -08:00
Gregg Van Hove
9911d37f06
bump version to 2.99
2018-02-05 16:57:51 -08:00
Gregg Van Hove
32f99ef99d
Use Jasmine's arrayContains to look for duplicate deprecations
...
[#154746527 ]
2018-02-05 14:24:14 -08:00
Gregg Van Hove
c142490c69
Add deprecation messages for things that will change/break in 3.0
...
[#154746527 ]
2018-02-05 14:01:46 -08:00
Gregg Van Hove
24bf3489dc
Display deprecation warnings in HTML reporter
...
- Also no longer check for stack since IE doesn't do that
[#154746527 ]
2018-02-05 12:11:36 -08:00
Gregg Van Hove
5afe1222f4
Add ability to report deprecation warnings from within the suite
...
[#154746527 ]
2018-02-05 11:19:15 -08:00
Gregg Van Hove
274011ed03
Merge branch 'master' into 3.0-features
2018-02-02 16:33:38 -08:00
Gregg Van Hove
42e00b3bc5
Remove node modules from python wheel, and update languages
...
[finishes #87860474 ]
2018-01-31 14:23:32 -08:00
Gregg Van Hove
0eca06a33b
Now pass a navigation helper to HtmlReporter instead of click handlers
2018-01-30 14:30:28 -08:00
Gregg Van Hove
84953ec210
stop spec on failure should not default to true
2018-01-30 11:48:25 -08:00
Gregg Van Hove
e15f273f06
Replace old "catch exceptions" logic with proper fail fast with error reporting
...
- Option is called stopOnSpecFailure
[#85966014 ]
- See #414
- See jasmine/jasmine-npm#16
2018-01-30 11:36:56 -08:00
Gregg Van Hove
e908b67b19
Move explicit fail spec out of mock clock context and re-add the afterAll for IEs
2018-01-29 17:05:54 -08:00
Gregg Van Hove
46cc48ccfa
Detect an Error passed to done and add an expectation failure
...
- See #567
2018-01-29 16:46:30 -08:00
Gregg Van Hove
262a2fe674
Generate compiled jasmine.js for async reporters work
2018-01-29 14:02:02 -08:00
Gregg Van Hove
50cd6fdd68
Allow reporter callbacks to be asynchronous
...
[finishes #154673961 ]
- Fixes #842
Signed-off-by: Elenore Bastian <ebastian@pivotal.io >
2018-01-29 11:55:41 -08:00
Gregg Van Hove
341c6df6ea
Fix HTML reporter display for excluded specs
2018-01-29 10:00:15 -08:00
Elenore Bastian
3df9cc26d4
Update css for new reporter status
...
Signed-off-by: Gregg Van Hove <gvanhove@pivotal.io >
2018-01-26 15:27:35 -08:00
Gregg Van Hove
6b156ca6d1
Unify status for xdescribe and xit
...
- Ensure *All's only execute if at least one child will run
- Specs will report a status of `excluded` instead of disabled
[finishes #153967580 ]
- #1418
Signed-off-by: Elenore Bastian <ebastian@pivotal.io >
2018-01-25 16:17:31 -08:00
Elenore Bastian
07996b567f
Suite level errors are reported in failures list
...
[#150118881 ]
Signed-off-by: Gregg Van Hove <gvanhove@pivotal.io >
2018-01-23 15:39:11 -08:00
Gregg Van Hove
9a96396f65
Generate jasmine.js for suite reporting changes
...
Signed-off-by: Elenore Bastian <ebastian@pivotal.io >
2018-01-23 14:38:40 -08:00
Elenore Bastian
12a47f05bf
Suite level errors all report the same way (on suiteDone)
...
- For `beforeAll`, `afterAll`, and declaration errors
[#150118881 ] #1409
Signed-off-by: Gregg Van Hove <gvanhove@pivotal.io >
2018-01-23 10:15:28 -08:00
Gregg Van Hove
414e03bded
Setup createSpy in all specs where needed and finish renaming params
...
Signed-off-by: Elenore Bastian <ebastian@pivotal.io >
2018-01-22 14:21:52 -08:00
Gregg Van Hove
038ab87252
Merge branch 'custom-spy-strategy' into 3.0-features
2018-01-22 12:12:59 -08:00
Gregg Van Hove
f20f78f82b
Don't clobber previous custom plans with later plans
...
[finishes #37288941 ]
2018-01-22 12:10:24 -08:00
Gregg Van Hove
70bce55721
Bump version to 2.9.1
2018-01-19 17:51:18 -08:00
Gregg Van Hove
53529bdc9a
Clear timeouts when starting to process a milli instead of at the end
...
- Fixes #1482
2018-01-19 17:47:28 -08:00
Gregg Van Hove
c82e5947f5
Version bump to 2.9.0
2018-01-16 17:29:34 -08:00
Gregg Van Hove
f76b452816
Correctly check for Symbols, not Sets in AnythingSpec
2018-01-12 17:45:00 -08:00
Gregg Van Hove
91aab8e1b8
Merge branch 'Volox-ie11-sets-support'
...
- Merges #1478 from @Volox
- Fixes #1355
2018-01-12 17:33:51 -08:00
Volonterio Riccardo
486a64658f
Added complete support for Set also for IE11.
...
Fixes 1355
2018-01-12 12:18:35 +01:00
Gregg Van Hove
1dfdc89ba9
Merge branch 'ie11-maps-support' of https://github.com/Volox/jasmine into Volox-ie11-maps-support
...
- Merges #1477 from @Volox
- Fixes #1472
2018-01-11 17:50:56 -08:00
Gregg Van Hove
e2a191b116
Refactor QueueRunner and remove references to functions that Jasmine is done with
...
[finishes #56030214 ]
2018-01-11 17:20:13 -08:00
Volonterio Riccardo
085a1f8a16
Added complete support for Map also for IE11.
...
Fixes 1472
2018-01-11 18:13:24 +01:00
Steve Gravrock
cf2f922e30
Merge branch 'master' into 3.0-features
2018-01-10 15:28:55 -08:00
Steve Gravrock
aeeb5b7107
Bumped copyright dates
2018-01-10 10:16:02 -08:00
Steve Gravrock
170a6dce76
Made naming somewhat less confusing
2018-01-10 09:00:09 -08:00
Steve Gravrock
4934e420b2
Allow adding custom spy strategies
...
[#37288941 ]
2018-01-10 08:59:19 -08:00
Steve Gravrock
1085914a76
Extracted a SpyFactory to slim Env down a bit
2018-01-09 13:32:28 -08:00
Steve Gravrock
6f119c4e5a
Moved createSpy to env so it can be stateful
2018-01-09 10:16:02 -08:00
Steve Gravrock
298b5ba127
Moved createSpyObj to env so it can be stateful
2018-01-09 09:53:45 -08:00
Steve Gravrock
16e07a0e99
Add the ability to specify the strategy to use for a spy based on which parameters are passed
...
[Finishes #92260826 ]
2018-01-03 08:49:34 -08:00
Steve Gravrock
cb6de64e58
Fixed DelayedFunctionScheduler IE 8 compatibility issue
2018-01-02 18:17:23 -08:00
Steve Gravrock
f69949ebc0
Merge branch 'fix-1426' of https://github.com/leahciMic/jasmine
...
- Merges #1427 from @eahciMic
- Fixes #1426
2018-01-02 08:18:32 -08:00
Michael Leaney
1136fddcde
Remove .sort() and fix logic in test
2018-01-02 14:51:51 +08:00
Steve Gravrock
b943f6b736
Fixed SPEC HAS NO EXPECTATIONS warning in HTML reporter
...
[Finishes #153891435 ]
2017-12-23 11:14:37 -08:00
Steve Gravrock
b439e2fb37
Extracted results state management out of the HTML reporter
...
[#153891435 ]
2017-12-23 11:12:38 -08:00
Steve Gravrock
c79ce125c0
Merge branch 'node-timeouts' of https://github.com/chris--young/jasmine
...
- Merges #1470 from @chris--young
- Fixes #1469
2017-12-21 13:24:21 -08:00
Chris Young
62b815c485
Use timeout objects when in node
...
Fixes: https://github.com/jasmine/jasmine/issues/1469
2017-12-21 10:51:07 -08:00
Steve Gravrock
65b4499dec
In Jasmine's own tests, don't leak between jasmine and jasmineUnderTest
2017-12-20 12:08:22 -08:00
Steve Gravrock
f38527ff15
Removed IE 8 compatibility cruft from HtmlReporterSpec
2017-12-19 11:29:21 -08:00
Steve Gravrock
d742ada71d
Added links to re-run the suites containing a failing spec
...
[Finishes #25508053 ]
2017-12-19 11:29:18 -08:00
Steve Gravrock
b6cc34d9e9
Correctly remove spies of window.onerror on IE
2017-12-18 16:34:37 -08:00
Steve Gravrock
ef9f82a17d
Merge branch 'master' into 3.0-features
2017-12-18 09:48:17 -08:00
Steve Gravrock
d3a3cf1ff3
Collapsed StringPrettyPrinter into PrettyPrinter
...
We never really took advantage of the potential extensibility that the
split provided, and the boundary between the two was getting muddied
over time.
2017-12-18 09:43:25 -08:00
Steve Gravrock
c0d0513199
Stop serializing objects after hitting jasmine.MAX_PRETTY_PRINT_CHARS
2017-12-15 13:23:59 -08:00
Steve Gravrock
86a38fceb9
Truncate pretty printer output that is more than j$.MAX_PRETTY_PRINT_CHARS long
2017-12-13 08:09:22 -08:00
Steve Gravrock
c74af1d900
Reduced pretty printer limits to much smaller values
...
This should help prevent out of memory errors when printing large object
graphs. See #1291 and #1422 .
[#153257532 ]
2017-12-13 08:07:43 -08:00
Gregg Van Hove
8ea4c6d3a1
Update contributing for new naming of jasmineUnderTest
2017-12-11 17:25:27 -08:00
Gregg Van Hove
bdbaebc045
Update contributing for new naming of jasmineUnderTest
2017-12-11 17:24:38 -08:00
Steve Gravrock
2d33765cbf
Dogfood the toHaveClass matcher
...
[#153567695 ]
2017-12-11 16:00:29 -08:00
Steve Gravrock
bb0992bf5f
Added a toHaveClass matcher
...
[#153567695 ]
2017-12-11 15:59:59 -08:00
Steve Gravrock
ac5d8708b9
More informative pretty-printing of DOM elements
...
[Finishes ##153562618]
2017-12-11 08:25:13 -08:00
Steve Gravrock
eb93d38294
Allow jasmine-npm to handle its own load errors
...
[Fixes #153466462 ]
2017-12-08 09:17:10 -08:00
Steve Gravrock
0b5dce7d84
Removed CodeClimate badge & configuration
...
CodeClimate's recommendations have been a mix of irrelevant and
actively harmful for some time. The latest problem is that it applies
length and complexity requirements equally to all functions whether
they act as privacy scopes, namespaces, classes or just regular old
functions.
Static analysis tools are only worthwhile if their recommendations add
enough value to offset the cost of slogging through them -- in other
words, if the signal to noise ratio is high enough. CodeClimate hasn't
carried its own weight for a long time, and it's only gotten worse with
each recent update.
2017-12-07 21:29:59 -08:00
sjolicoeur
d90e20eb15
Added matchers: truthy, falsy, empty and notEmpty
2017-12-07 17:49:16 -08:00
Steve Gravrock
d16aa550cb
Treat random= as a no-op rather than disabling randomization
...
[#109197518 ]
2017-12-01 08:45:58 -08:00
Steve Gravrock
2200dd084d
Fixed build
2017-12-01 08:34:12 -08:00
Steve Gravrock
98ead94c51
Fixed spec failure on Chrome
2017-12-01 08:28:55 -08:00
Gregg Van Hove
21655a82c9
Use prototype for spy strategy for better memory management
...
- Also convert `identity` to a property from a method
2017-11-30 17:30:20 -08:00
Steve Gravrock
0183b1642d
Removed stray debugger statement
2017-11-30 07:53:59 -08:00
Steve Gravrock
18ed34e9be
Fixed failing specs
2017-11-29 09:32:12 -08:00
Steve Gravrock
f4caf27208
Fixed pending() for async/promise-returning specs
...
Fixes #1449 .
Fixes #1450 .
2017-11-29 08:57:29 -08:00
Steve Gravrock
a63172f53f
expect(null).toEqual(jasmine.any(Object)) no longer passes
...
[Finishes #153181443 ]
Fixes #1255 .
2017-11-29 08:10:01 -08:00
Steve Gravrock
9619acf91f
Extracted the predicate version of toThrowError into its own matcher
...
This simplifies the signature of each matcher to something that jsdoc
can actually handle.
[Finishes #20622765 ]
2017-11-28 14:30:06 -08:00
Gregg Van Hove
b7e4c1e779
Remove console.js altogether
...
[#80410262 ]
2017-11-21 17:27:21 -08:00
Gregg Van Hove
e5ada1d010
Add safari 10 and update readme to include edge
2017-11-20 17:24:52 -08:00
Steve Gravrock
d35b65cf79
Set version to 3.0.0-pre
2017-11-17 14:28:20 -08:00
Steve Gravrock
db615e4186
Determine overall status in core, not reporters
...
[#92261606 ]
[#78679648 ]
2017-11-17 14:24:12 -08:00
Steve Gravrock
5906a2c05c
Filter Jasmine frames from stack traces
...
[Finishes #2644992 ]
2017-11-13 15:49:01 -08:00
Steve Gravrock
59ad217954
Fixed bad travis.yml merge
...
Re-removed IE 8, IE 9, and Node 0.12.x from the testing matrix
2017-11-10 10:47:08 -08:00
Steve Gravrock
b0ec95c472
Merge branch 'master' into 3.0-features
2017-11-10 10:26:14 -08:00
Steve Gravrock
13b9e669bd
Merge branch 'feature/allow-callfake-to-be-async' of https://github.com/mrlannigan/jasmine into merge-test
...
- Merges #1448 from @mrlannigan
2017-11-10 10:01:45 -08:00
Julian Lannigan
2eef0747a0
Added test steps for other major node versions
...
addresses https://www.pivotaltracker.com/story/show/152685778
2017-11-10 10:23:02 -05:00
Julian Lannigan
7ac1244f58
changed tests to work in environments that dont support async/await
2017-11-10 10:17:48 -05:00
Steve Gravrock
6ef0e93880
Revert "Removed IE 8 and 9 from the testing matrix"
...
In case we end doing another 2.x release.
This reverts commit 0e95b04900 .
2017-11-09 20:57:01 -08:00
Julian Lannigan
2be5e0a962
Allowed async functions to be passed into spy#callFake
2017-11-09 19:59:23 -05:00
Steve Gravrock
a42f28c734
Removed checks for PhantomJS 1
...
v2 has been out for a long time, and v1 can no longer be easily installed.
2017-11-09 07:04:06 -08:00
Steve Gravrock
d58f3dac56
Test against multiple Node versions on Travis
2017-11-08 09:17:55 -08:00
Steve Gravrock
676689b063
Test against Node 4.x, not 0.10.x
2017-11-08 09:11:41 -08:00
Steve Gravrock
aaf226b9e3
Removed spec guards for versions of Safari we no longer support
2017-11-08 08:30:35 -08:00
Steve Gravrock
419470e9df
Removed support for IE <10
...
[#150527985 ]
2017-11-08 08:30:22 -08:00
Steve Gravrock
1526d5e2a8
Treat afterAll errors at any level as failures
...
[Finishes #152492514 ]
2017-11-07 20:48:23 -08:00
Steve Gravrock
a3cb010971
Removed remaining traces of the obsolete console reporter
...
[#80410262 ]
2017-11-07 20:09:04 -08:00
Steve Gravrock
278ef9228b
Removed obsolete console reporter from core
...
Anyone who was still using this should use the one in jasmine-npm
instead.
[Finishes #80410262 ]
2017-11-07 12:25:47 -08:00
Steve Gravrock
82eeed3c85
Improved reporting of load errors and afterAll errors
...
- Pass file and line number to reporters when present
- Show file and line number in the HTML reporter when present
- Visually separate adjacent errors in the HTML reporter
[#24901981 ]
2017-11-04 10:28:42 -07:00
Steve Gravrock
ae9b95269c
Load error handling doesn't depend on browser features, so test it everywher
...
[#24901981 ]
2017-11-02 18:17:40 -07:00
Steve Gravrock
285f06d5c4
Merge branch 'promise-matching-1314' of https://github.com/sderickson/jasmine
2017-11-02 17:18:24 -07:00
Steve Gravrock
3aece2ac74
Merge branch 'master' of https://github.com/b-3-n/jasmine
...
- Merges #1445 from @b-3-n
- Fixes #1444
2017-11-02 08:17:27 -07:00
sgravrock
3a9d4ee08d
Merge pull request #1440 from aaronang/patch-1
...
Add instruction to sync local master with upstream
2017-11-02 08:11:47 -07:00
Steve Gravrock
26a7bc6acf
Report loading errors as loading errors, not afterAll errors
...
[#24901981 ]
2017-11-01 14:09:29 -07:00
Steve Gravrock
7b8edcb401
HTML reporter reports overall failure if there are any global errors
...
[#24901981 ]
2017-11-01 11:44:58 -07:00
Steve Gravrock
395b2b2d97
Test against Edge
2017-10-31 21:50:42 -07:00
Steve Gravrock
bd250f27c7
Fail if error events (e.g. syntax errors) occur during loading
...
[#24901981 ]
2017-10-31 21:16:00 -07:00
Benjamin Mularczyk
b4dfdd7a48
Fix equality computation for ES6 Sets.
2017-11-01 01:01:26 +01:00
Steve Gravrock
12ed3bfacd
Allow use of a predicate function to validate thrown exceptions
...
[Finishes #20622765 ]
2017-10-30 08:51:25 -07:00
Steve Gravrock
324ad0073e
Refactored toThrowMatching to facilitate adding more strategies
...
* Extracted sub-matchers for the two major existing strategies
(matching all errors, and matching by type and/or message)
* Reduced the use of mutable state
2017-10-30 08:51:25 -07:00
Steve Gravrock
9f7a6ef061
Check truthiness of toThrowError args, not arg count
...
This enables some useful simplifications at the cost of making it
impossible (for now) to expect a function to throw an error with a falsy
message.
[#20622765 ]
2017-10-30 08:51:25 -07:00
sgravrock
908583c49b
Point CodeClimate at the right repo
2017-10-30 08:51:25 -07:00
Steve Gravrock
e31db20ec7
Default to running tests in random order
...
[Finishes #109197518 ]
2017-10-27 08:50:40 -07:00
Aaron Ang
c260c67e7e
Add instruction to sync local master with upstream
2017-10-26 04:56:44 -07:00
sgravrock
554d0efab7
Point CodeClimate at the right repo
2017-10-25 11:28:47 -07:00
Steve Gravrock
ea3cf14ef8
Exclude specs from CodeClimate ratings
...
CodeClimate makes recommendations that, while helpful for production
code, can be harmful for test code. In particular, following its
recommendations would lead us to aggressively de-duplicate even small
amounts of test setup code. That can create unwanted coupling, obscure
the intent of the tests, and make it harder to maintain tests as their
setup needs diverge.
2017-10-25 09:25:52 -07:00
Steve Gravrock
a4bdd47a8a
Merge branch 'unittests' of https://github.com/voithos/jasmine
...
- Merges #1437 from @voithos
2017-10-25 08:49:58 -07:00
Zaven Muradyan
89306551a0
Add some unit tests that exercise jasmine.anything() and Map matching.
...
Follow-up to some recent commits that fixed issues around
jasmine.anything() matching. This simply adds some extra tests that
exercise usage of Symbols with jasmine.anything() and as Map keys.
2017-10-24 22:39:31 -07:00
Steve Gravrock
0e95b04900
Removed IE 8 and 9 from the testing matrix
...
[#150527985 ]
2017-10-24 08:39:00 -07:00
Steve Gravrock
da91294182
Merge branch 'anything-fix' of https://github.com/voithos/jasmine
...
- Merges #1436 from @voithos
2017-10-24 08:26:13 -07:00
Steve Gravrock
bd41a97cd5
Merge branch 'anysymbol-fix' of https://github.com/voithos/jasmine
...
- Merge #1435 from @voithos
2017-10-24 08:18:42 -07:00
Zaven Muradyan
6d3953356d
Add special handling of asymmetric matcher objects as keys in Maps.
...
The previous Map equality code was assuming that the set of keys would
be identical between the two Maps. This change adds insertion-order
tracking for each key with its corresponding key. If one of the two keys
is an asymmetric equality obj, the keys are eq()'d, and if it succeeds,
the corresponding values are compared. Otherwise, the "main" key is
looked up directly in the other object; this is to prevent
similar-looking obj keys with different obj identities from comparing
equal.
Fixes #1432 .
2017-10-23 23:01:50 -07:00
Zaven Muradyan
62f769767a
Add support for jasmine.any(Symbol).
...
The original asymmetric matcher code for Any did not work with symbols
since `symbolInstance instanceof Symbol` is actually `false` (but,
`symbolInstance.constructor` is `Symbol). This simply adds an extra
clause that explicitly checks for symbol (if available) like the other
primitive types.
Also added some missing specs for other types, like Map, Set, etc.
Fixes #1431 .
2017-10-23 20:07:56 -07:00
Steve Gravrock
03f7f76bca
Removed Safari 6 from the test matrix
...
Sauce Labs no longer supports Safari <7.
2017-10-23 12:05:52 -07:00
Steve Gravrock
4c6dadb9b1
Merge branch 'github-1295' of https://github.com/ksvitkovsky/jasmine
...
- Merges #1411 from @ksvitkovsky
2017-10-23 11:58:30 -07:00
Gregg Van Hove
8973e4e44f
Ignore package-lock.json
...
We want to make sure that Travis checks against the latest version of
our dependencies, and also maintain compatibility across multiple
versions of Node.
Signed-off-by: Steve Gravrock <sgravrock@pivotal.io >
2017-10-23 11:53:48 -07:00
Steve Gravrock
b7e9594c86
Merge branch 'jasmine-deep-clone-args' of https://github.com/aj-dev/jasmine
...
- Merges #1424 from @aj-dev
2017-10-23 11:32:58 -07:00
Steve Gravrock
6c363f11b3
Merge branch 'lintfix' of https://github.com/voithos/jasmine
...
- Merges #1428 from @voithos
2017-10-23 11:01:18 -07:00
sgravrock
0f650e1d03
Merge pull request #1429 from voithos/docfix
...
Fix "Before Committing" section of CONTRIBUTING.md.
2017-10-23 10:46:06 -07:00
Zaven Muradyan
78fe42ac2d
Fix "Before Committing" section of CONTRIBUTING.md.
...
The old contributing docs had a misaligned nested unordered-list, which
resulted in it creating a new list instead of being nested under its
parent.
It also seems like it would be useful to have the "revert your changes"
prose as part of the "Before Committing" section, since otherwise people
may miss it and have to amend.
2017-10-15 22:48:57 -07:00
Zaven Muradyan
20d86b2a00
Fix lint warning in CallTracker.
...
The previous code was using `== null` to handle both `null` and
`undefined`, resulting in a jshint warning. The conditional is meant to
check for non-primitive values, and it happens to be the case that a
falsey value in JS is always a primitive, or `null` or `undefined`.
2017-10-15 12:31:54 -07:00
Michael Leaney
516e00d7ba
Fix #1426 clearTimeout not correctly clearing a timeout
...
clearTimeout was not correctly handling the case of clearing a
timeout that is also scheduled to run at the same tick.
This fix adds a deletedKeys array that is checked whilst we are
running the scheduled functions for the current clock tick. If
a function exists in deletedKeys it will not be ran. deletedKeys
is then reset to an empty array.
2017-10-11 20:54:56 +08:00
Michael Leaney
c1957ecd7c
Add test
2017-10-11 20:29:27 +08:00
Audrius Jakumavicius
1f6c91de7c
Deep clone args before passing them to reporters
2017-10-07 01:32:39 +02:00
Gregg Van Hove
f6342ad4fe
Add a note about defineProperty for spyOnProperty
...
- Fixes #1415
2017-08-24 12:22:11 -07:00
Gregg Van Hove
8cf8736cab
bump version to 2.8.0
2017-08-24 11:41:41 -07:00
Gregg Van Hove
6d0f0ed915
Only use the extra setTimeout outside of IE8.
2017-08-10 16:38:13 -07:00
ksvitkovsky
7ca571a746
Remove runnable parameter for simplicity
2017-08-10 23:08:59 +04:00
ksvitkovsky
4240b3514b
Check runnable instead of suite
2017-08-10 22:58:30 +04:00
ksvitkovsky
ab116fbd0f
Throw an error on nested methods
2017-08-10 22:05:13 +04:00
ksvitkovsky
da2673e02f
Test nested methods to throw an error
2017-08-10 22:05:13 +04:00
Gregg Van Hove
b2dee5cb1c
Create CODE_OF_CONDUCT.md
2017-08-10 10:38:05 -07:00
Gregg Van Hove
1414281cff
Merge branch 'github-1221' of https://github.com/ksvitkovsky/jasmine into ksvitkovsky-github-1221
...
- Merges #1412 from @ksvitkovsky
- Fixes #1221
2017-08-09 17:20:54 -07:00
Gregg Van Hove
2588b442e6
Integration specs that actually execute a suite need to be async
2017-08-09 11:51:26 -07:00
Gregg Van Hove
af41e5ea5c
Properly wait until test env has completed before moving on.
2017-08-09 11:43:55 -07:00
Gregg Van Hove
8834142198
Update jsApiReporter docs to link to new suite and spec results
2017-08-09 10:36:53 -07:00
Gregg Van Hove
1926fc11ae
Add jsdocs for reporter events
2017-08-09 10:21:59 -07:00
ksvitkovsky
e7049d3183
Add 'nothing' matcher and tests
2017-08-09 16:44:19 +04:00
Gregg Van Hove
80dba1138a
Add explicit docs for the callback function passed to it etc.
2017-08-08 17:28:36 -07:00
Gregg Van Hove
9811ff71d2
Update afterAll documentation
...
- See jasmine/jasmine.github.io#76
2017-08-08 14:37:45 -07:00
Gregg Van Hove
301dd4f6b5
Merge branch 'kiewic-kiewic/toEqualArrayDiff'
...
- Closes #1375 from @kiewic
2017-08-08 09:55:32 -07:00
Gilberto Stankiewicz
090a6234c3
Make toEqual matcher report the difference between array elements when arrays have different length
2017-08-08 09:55:17 -07:00
Gregg Van Hove
8ad9abb19a
Add arrayWithExactContents asymmetric matcher
...
- Fixes #817
2017-08-04 12:07:09 -07:00
Gregg Van Hove
8c0a8a1b33
Merge branch 'ksvitkovsky-github-1388'
...
- Closes #1408 from @ksvitkovsky
- Fixes #1388
2017-08-04 10:27:55 -07:00
ksvitkovsky
1db81c334d
Ensure no message added on asym. match success
2017-08-04 10:26:51 -07:00
Gregg Van Hove
8dd0ad531c
Merge branch 'ksvitkovsky-github-1403'
...
- Closes #1407 from @ksvitkovsky
- Fixes #1403
2017-08-04 09:55:09 -07:00
ksvitkovsky
f58002f0a6
Better primitives detection for saveArgsByValue
2017-08-04 09:40:42 -07:00
Gregg Van Hove
4d18e63b0f
Merge branch 'ksvitkovsky-github-1180'
...
- Closes #1404 from @ksvitkovsky
- Fixes #1180
2017-08-04 09:34:16 -07:00
ksvitkovsky
4fc177d5ae
Better pretty printing for typed arrays
2017-08-04 09:33:05 -07:00
Gregg Van Hove
acc8c23bf4
Merge branch 'theefer-fix-map+set-comparison'
...
- Merges #1406 from @theefer
- Fixes #1402
2017-08-04 09:23:31 -07:00
Sébastien Cevey
fc6ee243e9
Rewrite ES6 Set and Map comparison to ignore insertion order
2017-08-02 15:22:33 +01:00
Gregg Van Hove
b256741bec
bump version to 2.7.0
2017-07-27 17:47:20 -07:00
Gregg Van Hove
1d4a2b5c22
Merge branch 'user-context' of https://github.com/darthjee/jasmine into darthjee-user-context
...
- Merges #1400 from @darthjee
2017-07-26 17:18:02 -07:00
darthjee
b0aac6b852
Add class UserContext
2017-07-26 23:40:22 +02:00
Gregg Van Hove
543e056056
Merge branch 'jberney-master'
...
- Merges #1399 from @jberney
2017-07-24 17:13:21 -07:00
Jonathan
7dfc5f506c
Send unfocused tests through the same queue as focused tests
2017-07-23 09:01:15 -07:00
Gregg Van Hove
4cce7263c4
Update github issue and PR templates
2017-07-22 09:34:58 -07:00
Gregg Van Hove
31164106e5
Get the casing right for IE8
2017-07-18 21:51:32 -07:00
Gregg Van Hove
f71218a44b
Allow IE8 to be weird when pretty printing
2017-07-18 21:07:38 -07:00
Gregg Van Hove
22e9d6df20
PrettyPrinter allows an object to have a toString that isn't a function
...
- Fixes #1389
2017-07-17 22:01:06 -07:00
Scott Erickson
6ddf64568e
Add Promise checking to eq
...
Fixes #1314
2017-06-26 19:10:19 -07:00
Alpha Chen
aa72b0b7cf
Simplified rounding code in toBeCloseTo
...
Signed-off-by: Steve Gravrock <sgravrock@pivotal.io >
2017-06-26 10:22:54 -07:00
Alpha Chen
9f3952ff87
Merge branch 'vanduynslagerp-fix-tobecloseto'
...
- Fixes #1382
Signed-off-by: Alpha Chen <achen@pivotal.io >
2017-06-26 10:21:13 -07:00
Pierre Vanduynslager
c604012793
Fix rounding in toBeCloseTo
2017-06-25 16:59:24 -04:00
Gregg Van Hove
6aa069d586
IE 8&9 use setTimeout to clearStack so mock clock gets tricky
2017-06-20 10:29:19 -07:00
Steve Gravrock
585287b9d6
When stop on failure is enabled, skip subsequent it() and beforeEach().
...
Note: afterEach() functions are still run, because skipping them is
highly likely to pollute specs that run after the failure.
[Finishes #92252330 ]
- Fixes #577
- Fixes #807
2017-06-19 13:48:43 -07:00
Gregg Van Hove
de862f8133
Only clear out the spec param for Run all link
...
- Fixes #1369
2017-06-16 14:07:40 -07:00
Gregg Van Hove
4e3ae726aa
Bump version to 2.6.4
2017-06-16 13:44:43 -07:00
Steve Gravrock
9ee7b4ee0b
Don't setTimeout() every time the stack is cleared via MessageChannel()
2017-06-16 09:58:41 -07:00
Gregg Van Hove
2e737f50ca
Don't use window
2017-06-15 14:32:18 -07:00
Gregg Van Hove
c60d669940
Break into a setTimeout every once in a while
...
- Allows the CPU to run other things that used the real `setTimeout`
- Fixes #1327
- See #1334
- Fixes jasmine/gulp-jasmine-browser#48
2017-06-15 14:24:40 -07:00
Gregg Van Hove
4c491b2dc0
Pretty printer will now use MAX_PRETTY_PRINT_ARRAY_LENGTH for objects
...
- Fixes #1291
- Fixes #1360
2017-06-14 13:36:35 -07:00
Gregg Van Hove
f9d1e2f280
Merge branch 'EsrefDurna-master'
...
- Merges #1368 from @EsrefDurna
2017-06-12 14:03:11 -07:00
Esref Durna
270475bc61
updated package glob from 7.0.5 to 7.1.2
...
Npm link : https://www.npmjs.com/package/glob
Repository link : https://github.com/isaacs/node-glob/releases
2017-06-12 00:35:07 +00:00
Gregg Van Hove
acb9989178
Merge branch 'patch-1' of https://github.com/kant/jasmine into kant-patch-1
...
- Fix bower.json url to be https instead of http
- Merges #1365 from @kant
2017-06-07 14:22:24 -07:00
Gregg Van Hove
1fe1bbb6ed
Merge branch 'master' of https://github.com/beatrichartz/jasmine into beatrichartz-master
...
- Merges #1362 from @beatrichartz
2017-06-07 14:16:48 -07:00
Gregg Van Hove
994878e6f6
bump version to 2.6.3
...
- cherry-pick release notes, etc.
2017-06-07 14:15:21 -07:00
Steve Gravrock
f7c160d716
Fixed HTML snippet in README
...
Closes #1366 .
2017-06-06 15:57:45 -07:00
Gregg Van Hove
578f63b9bd
Make sure the queue runner goes async for async specs
...
- Even if `done` is called synchronously.
See #1327 #1334 jasmine/gulp-jasmine-browser#48
2017-06-06 14:29:02 -07:00
Darío Hereñú
b1190eefb9
Minor fix
2017-06-04 00:40:53 -03:00
Beat Richartz
271908a2c4
Fail when one of the arguments passed into toBeCloseTo matcher is null
2017-06-02 15:36:39 +01:00
Gregg Van Hove
3372af1cf1
Merge branch 'seed-reporting' of https://github.com/sgravrock/jasmine into sgravrock-seed-reporting
...
- Merges #1348 from @sgravrock
2017-05-23 14:12:49 -07:00
Gregg Van Hove
d355fa0806
Don't tick extra. It's breaking IE 8 & 9
2017-05-22 14:27:08 -07:00
Steve Gravrock
56a79bef98
Use a less ancient Node on Travis CI
2017-05-19 15:47:54 -07:00
Gregg Van Hove
2ea4e9507c
Merge branch 'map-support' of https://github.com/rmehlinger/jasmine into rmehlinger-map-support
...
- Merges #1340 from @rmehlinger
- Fixes #1257
2017-05-19 14:19:14 -07:00
Gregg Van Hove
c848a66faa
Merge branch 'promises' of https://github.com/sgravrock/jasmine into sgravrock-promises
...
- Merges #1356 from @sgravrock
- Fixes #1336
- Fixes #1270
- Fixes #1350
- Fixes #1320
2017-05-19 14:03:21 -07:00
Gregg Van Hove
99fd7ddb88
Update python release instructions
...
- so I don't have search my bash history
2017-05-17 17:35:23 -07:00
Gregg Van Hove
5d1d19f494
Bump version to 2.6.2
2017-05-17 17:24:16 -07:00
Steve Gravrock
4f49288f31
Built distribution
...
- Fixes #1327
- Fixes jasmine/gulp-jasmine-browser#48
2017-05-16 14:36:35 -07:00
Steve Gravrock
b9adc76dc7
Clear the stack if onmessage is called before the previous invocation finishes
2017-05-16 14:08:58 -07:00
Steve Gravrock
9672689d40
Added support for ES2017 async functions
2017-05-12 14:42:14 -07:00
Steve Gravrock
a237ac5386
Added support for async before/it/after functions that return promises
2017-05-11 14:31:09 -07:00
Gregg Van Hove
5ac3e21abb
Merge branch 'interleaved-suites' of https://github.com/sgravrock/jasmine into sgravrock-interleaved-suites
...
- Merges #1352 from @sgravrock
- Fixes #1344
- Fixes #1349
2017-05-10 13:49:05 -07:00
Steve Gravrock
88763012e4
Unified async and async queueable function running code
2017-05-10 10:14:47 -07:00
Steve Gravrock
b1e97cfb09
Correctly route errors that occur while a QueueRunner is clearing stack
...
Besides surfacing the error in the hopefully-correct place, this also
prevents the queue runners for sibling suites from interleaving, which
in turn prevents all kinds of internal state corruption.
Signed-off-by: Gregg Van Hove <gvanhove@pivotal.io >
2017-05-09 15:01:18 -07:00
Gregg Van Hove
8e5823c0d2
Merge branch 'sgravrock-global-errors-rethrow'
...
- Merges #1347 from @sgravrock
2017-05-08 14:15:34 -07:00
Steve Gravrock
e6a7932ec1
Report the random seed at the beginning and end of execution
...
This allows reporters to provide the seed to the user even in cases
where Jasmine crashes before completing.
2017-05-08 12:09:17 -07:00
Steve Gravrock
10f1220e55
Don't mask errors that occur when no handlers are installed
...
It's possible for async code to cause an error when Jasmine
doesn't have any listeners registered internally. This causes
Jasmine to crash (Node) or log to the console (browser)
because of trying to call the nonexistent handler. This change
doesn't fix the overall problem but it does ensure that the
original error is logged rather than Jasmine's internal error.
2017-05-08 11:09:32 -07:00
rmehlinger
5ee03f02ed
Add ES6 map support to Jasmine
2017-05-01 00:12:48 -07:00
Gregg Van Hove
2835ca3cce
Bump version to 2.6.1
2017-04-26 14:18:15 -07:00
Gregg Van Hove
120c484419
Merge branch 'patch-1' of https://github.com/reinrl/jasmine into reinrl-patch-1
...
- Merges #1319 from @reinrl
2017-04-26 14:06:18 -07:00
Gregg Van Hove
1d62504534
Check for process.listeners as well, for GlobalErrors
...
- Fixes #1333
2017-04-26 13:54:07 -07:00
Gregg Van Hove
055d88eff8
Merge branch 'UziTech-ensure-function-or-undefined'
...
- Merges #1329 from @UziTech
- Fixes #1328
2017-04-26 13:50:11 -07:00
Tony Brix
d2b33e0c66
allow undefined as function
2017-04-26 13:49:13 -07:00
Gregg Van Hove
0c7f36a181
Merge branch 'UziTech-remove-evil'
...
- Merges #1330 from @UziTech
- Fixes #1325
2017-04-26 13:36:06 -07:00
Tony Brix
686d8157e5
remove eval to create spy wrapper
2017-04-26 13:34:32 -07:00
Gregg Van Hove
b771c083cb
No longer try to use nextTick since node.js gets upset
2017-04-25 14:38:09 -07:00
Gregg Van Hove
fbd2ffc08b
Build distribution for keys lookup fix
2017-04-25 14:35:58 -07:00
Gregg Van Hove
b3c8fb9797
Merge branch 'seanparmelee-keys-fix'
...
- Merges #1326 from @seanparmelee
- Fixes #1321
- Fixes #1324
2017-04-25 13:47:53 -07:00
Sean Parmelee
ef3cfe7f44
skip the test when we can’t get the propertyDescriptor
2017-04-25 12:27:32 -05:00
Sean Parmelee
0d6ecbec17
iterate through keys with a regular for loop
2017-04-25 11:28:16 -05:00
Rich Rein
7e4b8d4531
Update README.md
...
Made installation instructions more version-agnostic (using {#.#.#} instead of what was hard-coded to 2.0.0), corrected example HTML file (../jasmine-core/... instead of ../jasmine-2.0.0/... in the paths for the core files).
2017-04-24 12:43:40 -05:00
Gregg Van Hove
4b696fbf26
Bump version to 2.6.0
2017-04-19 14:14:39 -07:00
Gregg Van Hove
74511f5425
Merge pull request #1316 from rachelcarmena/update-introduction-url
...
Updating introduction url to last version
2017-04-17 13:51:33 -07:00
Rachel
3e912f7f4e
Updating introduction url to last version
2017-04-17 20:30:13 +02:00
Gregg Van Hove
19b83a7434
Throw a recognizable Error message when fail outside of a spec.
...
Fixes #1017
2017-04-11 12:02:29 -07:00
Gregg Van Hove
98569ba0f3
Cache installed gems, so they don't need to be installed every time.
...
- See https://docs.travis-ci.com/user/caching/#Caches-and-build-matrices
2017-04-10 13:52:24 -07:00
Gregg Van Hove
7f11ecb62e
Merge branch '1123-custom-error' of https://github.com/deckar01/jasmine into deckar01-1123-custom-error
...
- Merges #1298 from @deckar01
- Fixes #1123
2017-04-10 13:47:31 -07:00
Gregg Van Hove
97f8db0616
Merge branch 'gdborton-afterAll-order'
...
- Merges #1312 from @gdborton
- Fixes #1311
2017-04-10 13:37:04 -07:00
Gary Borton
50880fcff7
[lifecycle hooks] Make afterAll hooks operate in the fashion as afterEach.
...
It was discovered that afterAll hooks run in the same order that you add them,
while afterEach hooks were running in reverse order. This commit makes their
order consistent, and adds regression tests.
Relevant issue - https://github.com/jasmine/jasmine/issues/1311
2017-04-10 07:03:37 -07:00
Gregg Van Hove
ddcae84480
Merge branch 'issue-1294' of https://github.com/toubou91/jasmine into toubou91-issue-1294
...
- Merges #1300 from @toubou91
- Fixes #1294
2017-04-07 17:42:17 -07:00
Gregg Van Hove
9d6a95d9ba
Merge pull request #1301 from toubou91/gitignore-update
...
Gitignore update
2017-04-07 17:28:39 -07:00
Thodoris Bais
0d3b2b2f8e
Added iml files to gitignore
2017-04-04 07:20:10 +02:00
Thodoris Bais
08f046c24c
Added infinity methods, with tests
2017-03-27 00:04:43 +02:00
Jared Deckard
90c87140ac
Expect an undefined error to be passed to the expectation result
2017-03-24 14:50:54 -05:00
Jared Deckard
25d9a396aa
Test that custom matchers can supply custom errors
2017-03-24 14:12:33 -05:00
Jared Deckard
c42b1972e2
Allow the matcher provide a custom error message
2017-03-24 14:12:33 -05:00
Gregg Van Hove
7f8f2b5e7a
Update jsDocs to something close to full coverage for public API
...
- #596
2017-03-23 12:20:08 -07:00
Gregg Van Hove
9cb2f06aa6
Add a first pass at jsdoc.
...
[##130415655] #596
2017-03-21 11:36:41 -07:00
Gregg Van Hove
a37b6c0d32
Merge branch 'master' of https://github.com/mmmichl/jasmine into mmmichl-master
...
- Merges #1283 from @mmmichl
2017-03-14 17:50:28 -07:00
Gregg Van Hove
5533d1a920
Fix casing for PhantomJS is userAgent check
2017-03-14 14:43:44 -07:00
Gregg Van Hove
75e652d6a7
Cleanup toThrowError constructor lookup to work in older IE
...
- Also use the existing browser detection for phantom
2017-03-14 14:26:17 -07:00
Gregg Van Hove
e1f7ca51da
Merge branch 'issue-1252' of https://github.com/anseki/jasmine into anseki-issue-1252
...
- Merges #1275 from @anseki
- Fixes #1252
2017-03-10 14:36:22 -08:00
Gregg Van Hove
538ae7b9ac
Merge branch 'foretagsplatsen-toHaveBeenCalledBefore'
2017-03-10 09:57:21 -08:00
Gregg Van Hove
2ea41d3e27
Merge branch 'toHaveBeenCalledBefore' of https://github.com/foretagsplatsen/jasmine into foretagsplatsen-toHaveBeenCalledBefore
...
- Merges #1242 from @DamienCassou
2017-03-10 09:57:03 -08:00
Gregg Van Hove
bd9ae3a25b
Fix syntax error
2017-03-07 17:05:12 -08:00
Gregg Van Hove
1042c9a2dd
Collect unhandled exceptions and pass them to the current runnable
...
Fixes #529
Fixes #937
2017-03-07 16:32:11 -08:00
Gregg Van Hove
92e7436db2
Make sure the unlink is explicitly synchronous
2017-03-07 14:07:37 -08:00
Gregg Van Hove
74fe7fb85b
Only have code climate grade the src
2017-03-01 16:29:10 -10:00
Gregg Van Hove
7e0fd79b3b
Exclude some more stuff from codeclimate
2017-03-01 16:18:40 -10:00
mmmichl
8807bbb850
Pretty print objects passed to fail method
...
Fixes #1090
2017-02-26 19:25:02 +01:00
Damien Cassou
c93f35fbc8
fixup! Add toHaveBeenCalledBefore matcher
2017-02-20 10:55:23 +01:00
Damien Cassou
4cfdd06700
Add toHaveBeenCalledBefore matcher
...
This matcher makes sure the 'actual' spy is called before the
'expected' spy.
This code has been written in cooperation with Benjamin Van Ryseghem.
2017-02-20 09:52:14 +01:00
anseki
19b89d437e
Skip a spec in PhantomJS that has bugs about iframe
2017-02-16 14:50:24 +09:00
Gregg Van Hove
43f96d3ecd
Update gem authors
2017-02-15 17:00:17 -08:00
Gregg Van Hove
ac42bd9b35
More emeritus maintainers
2017-02-15 16:54:28 -08:00
Gregg Van Hove
9fbd0ba551
Nicer error messages for spyOn when null is provided
...
Fixes #1258
2017-02-15 15:55:27 -08:00
Gregg Van Hove
52876a7bf2
Merge branch 'bugfix-non-fn-args' of https://github.com/voithos/jasmine into voithos-bugfix-non-fn-args
...
- Merges #1222 from @voithos
- Fixes #1004
2017-02-15 15:18:50 -08:00
Gregg Van Hove
2eec3427e8
Re-generate files for new year in copyright
...
- Also read from env variable for sauce connect path
2017-02-15 15:15:58 -08:00
anseki
ed23254865
fix #1252
2017-02-10 17:17:39 +09:00
Gregg Van Hove
137e7e94d3
Merge pull request #1249 from Scottkao85/patch-1
...
Update MIT.LICENSE for new year
2017-01-02 12:14:44 -08:00
Gregg Van Hove
923b8fe9c4
Merge pull request #1248 from Nebojsaa/patch-1
...
Update README.md for new year
2017-01-02 12:14:27 -08:00
Scott Kao
61cc1eec66
Update MIT.LICENSE
...
update copyright year to 2017
2017-01-02 10:52:58 -08:00
Nebojsa Komnenovic
04be4c4583
Update README.md
2017-01-02 16:13:17 +01:00
Zaven Muradyan
b59ac96b51
Require arguments to beforeEach, it, etc, to be actual functions
2016-12-27 23:53:35 -08:00
Gregg Van Hove
be6ff8b24c
Remove unused message param from Suite#pend
...
- See #1132
2016-12-02 10:08:39 -08:00
Gregg Van Hove
da2005fe97
Merge branch 'beforeall-in-xdescribe' of https://github.com/voithos/jasmine into voithos-beforeall-in-xdescribe
...
- Merges #1225 from @voithos
- Fixes #1175
2016-12-02 09:56:36 -08:00
Ben Christel
41a813521b
Fix tests for toEqual diff output in IE
...
- Merges #1236 from @benchristel
2016-11-30 15:34:39 -08:00
Gregg Van Hove
54e7a82ef3
Merge branch 'benchristel-eq-diffs'
...
- Merges #1163 from @benchristel
- Fixes #675
2016-11-16 18:01:42 -08:00
Ben Christel
d5e6bf47ed
Make toEqual matcher report the difference between objects
...
- Mismatches deep within object/array structures are pinpointed with a JsonPath-like syntax.
2016-11-14 22:08:34 -08:00
Gregg Van Hove
5a76e59d5b
Merge branch 'spyOnProperty2' of https://github.com/celluj34/jasmine into celluj34-spyOnProperty2
...
- Merges #1203 from @celluj34
- Merges #1008 from @smacker
- Fixes #943
2016-11-04 14:36:56 -07:00
Gregg Van Hove
f5cfa2a4c1
Merge branch 'master' of https://github.com/d-reinhold/jasmine into d-reinhold-master
...
- Merges #1046 from @d-reinhold
- Fixes #510
2016-11-04 10:29:09 -07:00
Zaven Muradyan
c21bdaf35d
Fix bug where before/afterAll were being executed in disabled suites.
2016-10-23 20:40:58 -07:00
Pivotal
369e8cc08b
Merge branch 'mockMethodsShortcut' of https://github.com/mbildner/jasmine into mbildner-mockMethodsShortcut
...
- Merges #1101 from @mbildner
2016-10-17 15:53:05 -07:00
Gregg Van Hove
0e9b9a11c3
Fix tests for new stack clearing in IE
2016-10-14 15:53:00 -07:00
Gregg Van Hove
9750ae59e7
Update env integration specs now that we're really async
2016-10-14 10:13:27 -07:00
Gregg Van Hove
2f01f64249
Build distribution for clear stack implemenation
2016-10-14 09:48:11 -07:00
Gregg Van Hove
17c89c69d6
Separate clear stack and run it after each spec
...
[finishes #50197985 ][fix #109418332 ]
- Fixes #985
- Fixes #945
- Fixes #366
2016-10-14 09:21:49 -07:00
Gregg Van Hove
d85d6dd4b8
Now that it's valid syntax, make the specs work right with for
2016-09-28 12:19:18 -07:00
Gregg Van Hove
ff85714b24
syntax for a for loop is different than forEach
2016-09-28 11:52:18 -07:00
Gregg Van Hove
0d1a9a72d9
Fix spy arity stuff to work in IE8
2016-09-28 11:49:07 -07:00
Gregg Van Hove
63cc6687ff
require newer jasmine-npm
2016-09-28 11:04:01 -07:00
Gregg Van Hove
75a5681c5e
Merge branch 'kapke-spy-arity-preservation'
2016-09-28 10:52:17 -07:00
Gregg Van Hove
9df1edbdc9
Use the passed in env to pend browsers so IE8 works
2016-09-28 10:40:53 -07:00
Gregg Van Hove
5279e7a8c4
Checking for Set isn't browser dependant
2016-09-27 16:11:43 -07:00
Gregg Van Hove
c2e2bd7c91
Merge branch 'spy-arity-preservation' of https://github.com/kapke/jasmine into kapke-spy-arity-preservation
...
- Merges #1055 from @kapke
- Fixes #991
2016-09-27 15:42:45 -07:00
Gregg Van Hove
bad9c63bf7
Properly skip Set tests in browsers that don't really support it
2016-09-27 15:36:01 -07:00
Gregg Van Hove
05097b3e42
Merge branch 'set-equality' of https://github.com/alur/jasmine into alur-set-equality
...
- Merges #1067 from @alur
2016-09-27 13:37:57 -07:00
Gregg Van Hove
1efed4c156
Update pretty print specs to work in IE8
2016-09-27 12:26:02 -07:00
Gregg Van Hove
f4849f6401
Merge branch 'pretty-print-cross-frame-objects' of https://github.com/thatfulvioguy/jasmine into thatfulvioguy-pretty-print-cross-frame-objects
...
- Merges #1091 from @thatfulvioguy
- Fixes #1087
2016-09-27 11:40:01 -07:00
Gregg Van Hove
ec2ae4d521
Merge branch 'custom-testers-in-asymmetric-matchers' of https://github.com/joeyparrish/jasmine into joeyparrish-custom-testers-in-asymmetric-matchers
2016-09-27 11:01:45 -07:00
Greg Cobb
ac3d64cf84
Merge pull request #1215 from mattc41190/patch-1
...
Fix bad url
2016-09-22 23:03:49 -07:00
Matthew Cale
2d3c8c9f26
Fix bad url
...
Current README returns 404 when contributors guide is clicked.
2016-09-22 21:23:35 -05:00
Gregg Van Hove
6816bc4252
Update to 2.5.2
2016-09-16 17:19:59 -07:00
Gregg Van Hove
04bb56a5b5
Allow currently registered reporters to be cleared
...
- jasmine/jasmine-npm#88
2016-09-16 16:02:08 -07:00
Greg Cobb
ed31b9b844
Add ISSUE_TEMPLATE for github issues
2016-09-16 10:26:11 -07:00
Gregg Van Hove
4e47b78f1f
Use isFunction to check for functionness in callFake
...
- Fixes #1191
2016-09-14 16:06:44 -07:00
Henry Blyth
8e23c26383
Make spyOnProperty available in tests
...
Needed adding to the env and require interface
2016-09-12 18:22:58 -05:00
Sukharev Maxim
56191cfb2e
Implement spies for get/set functions on accessor properties
2016-09-12 18:22:58 -05:00
Gregg Van Hove
8624a52ee0
Don't auto install phantom since it doesn't seem to work on travis
2016-09-07 15:48:20 -07:00
Gregg Van Hove
a4b92b34f4
Update to 2.5.1
2016-09-07 14:31:18 -07:00
Gregg Van Hove
3486e8d166
Merge branch '1189' of https://github.com/seanparmelee/jasmine into seanparmelee-1189
...
- Merges #1193 from @seanparmlee
- Fixes #1189
2016-09-01 21:11:07 -07:00
Gregg Van Hove
8366ef9be5
Merge branch 'fix' of https://github.com/logankd/jasmine into logankd-fix
...
- Merges #1192 from @logankd
- Fixes #1188
2016-09-01 20:44:13 -07:00
Gregg Van Hove
ab0567c665
Generated file for date tick fix
2016-09-01 20:41:51 -07:00
Sean Parmelee
8676bbf11a
fallback on assignment when a spy cannot be deleted
2016-09-01 13:39:25 -05:00
Kevin Logan
c0a9d20a02
fix for issue #1188
2016-09-01 10:59:19 -05:00
Gregg Van Hove
c7cc3b4a29
Properly tick date along with clock
...
- Specifically when there aren't functions scheduled at the ticks
Fixes #1190
2016-08-31 21:24:01 -07:00
Gregg Van Hove
5a2e1b0082
Update to 2.5.0
2016-08-30 21:23:08 -07:00
Gregg Van Hove
f196faf0bb
Update anonymous constructor pretty print specs to work in IE
2016-08-25 15:29:32 -07:00
Gregg Van Hove
850204dfb8
Merge branch 'prettyPrintCustomConstructortoString' of https://github.com/mbildner/jasmine into mbildner-prettyPrintCustomConstructortoString
...
- Fixes #1019
- Merges #1099
2016-08-15 15:50:59 -07:00
Gregg Van Hove
7bda3bd728
Build distribution
2016-08-15 09:41:48 -07:00
Gregg Van Hove
b9c25e88b9
Merge branch 'callfake-better-error' of https://github.com/kapke/jasmine into kapke-callfake-better-error
...
- Merges #1059
- Fixes #1016
2016-08-15 09:34:03 -07:00
Gregg Van Hove
13228c304e
Add gulp-jasmine-browser link to readme
...
Close #1089
2016-08-15 09:30:38 -07:00
Greg Cobb
da18479422
Merge pull request #1170 from benchristel/how-to-test-in-ie
...
Add instructions for testing in IE
2016-07-25 21:59:23 -07:00
Greg Cobb
ba211e4913
Update codeclimate.yml
...
[#1171 ]
2016-07-25 21:36:57 -07:00
Greg Cobb
5f9a965d7c
Exclude lib directory from codeclimate
...
- Generated files show up as duplicates of src
[#1171 ]
2016-07-25 21:11:44 -07:00
Ben Christel
3ff59835ea
Add instructions for testing in IE
2016-07-25 10:20:43 -07:00
Greg Cobb
9fedf74f32
Build distribution
2016-07-24 22:38:36 -07:00
Greg Cobb
0339fc500a
Merge pull request #1169 from benchristel/fix-build
...
Fix the build in ie8
2016-07-24 22:20:55 -07:00
Ben Christel
227b0c62a3
Make the build pass in ie8
...
- pending() throws an exception in ie8. I have not dug into the root cause.
- iframe.contentWindow.eval() isn't supported in ie8
2016-07-24 21:48:11 -07:00
Greg Cobb
3de60067f0
Merge pull request #1158 from benchristel/move-functions-to-higher-scope
...
Restructure eq code and tests
2016-07-21 21:28:45 -07:00
Ben Christel
cb1001e6c2
De-dup test setup
...
- Move environment-specific tests for toEquals into describe blocks so the check for the environment can be shared
2016-07-21 12:26:43 -07:00
Ben Christel
d9ded15c45
Move functions in to a higher scope
...
- Prevents them from accessing eq's local vars, which could cause bugs.
2016-07-21 12:10:37 -07:00
Ben Christel
a0bce8031e
Test comparison of objects from different frames
2016-07-21 12:10:37 -07:00
Greg Cobb
7f7dda7a2c
Merge pull request #1162 from amavisca/update-dev-dependencies
...
Update devDependencies and fix issues from this
2016-07-20 20:18:57 -07:00
Chris Amavisca
15f92b226c
Update devDependencies and fix issues from this
...
- Point to npm released version of jasmine node runner
2016-07-20 20:11:52 -07:00
Greg Cobb
99aa2247b6
Build distribution
2016-07-19 23:00:25 -07:00
Greg Cobb
314eb63552
Merge pull request #1129 from gregeinfrank/remove-runnable-lookup-table
...
Remove runnableLookupTable which is no longer used
2016-07-18 23:39:15 -07:00
Greg Cobb
bd6ca98f9d
Revert "Merge pull request #1151 from amavisca/update-dev-dependencies"
...
This reverts commit eee75d8eed , reversing
changes made to 5e0ebadb3d .
2016-07-18 23:28:50 -07:00
Greg Cobb
eee75d8eed
Merge pull request #1151 from amavisca/update-dev-dependencies
...
Upgrade devDependencies glob and shelljs
2016-07-18 23:00:34 -07:00
Greg Cobb
5e0ebadb3d
Merge pull request #1155 from benchristel/arrays-properties-bug
...
Make `toEqual` pass for arrays with equivalent properties
2016-07-18 22:56:20 -07:00
Ben Christel
738c10fd43
Make toEqual pass for arrays with equivalent properties
...
- Fixes a bug caused by accidental use of a closure variable
2016-07-18 16:48:00 -07:00
Greg Cobb
8c9ffe3144
Merge pull request #1152 from amavisca/update-travis-ruby
...
Update ruby version on travis to let rack install
2016-07-14 22:28:50 -07:00
Chris Amavisca
ab2c916c3a
Update ruby version on travis to let rack install
2016-07-14 19:57:08 -07:00
Chris Amavisca
290fb3fdcd
Upgrade devDependencies glob and shelljs
2016-07-14 19:46:32 -07:00
Joey Parrish
de7b7c029e
Pass custom testers to asymmetric testers
...
This allows custom equality testers to affect asymmetric matches.
This avoid suprises when combining addCustomEqualityTester with
objectContaining or arrayContaining.
Closes #1138
2016-06-23 14:33:39 -07:00
Greg Einfrank
e13c7a55a9
Remove runnableLookupTable which is no longer used
2016-06-08 10:59:42 -07:00
Pivotal
7a62969a14
createSpyObj may use object for method->response shorthand
...
examples:
```JavaScript
var mySpy = jasmine.createSpyObj("mySpy", { getAge: 55, getLanguage: "JavaScrizzle" });
var age = mySpy.getAge();
expect(age).toEqual(55);
expect(mySpy.getAge).toHaveBeenCalled();
```
Also does:
Add "isObject_" method to utils to make it easier for "createSpy" to support an array or object of stubs
2016-04-25 17:10:22 -04:00
Pivotal
604cd6132f
Prettyprint objects whose constructors have custom toString method
...
- when the constructor has a name, print the name
- when the constructor does not have a name, print `<anonymous>`
[Fixes issue 1019](https://github.com/jasmine/jasmine/issues/1019 )
2016-04-25 14:23:48 -04:00
Fulvio Valente
2710bdfc5e
Correctly pretty print objects from other contexts (e.g. iframes) and which do not override toString
...
Fixes #1087
2016-04-11 18:51:04 +01:00
Gregg Van Hove
f6da084642
Merge branch 'patch-1' of https://github.com/skupr/jasmine into skupr-patch-1
...
- Merges #1079 from @skupr
- Fixes #964
2016-03-26 21:28:46 -07:00
Gregg Van Hove
6c0224414c
Generate combined file for previous features
2016-03-26 21:27:04 -07:00
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
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
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
Gregg Van Hove
5ea5ec6004
Merge branch 'kkirsche-patch-1'
2015-06-12 13:25:37 -07:00
Kevin Kirsche
f7033f6551
Remove moot version property from bower.json
...
Per bower/bower.json-spec@a325da3
2015-06-10 18:36:17 -04:00
Gregg Van Hove
7e6e905814
Merge branch 'logankd-toHaveBeenCalledTimes'
...
Fixes #871
2015-06-05 21:09:51 -07:00
Kevin
a6a1962924
add toHaveBeenCalledTimes matcher
...
Fix #853
2015-06-05 21:07:24 -07:00
Gregg Van Hove
50944fea6f
Mention use of bundle exec for running the jasmine server during dev
2015-06-05 20:36:56 -07:00
Liam Wall
7bfc4c0a45
xdescribe marks pending, plus associated tests.
2015-05-29 17:21:28 +01:00
Gregg Van Hove and Noah Denton
4be2079482
Use the travis sauce connect addon
2015-05-18 17:04:21 -07:00
Gregg Van Hove
d6f47ea886
Merge pull request #856 from lpww/patch-1
...
Update CONTRIBUTING.md
2015-05-18 14:29:44 -07:00
Gregg Van Hove
5061dd066c
Merge branch 'unique-css-classes' of https://github.com/prather-mcs/jasmine into prather-mcs-unique-css-classes
2015-05-18 14:29:03 -07:00
Gregg Van Hove
2a847a67e3
Merge branch 'danfinnie-any-vs-anything-error'
2015-05-18 14:27:27 -07:00
Thomas Treffry
50223d97d6
Update CONTRIBUTING.md
...
Rephrase confusing statement:
From:
If when you run ($ grunt)...you see that JSHint runs your system is ready.
To:
Now run ($ grunt)...if you see that JSHint runs, your system is ready.
2015-05-17 11:49:39 -07:00
Dan Finnie
302e78f1df
Raise an error when jasmine.any() isn't passed a constructor
2015-05-17 02:21:26 -04:00
Matt Prather
42ad12ec52
Make the HtmlReport CSS classes "unique enough"
...
The only difference between this commit and the previous is that I have
used a difference scheme for naming Jasmine CSS classes.
Instead of appending "_jasmine-css" to all Jasmine CSS selectors, I have
now preprended "jasmine-" instead.
2015-05-14 14:23:06 -07:00
Matt Prather
c41fa7d156
Make the HtmlReport CSS classes "unique enough"
...
As described in Issue Report 844...
https://github.com/jasmine/jasmine/issues/844
...style rules in the app-being-tested may incidentally affect elements
in the Jasmine HTML Report container, as long as there is a chance that
the app-being-tested has CSS style rules for classes (or IDs) that
Jasmine uses.
This fix attempts to bring Jasmine to a state where each and every class
it uses always ends with "_jasmine-css" which should be unique enough to
ensure that CSS in the app-being-tested won't affect the Jasmine report,
because no app-being-tested is ever likely to use classes that end with
"_jasmine-css"
I'll be surpised if this commit is good enough as it is now, on the
first attempt to fix #844 , because of reasons I'll explain in either
the Issue or the Pull Request.
2015-05-13 18:55:44 -07:00
Gregg Van Hove
0b1449228f
Bump version to 2.3.4
2015-05-13 14:57:56 -07:00
Gregg Van Hove
65a6decd6d
Fix ordering for suites with more than 11 direct children.
...
- When no specs were focused, they all had the same precedence, and
`sort`ing them caused some of the nodes to move around
Fixes #850
2015-05-13 14:45:11 -07:00
Gregg Van Hove
7cbd86357d
Merge branch 'remove-dead-css' of https://github.com/prather-mcs/jasmine into prather-mcs-remove-dead-css
2015-05-13 11:03:25 -07:00
Gregg Van Hove
4f278be2c2
Update standalone installation instructions to reference the releases page
...
Fix #603
2015-05-13 10:59:39 -07:00
Matt Prather
f2bc9b5bd8
Remove the style rule for .running-alert CSS class
...
https://github.com/jasmine/jasmine/issues/847#issuecomment-101446573
2015-05-12 15:51:42 -07:00
Gregg Van Hove
e9d79bc946
Merge branch 'prather-mcs-remove-dead-css'
2015-05-11 10:59:36 -07:00
Gregg Van Hove
0b2097b616
Bump version to 2.3.3
2015-05-11 10:48:58 -07:00
Gregg Van Hove
f02824ae52
Merge branch 'remove-dead-css' of https://github.com/prather-mcs/jasmine into prather-mcs-remove-dead-css
2015-05-11 10:41:18 -07:00
Robert Neumann
225c7bdda3
Set the shared user context correctly when executing the top level suite
...
Fixes #846
2015-05-11 10:29:51 -07:00
Matt Prather
e855c898d1
Remove dead CSS class styles
...
I removed the `.showDetails` and `.summaryMenuItem` styles from the Sass
file because I believe that no HTML elements with those classes will
ever be generated by Jasmine and that they are dead code that someone
forgot to remove.
This is my first contribution to the Jasmine project and so I might be
doing something wrong, but I believe just this one change will propagate
to all the generated code when it is built, and that I should not be
altering any other code in any other place to accomplish the change I
intend.
This is related to Jasmine Issue 847:
https://github.com/jasmine/jasmine/issues/847
2015-05-10 16:58:07 -07:00
Gregg Van Hove
426eebe1ce
bump version to 2.3.2
2015-05-07 14:02:12 -07:00
Gregg Van Hove
add841a1e9
A spec without a function provided should be pending not disabled
...
Fixes #840
2015-05-07 13:46:52 -07:00
Gregg Van Hove
023c998660
use a link for the PR in release notes
2015-05-05 07:51:49 -07:00
Gregg Van Hove
3dde7d0c29
Bump version to 2.3.1 to create a new bower package
2015-05-05 07:48:49 -07:00
Gregg Van Hove
4e3f9a4d09
Merge pull request #843 from evoL/fix-bower-package
...
Make the Bower package use browser-friendly files.
2015-05-05 07:22:25 -07:00
Rafał Hirsz
b89fbc71a7
Point Bower's main field to jasmine.js, which is browser-friendly.
2015-05-05 15:36:24 +02:00
Gregg Van Hove
4c0e3b2aed
remove dist zips from the repo. They should all be available on github releases
2015-04-28 13:43:21 -07:00
Gregg Van Hove
19f812c4f6
Fix cp command for release documentation
2015-04-28 11:27:03 -07:00
Gregg Van Hove
5ea24a8448
version bump to 2.3.0
2015-04-28 10:13:42 -07:00
Gregg Van Hove
4173a4089c
Merge pull request #827 from davetron5000/patch-1
...
Explicitly state the main JS
2015-04-19 10:03:19 -07:00
David Copeland
f712b795d7
Explicitly state the main JS
...
# Problem
To bring this lib in using Sprockets, you must do this:
```javascript
//= require jasmine/lib/jasmine-core
```
Sprockets can read `bower.json` and, if `main` is explicitly stated in the file, you can do the much more future-proof and compact:
```javascript
//= require jasmine
```
# Solution
Explicitly specify it.
# Caveats
I am not super-versed in Bower or JS packaging, so this is proposed in the vein of "this fixes my problem and seems consistent with other JS libs I've looked at", but I'm open to other solutions.
2015-04-19 12:22:33 -04:00
Gregg Van Hove
ff029b37b5
Use instanceof when checking Error types in toThrowError
...
Fixes #819
2015-04-09 15:38:24 -07:00
Gregg Van Hove
7cd8c41d31
Merge pull request #818 from lpww/patch-1
...
Update formatting
2015-04-05 21:56:59 -07:00
Thomas Treffry
d7dd85c64f
Update formatting
...
Remove periods from bullet points for consistency with rest of document
2015-04-05 20:19:29 -07:00
Davis W. Frank
2d5c071d28
Merge pull request #815 from jhamon/contributing-subjective-readability-improvements
...
Subjective readability improvements to CONTRIBUTING.md
2015-04-02 08:49:39 -07:00
Jen Hamon
76bc0a87db
Use code fence syntax around git workflow for readability.
2015-04-01 13:25:32 -07:00
Jen Hamon
5cae401c98
Pull urls out of paragraph to improve readability
2015-04-01 13:06:58 -07:00
Gregg Van Hove
1d366772b7
Don't throw if we're already handling an exception
...
[finish #91407284 ]
2015-03-30 08:19:06 -07:00
Gregg Van Hove and Nikhil Gajwani
d137b83c1c
Don't install the clock if the current timing functions aren't the originals
...
[finish #64116664 ] Fix #782
2015-03-27 10:14:03 -07:00
Gregg Van Hove
692c8716f0
Style disabled specs in the results list
2015-03-26 15:45:26 -07:00
Gregg Van Hove
965229bd03
Properly pass j$ to Any so it can use other jasmine stuff
...
Fixes #806
2015-03-18 13:12:40 -07:00
Gregg Van Hove
46044dd345
Merge branch 'sgravrock-clock-reset'
2015-03-15 13:23:56 -07:00
Steve Gravrock
2af9a45fb2
Correctly handle functions that are scheduled after the clock is uninstalled and reinstalled from within Clock#tick.
...
Fixes #790 .
2015-03-14 17:40:27 -07:00
Gregg Van Hove
abc0c4a97e
Update to ruby 2.x for travis builds
...
- sauce gem allowed cmdparse to upgrade a major version and 3.0 of
cmdparse requires ruby >= 2.0.0
2015-03-14 15:26:46 -07:00
slackersoft
eb1d98338a
Properly inject j$ into Suite
2015-03-06 11:43:57 -08:00
slackersoft
f0c480f456
Use onclick directly to better support older webkit
2015-03-06 10:09:08 -08:00
Gregg Van Hove and Molly Trombley-McCann
7693a4c959
Allow user to stop a specs execution when an expectation fails
...
[finish #1165916 ] #577
2015-03-05 15:28:00 -08:00
Gregg Van Hove
1a08d1e8c6
Don't use deprecated onComplete syntax for jasmine-npm
2015-03-04 17:44:05 -08:00
Gregg Van Hove
ce9600a3f6
Allow the clock to be installed for the duration of a single closure
...
[finish #67434180 ]
2015-03-04 17:41:49 -08:00
Gregg Van Hove and Molly Trombley-McCann
c58d83bbe3
Merge branch 'remove-unnecessary-conditional' of https://github.com/toddbranch/jasmine into toddbranch-remove-unnecessary-conditional
2015-03-04 12:00:07 -08:00
Gregg Van Hove and Molly Trombley-McCann
1c6f4ef0e6
Build distribution for previous changes
2015-03-04 11:58:47 -08:00
Gregg Van Hove
c77ff30263
Show the name of the constructor function when printing an any
...
- instead of a `toString` of the entire constructor
Fixes #796
2015-03-03 13:27:31 -08:00
Gregg Van Hove
dc652cfb05
Clean up some TreeProcessor stuff.
...
- Properly segment parents of segmented suites
2015-03-03 13:14:20 -08:00
Gregg Van Hove
22f58c0049
Merge pull request #789 from sgravrock/safe-temp-dir
...
Don't use hardcoded temporary directory paths
2015-03-02 13:59:26 -08:00
slackersoft
715de7aa38
Implement TreeProcessor to solve some issues with running the suite
...
- execute beforeAll/afterAll once per suite instead of once per child
when running focused specs/suites Fixes #773
- refuse to execute an order if it would cause a suite with a beforeAll
or afterAll to be re-entered after leaving once
- report children of an xdescribe similarly to how they would be
reported if they were themselves x'd out Fixes #774
- only process the tree once instead of figuring it out again at each
level
[finishes #87545620 ]
Fixes #776
2015-03-02 11:41:45 -08:00
slackersoft
0c68cc4afc
Fix spec so it can be run in isolation
...
relates to #790
2015-02-27 16:57:23 -08:00
slackersoft
ce6ce4e2c7
Add safari 7 & 8 to browser matrix
2015-02-27 13:44:55 -08:00
Greg Cobb
10f87b3b90
Fixes issue where mock clock was being used by QueueRunner
...
- If the mock clock was installed in a beforeAll, the QueueRunner would use the mock clock for its own clock. If the mock clock was ticked more than the default timeout, async specs would timeout.
[fixes #783 #792 ]
2015-02-24 21:56:52 -05:00
Steve Gravrock
0776146d3b
Don't use hardcoded temporary directory paths
2015-02-22 16:03:20 -08:00
Todd Branchflower
bbac4bb23f
remove unnecessary conditional
2015-02-20 14:04:08 -07:00
Gregg Van Hove
8c59875afe
Merge pull request #775 from joscha/patch-1
...
add missing semicolon
2015-02-09 09:54:54 -08:00
Joscha Feth
cdee9c8853
add missing semicolon
2015-02-09 15:40:41 +01:00
Greg Cobb and Gregg Van Hove
69956bf8f6
ObjectContaining matches prototype properties
...
[#769 ]
2015-02-05 14:15:57 -08:00
Christopher Amavisca
e1249ac89a
Remove unused standaloneBuilder var from Gruntfile
2015-02-04 17:06:56 -08:00
Christopher Amavisca
a84e0cd8ef
Add test script to package.json
...
- Use `npm test` in travis-node-script
2015-02-04 16:55:07 -08:00
Christopher Amavisca
6177a4aeff
Update bower.json keywords to match package.json keywords
2015-02-04 16:36:43 -08:00
Christopher Amavisca
471a241493
Add keywords to package.json
2015-02-04 16:36:31 -08:00
Greg Cobb and Gregg Van Hove
d5dfbc98c3
Updates pretty printer to include array properties
...
[fixes #766 ][finishes #87644044 ]
2015-02-04 11:05:03 -08:00
Gregg Van Hove
2ab2a83a3b
Merge pull request #768 from danilovaz/master
...
Update year copyright
2015-02-04 09:58:40 -08:00
Greg Cobb and Gregg Van Hove
f22862fd80
Merge branch 'juliemr-arrayfix'
...
Fixes #765
2015-02-04 09:38:45 -08:00
Julie Ralph
53b0752ff0
Allow arrays from different frames or contexts to be equal
2015-02-04 09:28:04 -08:00
Danilo Vaz
7616e5a3fd
Update year copyright
2015-02-04 08:42:18 -02:00
Greg Cobb and Gregg Van Hove
e173cd1c9d
bump version to 2.2.1 for bower fix
2015-02-02 12:24:14 -08:00
Gregg Van Hove
234dc1a047
Merge pull request #763 from gabrielhpugliese/gabrielhpugliese-patch-bower-json
...
Fix missing comma on bower.json
2015-02-02 12:16:47 -08:00
Gabriel H Pugliese
d22a030b87
Fix missing comma on bower.json
2015-02-02 18:03:32 -02:00
Greg Cobb and Gregg Van Hove
4acb7448d8
Update release notes and bump version for 2.2.0
2015-02-02 11:27:14 -08:00
slackersoft
a26e85ff3a
update 2.2.0 release notes now that I've pulled
2015-01-30 13:03:08 -08:00
slackersoft
39e175c05f
Initial cut of release notes for 2.2.0
2015-01-30 13:02:01 -08:00
Christopher Amavisca
d129a6c0ee
Restructure node examples folder structure to look more realistic.
...
- Updates PlayerSpec's require statement to match folder structure change
2015-01-27 14:39:59 -08:00
slackersoft
837101c025
Add a basic bower config
...
- Also ignore sauce_connect.log
Fix #719
2015-01-26 17:53:41 -08:00
slackersoft
8e3066db42
Allow pending to take a reason and show it in the HtmlReporter
...
[#78954014 ] Fix #671
2015-01-26 15:55:31 -08:00
slackersoft
a857f4c042
Merge branch 'ptomato-gjs-global-object'
2015-01-26 12:22:05 -08:00
slackersoft
dca543accb
Merge branch 'gjs-global-object' of https://github.com/ptomato/jasmine into ptomato-gjs-global-object
2015-01-26 12:21:56 -08:00
slackersoft
5dbcf27f72
Merge branch 'ptomato-spidermonkey-compat'
2015-01-26 11:47:35 -08:00
slackersoft
b54de4a180
Merge branch 'spidermonkey-compat' of https://github.com/ptomato/jasmine into ptomato-spidermonkey-compat
2015-01-26 11:47:09 -08:00
slackersoft
46509f05a9
Add jshint to node run on travis
...
- To ensure that pull requests pass
[Finish #59588854 ]
2015-01-26 10:59:44 -08:00
Philip Chimento
ebaa2e7f24
Set jasmineGlobal correctly in GJS
...
In GJS, jasmineGlobal was not getting set to the global object; when
importing jasmine.js in GJS, "this" resolves to the jasmine.js module
object, not the global object. Solve this specifically for GJS by
assuming that `window.toString === '[object GjsGlobal]'` only in GJS; if
this is the case, assign "window" to "jasmineGlobal".
Adding a "var" to the declaration of "getJasmineRequireObj" is also
necessary, or else "getJasmineRequireObj" won't be exported in the
Jasmine module.
See #751
2015-01-24 23:50:40 -08:00
Philip Chimento
5eaf7152bf
Fix some SpiderMonkey lint
...
SpiderMonkey complains about functions not always returning a value. In
most cases that is a conscious code style choice, so it is not fixed
here.
In one case (MockDate) the interpreter thought you could have fallen off
the end of a "switch" statement, although the number of arguments
prevented that. This was fixed by changing the last case to "default".
In another case (QueueRunner) the function really did return a value
sometimes and nothing other times, although as far as I could see, it
could only ever return "undefined". The function now explicitly only
returns no value.
See #751
2015-01-24 23:43:38 -08:00
Greg Cobb
ebbaab4cf9
Prevents *Alls from running when runnables are explicitly set
...
- This requires passing if runnables are set to the Suite. Hopefully in
the future we will change how focused runnables and *Alls interact so
this is no longer necessary.
[#732 ]
2015-01-23 17:27:13 -08:00
Greg Cobb
1936a36c79
Fix jslint issues
2015-01-23 17:23:07 -08:00
slackersoft
1dd4af3835
anything and stringMatching have custom pretty-print now.
2015-01-21 12:59:01 -08:00
slackersoft
6ae054c3e2
Update contribution guide to mention possible ffi dependencies for Ubuntu
...
Fixes #755
2015-01-21 12:55:07 -08:00
Gregg Van Hove
e5feba994f
Merge pull request #746 from swirlycheetah/patch-1
...
Fix spelling mistake
2015-01-14 17:00:19 -08:00
Chris Wheatley
20faa883fb
fix spelling mistake
2015-01-14 22:15:49 +00:00
Gregg Van Hove
3bba1eabd4
Merge pull request #745 from rohit/fix-repo-url
...
Use new jasmine github repo url
2015-01-14 10:26:39 -08:00
Rohit Arondekar
9ad3eac469
Use new jasmine github repo url
2015-01-14 20:47:09 +05:30
Gregg Van Hove
3140d5fb95
Allow createSpyObj to be called with just an array of method names
...
[Finish #50757607 ] #321
2015-01-12 15:16:50 -08:00
Gregg Van Hove
69a61547e7
Don't forget to buildDistribution
...
- Also fix jshint errors
[#59947350 ] #440
2015-01-12 14:10:50 -08:00
Gregg Van Hove
a999490de9
Merge branch 'arrayContaining' of https://github.com/slackersoft/jasmine into slackersoft-arrayContaining
...
Merge #440 [Finish #59947350 ]
2015-01-12 14:01:02 -08:00
Gregg Van Hove
c1479acd17
Fix fail specs for all browsers #734
2015-01-12 13:37:10 -08:00
Gregg Van Hove
3a93f845d6
Use the stack trace from the Error object if supplied
...
Fixes #734
2015-01-12 11:51:45 -08:00
Gregg Van Hove
6c58024321
Update readme with link to upgrading doc and mention browser support.
...
Fix #739
2015-01-12 11:06:59 -08:00
Gregg Van Hove
aeae141fd4
Merge branch 'moonmaster9000-patch-2'
2015-01-12 10:08:15 -08:00
Matt Parker
a951bbbb47
Link to the Jasmine NPM module
...
Also, put the jasmine-<language> links above the confusing "install jasmine on your local box" stuff (why would I want to do that?)
2015-01-12 10:08:04 -08:00
slackersoft
895c17e5c1
Merge branch 'rohit-equals-null-protoObjects'
2014-12-20 16:48:26 -08:00
Rohit Arondekar
a84eaf2cbe
Allow null prototype obj to be compared for equals
...
Fixes #729
2014-12-20 08:35:27 +05:30
slackersoft
9f240c5b9e
Build distribution to properly expose stringMatching
...
[#58120558 ]
2014-12-19 12:45:58 -08:00
slackersoft
dfa8a77dc3
Add asymmetric equality tester to match a string against a regexp
...
- Also move the asymmetric testers into their own dir for easier
locating.
[#58120558 ] Fix #243
2014-12-19 12:39:24 -08:00
Gregg Van Hove
2472982fe9
Merge pull request #730 from rohit/patch-1
...
Fix URL's of Jasmine repositories on Github
2014-12-19 09:21:02 -08:00
Rohit Arondekar
c85500a924
Fix URL's of Jasmine repositories on Github
2014-12-19 07:36:03 +05:30
slackersoft
482f4d62fc
Add anything matcher to match any value that is neither null or undefined
...
[finish #58117878 ] Fix #186
2014-12-17 12:58:47 -08:00
slackersoft
bfcd8b046d
Allow asymmetric equality testers to preempt their symmetric brethren
...
- Also allow them to be compared to each other properly.
Fixes #540
2014-12-16 17:45:58 -08:00
slackersoft
2ab22951a1
Just check if either side implements asymmetricMatch
...
- Don't explicitly look for `Any` or `ObjectContaining`
[#82295210 ]
2014-12-16 17:29:18 -08:00
slackersoft
6c131beda7
Don't double escape focus spec links.
...
- QueryString already escapes parameter values, no need to escape when
passing them in from HtmlReporter.
[finish #29578495 ]
2014-12-16 17:21:22 -08:00
slackersoft
ea88023553
Check for ObjectContaining on either side of equality.
...
- Also clean up `undefined` check.
Fixes #682
2014-12-16 17:07:35 -08:00
slackersoft
6bd98cb2ab
Rename jasmineMatches to asymmetricMatch
...
- This should be more clear what it is for
[finish #82295210 ]
2014-12-16 16:47:31 -08:00
slackersoft
b4b3ac25a1
spyOn explicitly checks to see that a method name to spy on was passed.
...
[finish #27689237 ]
2014-12-16 13:21:48 -08:00
slackersoft
7570bc422b
Display the name of the constructor when pretty printing objects
...
Fixes #598 [finishes #81228592 ]
2014-12-16 12:56:04 -08:00
slackersoft
eca8d8f009
Also test in IE 11 on travis
2014-12-16 11:57:48 -08:00
slackersoft
305252f5a8
toMatch requires the expected to be a String or RegExp
...
- Otherwise it was using the `toString` as the RegExp, which is almost
definitely _not_ what you want.
Fixes #723
2014-12-16 11:50:45 -08:00
slackersoft
0fdb28c6ff
Merge branch 'toEqualDomNodes' of https://github.com/alexeibs/jasmine into alexeibs-toEqualDomNodes
2014-12-16 11:25:14 -08:00
slackersoft
a84202a6f9
Also check custom properties on Arrays when computing equality
...
[Finishes #50616649 ]
2014-12-16 10:22:23 -08:00
slackersoft
503f4b7f49
Keep extra query params when focusing on a spec or suite
...
[finish #29578495 ]
2014-12-15 18:30:32 -08:00
slackersoft
fbe38018c9
Hide more things from the npm package
...
Fixes #726
2014-12-11 12:48:50 -08:00
slackersoft
8bb2f67fb3
Properly record finishing an xdescribe so further cleanup works
...
Fix #724
2014-12-09 12:40:00 -08:00
slackersoft
ba9c863de9
Add spec to verify custom query params are left alone
...
[#29578495 ]
2014-12-05 08:12:42 -08:00
slackersoft
02161b7d48
ObjectContaining no longer tries to track exact mismatches
...
- equals wasn't looking at it anyways, so just bail as soon as something
is different.
2014-12-05 08:06:20 -08:00
slackersoft
4d5f27d359
Reschedule all functions for a tick before executing any
...
- This allows any function run during a tick to cancel any other in the
same tick.
Fixes #708
2014-12-05 08:01:34 -08:00
slackersoft
a4faa80be4
pass through all args from external interface for befores, afters, its
...
Fix #483
2014-12-02 13:29:43 -08:00
slackersoft
b68ba90ad7
Just return the result directly from any and objectContaining
...
- They return false when they fail which means not equal.
2014-12-02 07:56:40 -08:00
slackersoft
dc7be9c55e
change 2.1.3 release notes filename to match others
2014-12-01 12:49:40 -08:00
slackersoft
b56c2a69ac
add standalone dist for 2.1.3
2014-12-01 12:46:52 -08:00
slackersoft
4b6789ccd9
version bump for 2.1.3
2014-12-01 12:43:52 -08:00
slackersoft
9f94e8e226
Top level suite no longer reports suiteStart and suiteDone
...
- jasmineStart and jasmineDone are reported separately
Fixes #716
2014-11-28 21:25:45 -08:00
slackersoft
55f32e2dc6
Don't keep the expected and actual for a passed expectation
...
- It causes memory problems in phantom and you probably don't need it
anyways.
Fixes #640 Fixes #690
2014-11-22 15:03:27 -08:00
Gregg Van Hove
b30a85c8f1
Merge pull request #712 from joshk/patch-1
...
Use the new build env on Travis
2014-11-22 14:58:34 -08:00
Josh Kalderimis
20ce62d5f5
Use the new build env on Travis
...
better faster stronger
more ram, cpu, faster boot times, better network
docs coming soon
2014-11-22 14:21:03 -05:00
Christopher Amavisca
c3de57aaac
Update travis badge
2014-11-22 11:16:07 -08:00
slackersoft
2517ddfe17
bump verion to 2.1.2
2014-11-16 14:56:27 -08:00
slackersoft
23a492cb65
Suites still run their children even if none are executable
...
- Continue skipping beforeAll and afterAll
Fixes #707
2014-11-16 14:43:44 -08:00
slackersoft
25c546a904
add release notes and standalone dist for 2.1.1
2014-11-14 18:44:28 -08:00
slackersoft
97ab0cb403
bump version to 2.1.1
2014-11-14 18:43:00 -08:00
slackersoft
42b1bda919
Top-level suite triggers suiteStarted and suiteEnd to be consistent
...
Fixes #706
2014-11-14 18:37:00 -08:00
slackersoft
216b40439f
Attempt to use selenium runner from source, to fix dependency loop
2014-11-14 12:41:50 -08:00
slackersoft
590a9d9d41
bump version to 2.1.0
2014-11-14 07:54:19 -08:00
Davis W. Frank
66c8624022
Updating links in release notes
2014-11-11 09:46:38 -08:00
Davis W. Frank
75e5a5c308
Fix for wayward underscore and Anchorman bug
2014-11-10 17:24:06 -08:00
Davis W. Frank
9b5c20cc19
Adding first crack at 2.1 release notes
2014-11-10 17:15:57 -08:00
slackersoft
cc720e7f56
Add release notes for previous releases, so they can be removed from the wiki
...
[#54582902 ]
2014-11-06 08:21:31 -08:00
Gregg Van Hove
1426416666
Merge pull request #700 from tkrotoff/patch-1
...
Simplifies SpecRunner.html
2014-11-04 13:20:55 -08:00
Tanguy Krotoff
197cb13817
Simplifies SpecRunner.html
...
No need to specify type="text/javascript" for script tag
No need to specify type="text/css" for link tag with rel="stylesheet"
2014-11-04 10:30:11 +01:00
slackersoft
816b7d701f
Merge branch 'charleshansen-to_contain_array_like_objects'
2014-11-03 13:10:13 -08:00
Charles Hansen
da6813ef0d
toContain works with array-like objects (Arguments, HTMLCollections, etc)
...
Fixes #699
Don't rely on Array.prototype.indexOf for testing containment (not in IE8)
2014-11-03 13:09:57 -08:00
slackersoft
a4d134521a
Revert "toContain works with array-like objects (Arguments, HTMLCollections, etc)"
...
IE 8 doesn't have Array.prototype.indexOf so this breaks there.
Reverting until we can figure out a better way to solve across all
supported browsers.
This reverts commit 663fbd0cdb .
2014-11-01 14:28:32 -07:00
slackersoft
d4fc787ea7
Merge branch 'charleshansen-to_contain_array_like_objects'
2014-10-30 13:08:45 -07:00
Charles Hansen
663fbd0cdb
toContain works with array-like objects (Arguments, HTMLCollections, etc)
...
Fix #699
2014-10-30 13:08:16 -07:00
Matt Parker
cf83ae474c
Added Sheel to the Maintainers Emeritus list
2014-10-25 08:07:15 -07:00
Matt Parker
325c5a2288
Name / Email / Org updates in README
2014-10-25 07:51:18 -07:00
Gregg Van Hove
3ca687a9ad
Merge pull request #691 from ertrzyiks/fix-spec-title
...
Fixed isPendingSpecException test title
2014-10-22 09:52:10 -07:00
Mateusz Derks
3b557f85c7
Fixed isPendingSpecException test title
2014-10-17 15:36:24 +02:00
slackersoft
b67a19507f
Add notes for releasing new versions of the docs
2014-10-11 22:13:26 -07:00
slackersoft
ecae3d47a7
Use the jasmine-npm tarball, since that works on travis
...
[#80505862 ]
2014-10-11 15:04:04 -07:00
slackersoft
a76d6d1cd4
Pass in the current distribution when running node specs
...
- npm package spec can use beforeAll/afterAll now
- also depend on github repo directly instead of the tarball
[finish #80505862 ]
2014-10-11 14:54:08 -07:00
slackersoft
916dc03d9c
build distribution with deprecated console
...
[#80410002 ]
2014-10-11 14:28:51 -07:00
slackersoft
2151a13705
Let's just use the print function that's passed in for deprecation messaging
...
[#80410002 ]
2014-10-11 14:20:19 -07:00
slackersoft
6cc09e00d3
Oh right, IE doesn't have console by default
...
[#80410002 ]
2014-10-11 13:54:41 -07:00
slackersoft
6d6c31328b
Deprecate console reporter
...
- jasmine-npm has its own version so it's no longer dependent on this
one.
[finish #80410002 ]
2014-10-11 13:34:45 -07:00
Gerg
c8cd2eabe5
Fixes console check for IE8
...
- Was causing IE8 to hang for some reason
- Also reverts previous commit, not that issue was resolved
[#79533268 ][fixes #80356450 ]
2014-10-09 00:41:17 -07:00
Gerg
f77071254a
Fixes additional odd IE8 failure
...
[#79533268 ]
2014-10-08 23:14:40 -07:00
Gerg
8880729250
JsApiReporter suiteResults only includes suite results
...
- It was including suite starts also
[#79533268 ]
2014-10-08 22:33:36 -07:00
slackersoft
9ad15eeaba
Merge branch 'akoptsov-patch-1'
2014-10-08 12:52:40 -07:00
Alexander Koptsov
10ca5f0246
Fixed path to src files in node_example
...
There's no such folder as 'jasmine_examples'
2014-10-07 16:35:38 +04:00
Gerg
a5cd2731b4
Fixes CI for IE8
...
For some reason, when you put this spec in a describe block, it causes
specs to hang on IE8. I tried to debug this for a while, and I have no
idea what is happening.
[#79533268 ]
2014-10-05 14:33:40 -07:00
Gerg
b12974db2e
Adds suiteResults method to JsApiReporter
...
- Behaves similarly to to specResults
- Since suites were stored in an object instead of an array and the
current interface exposes this object, we now must keep track of suites
twice in the reporter. We cannot just construct the object lazily,
because then the object will not update with new suite results
like it does currently (see JsApiReporterSpec:148).
[#79533268 ]
2014-10-04 18:36:38 -07:00
slackersoft
f4e5573ee3
Add explicit fail and move on for async functions
...
- `done` now has a `fail` property which will call the global `fail`
then continue to the next function in the queue
[finish #73744618 ] Fix #567 Fix #568
2014-10-02 08:10:29 -07:00
slackersoft
0c77c6cfb5
Use the Gemfile from the docs repo
2014-10-01 13:10:11 -07:00
slackersoft
cfc64a6f5c
bundle exec the docs rake tasks
2014-10-01 09:59:39 -07:00
slackersoft
6ab70923b3
Use rake tasks in the docs repo to test it
2014-10-01 08:15:35 -07:00
slackersoft
d9c0b10be4
Remove type from queueableFns since we're not using it to determine afterAll anymore.
2014-09-30 18:28:41 -07:00
slackersoft
a58fd20d82
Build distribution for suite failed status changes
2014-09-26 18:35:06 -07:00
slackersoft
eefa716530
set suite status to failed when afterAll has failures
2014-09-26 09:12:48 -07:00
slackersoft
66c364564e
Fix custom timeout specs for firefox
2014-09-26 08:21:54 -07:00
slackersoft
68ba5b6d48
Allow custom timeout for beforeEach, afterEach, beforeAll, afterAll and it
...
Fix #483
2014-09-25 22:31:00 -07:00
slackersoft
15ae0379ec
Add fit and fdescribe to the public interface
...
They got lost in the merge
2014-09-25 13:19:13 -07:00
slackersoft
1fb0d2eefa
Merge branch 'master' of https://github.com/chernetsov/jasmine into chernetsov-master
...
Fix #678 Close #679
2014-09-25 12:59:10 -07:00
slackersoft
ba0982d89f
Merge branch 'beforeAll' into master
...
Conflicts:
lib/jasmine-core/boot.js
lib/jasmine-core/boot/boot.js
lib/jasmine-core/jasmine.css
lib/jasmine-core/jasmine.js
spec/core/SpecSpec.js
spec/core/SuiteSpec.js
spec/core/integration/EnvSpec.js
spec/node_suite.js
src/core/Env.js
src/core/requireCore.js
src/core/util.js
2014-09-24 20:20:39 -07:00
slackersoft
f703539942
build distribution for toThrowError refactor
2014-09-24 18:27:40 -07:00
Misha Chernetsov
62840f72a6
when jasmine clock is installed and date is mocked new Date() instanceof Date should equal true
2014-09-24 15:07:22 -07:00
slackersoft
6d10f97151
Merge branch 'toThrowError_refactor'
2014-09-24 13:23:50 -07:00
slackersoft
15f3d0e9d7
update doc comment for boot.js to match current documentation
2014-09-23 08:22:05 -07:00
slackersoft
b1344d5c73
Add explicit fail function.
...
- Adds an expectation failure to the current spec
[finishes #70975468 ] Fix #563
2014-09-23 08:00:46 -07:00
slackersoft
59aaac026c
Merge branch 'paladox2015-patch-1'
2014-09-22 13:10:12 -07:00
slackersoft
21f62c697a
Merge branch 'patch-1' of https://github.com/paladox2015/jasmine into paladox2015-patch-1
2014-09-22 13:09:07 -07:00
slackersoft
dc93c33af6
Merge branch 'pimterry-trackReturnValues'
2014-09-22 13:04:18 -07:00
slackersoft
4889583d5c
Merge branch 'trackReturnValues' of https://github.com/pimterry/jasmine into pimterry-trackReturnValues
2014-09-22 13:04:01 -07:00
slackersoft
41df058171
update contributing doc to indicate use of jasmine-npm
2014-09-20 20:54:45 -07:00
slackersoft
fa837ae90a
Don't depend on debugger gem, we don't really have any ruby code here.
2014-09-20 20:17:55 -07:00
slackersoft
c82c958e0d
Build distribution for earlier fixes
2014-09-16 13:05:11 -07:00
slackersoft
752e831b30
Merge branch 'mkhanal-chain_spy_andReturn'
...
Fix #669 #660
2014-09-15 13:10:40 -07:00
slackersoft
bd30065d66
Merge branch 'chain_spy_andReturn' of https://github.com/mkhanal/jasmine into mkhanal-chain_spy_andReturn
2014-09-15 13:10:24 -07:00
slackersoft
84dff421ea
Use === when checking for circular dependencies for pretty printing.
2014-09-13 18:58:02 -07:00
Mridul
709e032d1c
Added returnValues functionality to spy strategy
2014-09-13 12:41:20 +10:00
Greg Cobb
1290d93b6a
Suite result status added when suite is complete
...
- This makes it easier to detect afterAll failures, because we can
rely only complete runnables having statuses
[#78306786 & #73741654 ]
2014-09-09 11:26:32 -07:00
slackersoft
345903220c
Refactor toThrowError to be less one huge if/else if/else if block
...
- This should also improve it's code climate score as well.
- It's also about 20 lines shorter now too :)
[#59524164 ]
2014-09-07 16:02:42 -07:00
Greg Cobb
3332f93a24
Only run focused runnables inside focused suites
...
- Focused runnables now walk up the tree to unfocus the first focused
ancestor. Because of the way the tree is constructed, this makes sure
that each focused runnable has no focused ancestors.
[#78289686 ]
2014-09-05 12:25:28 -07:00
slackersoft
3b19d66268
Check for afterAll failures in a more browser independent way.
...
- Only look at the message, so browsers that don't provide a stack don't
blow up.
2014-09-04 18:49:14 -07:00
slackersoft
137c1a39f6
Check afterAll failure messages with regexp, since some browsers add more info
2014-09-04 08:15:23 -07:00
slackersoft
9402d59859
Suites report errors in afterAlls in the suiteDone event
...
- remove `afterAllEvent` from reporters
2014-09-03 22:18:20 -07:00
slackersoft
e8178d061b
Merge branch 'tgirardi-issue655'
...
Fix #655 #658
2014-09-02 13:20:18 -07:00
slackersoft
dd75394ea8
Merge branch 'issue655' of https://github.com/tgirardi/jasmine into tgirardi-issue655
2014-09-02 13:19:31 -07:00
Greg Cobb and Tim Jarratt
6b857d11ce
Factor out some common logic between fdesc and desc
2014-08-29 09:25:41 -07:00
Tomás Girardi
eb48c83649
Add specs for intervals that "clear themselves"
...
Add specs to test if issue #655 is present: the handler of an interval
cannot successfully clear the same interval that generated it's
invocation.
The most direct test consist in setting an interval with a handler that
calls clearInterval over that same interval and make the clock tick for
double of it's period. If the issue is present the interval's handler
will be called twice. If the issue is not present, the first invocation
of the handler will avoid a second one (because of the clearInterval).
Another test is included in order to check if recurring scheduled
functions are rescheduled before being called. Doing this in the reverse
order is the exact cause of the issue.
2014-08-28 20:58:30 -04:00
Greg Cobb and Tim Jarratt
08a35d134d
Ensure focused tests are only run once
...
Required duplicating some of the logic for constructing a suite from
describe so that we could mark a suite as focused in fdescribe, but
otherwise this prevents focused tests from being run more than once.
[#73742944 ]
2014-08-28 17:54:42 -07:00
Greg Cobb and Tim Jarratt
14824b5f9e
Expose fit and fdescribe in boot.js
...
* adds done() callbacks to existing specs (because we forgot, whoops!)
[Finishes #73742944 ]
2014-08-28 16:37:37 -07:00
Greg Cobb and Tim Jarratt
9afae3d978
Add a test documenting fits in fdescribes
...
Yo, this probably isn't the best behavior. Rspec and Ginkgo definitely
do not exhibit this behavior when you nest focused runnables inside
other focused runnables. We thought fixing it, but it seems like a
nontrivial refactoring would be necessary to clean this up.
[#73742944 ]
2014-08-28 16:19:31 -07:00
Greg Cobb and Tim Jarratt
64a67ed320
Trim extraneous whitespace
2014-08-28 15:55:39 -07:00
Greg Cobb and Tim Jarratt
dee1066652
Focused runnables play nicely with beforeAll/afterAll
...
[#73742944 ]
2014-08-28 15:54:27 -07:00
Greg Cobb and Tim Jarratt
d7ab9083be
Add focused describe
...
[#73742944 ]
2014-08-28 15:43:59 -07:00
Greg Cobb and Tim Jarratt
caee1508d1
Adds a fit function to Env
...
[#73742944 ]
2014-08-28 15:37:18 -07:00
slackersoft
3b8326f1e6
Detect global object properly when getting the jasmine require obj
...
- Pull global detection into requireCore and pass the global to base
Fix #569
[fix #73684570 ]
2014-08-28 13:31:04 -07:00
Greg Cobb and Tim Jarratt
980509cd7b
Preserve relative order of "alls" w.r.t. "eachs"
...
[Finishes #73742528 ]
2014-08-28 11:54:58 -07:00
Greg Cobb and Tim Jarratt
b984ff2fa6
Run before,afterAlls as 'eachs' when specifying runnablesToRun
...
- Fix bug where beforeAlls were being mutated in Suite#execute
- When Env.execute() receives a list of runnables, beforeAlls and
afterAlls are collected as beforeEachs and afterEachs. This allows
runnables to be specified in any order, regardless of if any of them
have before/afterAlls.
- Spec constructor takes a single function that returns both before and
afters, instead of two functions. This breaks the current interface
for constructing a Spec.
[#73742528 ]
2014-08-28 11:54:54 -07:00
Greg Cobb and Tim Jarratt
61bf9ac7d7
Improve quality of async timeout for afterAll spec
...
We found that this test was always passing and had strange interactions
with the ordering of other specs. Rewriting it to explicitly finish the
afterAll after a specified interval makes it fail correctly.
[#73742528 ]
2014-08-28 11:54:46 -07:00
Greg Cobb and Tim Jarratt
5b397ff33e
Revert "Deprecate suite/spec ordering hook ."
...
This reverts commit 76fafa0388 .
[#73742528 ]
2014-08-28 11:54:27 -07:00
Greg Cobb and Tim Jarratt
cd4d5c2445
ConsoleReporter exits 1 when afterAll events occur
...
[Finishes #67068790 ]
2014-08-27 14:45:59 -07:00
Greg Cobb and Tim Jarratt
5b6edff3fd
Report AfterAll failures as they occur
...
There didn't seem to be a valid reason to wait until the very end to
report these.
2014-08-27 14:01:28 -07:00
Greg Cobb and Tim Jarratt
cc3678f033
Refactor suite to share reportExpectationFailure func
...
This was shared between our suite factory and the suite factory.
Sweet.
2014-08-27 13:50:56 -07:00
Greg Cobb and Tim Jarratt
35f52bcb24
Rewrite an incorrect suite spec
2014-08-27 12:27:11 -07:00
slackersoft
f8bccabf03
Move afterAll reporting into Suite since that's where they're being tracked
2014-08-27 08:13:17 -07:00
Greg Cobb and Tim Jarratt
97867b2bf5
Reports expectation failures in afterAlls
...
This makes the specs green and appears to work for most cases. I have a
number of concerns about the implementation and would appreciate
ideas/feedback.
- Suite#addExpecationResult infers if it is coming from an afterAll fn
based on if the first child of the suite is finished. This assumes
that the first child of the suite is a spec (this appears to be true
as long as there is at least one spec in the suite)
- Suites behave like unfinished specs. Because suites will propagate
expectation failures to their children suites, the afterAll
expectation reporting appears to work for suites without specs
unless you have:
1) An otherwise empty suite with an afterAll
2) An afterAll'd suite whose first suite is empty (or whose first
suite's first suite is empty (and so on))
- Changed afterAllError to afterAllEvent, so it can accommodate both
errors and expectation failures. The reporter now receives a string
instead of the actual error object. The loss of the object doesn't
affect our reporters, but may be a nice-to-have for other reporters/
the future.
- The gap between the expectations caught in Suite and QueueRunner (who
triggers reporting via an injected callback) is an array injected into
QR by the Suite. The array is then flushed at some point (currently
after the attempt… functions). This works, but is a bit goofy.
[#73741654 ]
2014-08-26 18:04:12 -07:00
slackersoft
18eb6e2f36
Don't run npm package specs in browsers
2014-08-26 13:18:16 -07:00
Tomás Girardi
51462f369b
Allow clearInterval to clear it's own interval
...
As described in issue #655 , the handler of an interval cannot
successfully clear the same interval that generated it's invocation.
Solve this issue by changing the order in which interval's handlers are
called and then rescheduled to: first reschedule it and then call it.
The actual order (call first then reschedule) produces that, during the
execution of the interval's handler, the handler is not registered as
a function to run after a timeout or interval ("scheduledFunctions"),
because it was previously unregistered. Consequently, if the handler
calls clearInterval, that function wont be able to find the handler and
remove it completely.
2014-08-26 12:01:49 -04:00
slackersoft
ea57ad97cf
Add some tests to make sure we're packaging up the npm properly
2014-08-26 08:08:04 -07:00
slackersoft
3132d98f23
Bump version to 2.0.4 now that I think npm files are sorted
2014-08-24 21:14:11 -07:00
slackersoft
b799f54bc9
Remove runtime dependency on 'glob' so we have no runtime deps
...
- Clean up .npmignore a bit more
2014-08-24 21:11:50 -07:00
Alexei Bykov
ac8ef2988d
add better support of DOM nodes into equality matcher
2014-08-24 17:07:18 +04:00
slackersoft
3c051fc291
bump to 2.0.3 to fix npm dependencies
2014-08-22 22:50:46 -07:00
slackersoft
6b937da863
Fix npm dependencies
2014-08-22 22:47:43 -07:00
slackersoft
89232db2ee
Version bump to 2.0.2
2014-08-22 22:20:38 -07:00
slackersoft
8b0d9c83bb
keep the files for running in a webpage around in the npm package
...
[Fixes #656 ]
2014-08-21 12:56:04 -07:00
slackersoft
60533ca868
Expose files and paths necessary to embed jasmine in an html page for nodejs
2014-08-21 08:17:02 -07:00
slackersoft
048ab728ec
Pull out the building of the jasmine interface so node and web both get the same one.
2014-08-15 08:14:59 -07:00
slackersoft
488df899fb
Merge branch 'javenwang-suite-start'
2014-08-06 13:24:25 -07:00
slackersoft
753f4b44b4
Merge branch 'suite-start' of https://github.com/javenwang/jasmine into javenwang-suite-start
2014-08-06 13:24:01 -07:00
slackersoft
2c23d35b03
Merge branch 'javenwang-disabled-suite'
2014-08-06 13:14:00 -07:00
Javen Wang
2b0be0c74b
a disabled suite should call resultCallback with status being disabled
...
close #574
2014-08-06 13:09:44 -07:00
slackersoft
b4f49db6bd
Show a dot with color of pending spec when no expectations
...
[fix #76307802 ]
2014-08-04 12:48:35 -07:00
slackersoft
cee3cc56e6
fix casing for jshint
2014-07-31 13:42:09 -07:00
slackersoft
f2346d357f
Allow mocked Date constructor to be called with a subset of full params
...
Fix #643 #624
2014-07-31 13:42:05 -07:00
Sheel Choksi
ee09301d8d
Console reporter prints out failed expectation's message
...
Previously, was only printing out the stack while the html reporter
would print out the message as well as the stack. Now they should be
more consistent.
As noticed by @despairblue in #638
2014-07-27 18:31:47 -07:00
Davis W. Frank
760b50d969
Adding NPM instructions
2014-07-21 13:56:15 -07:00
Davis W. Frank
773b15e450
Fixed typo in 2.0.1.md
2014-07-21 13:24:10 -07:00
Davis W. Frank
227698f5fa
Updating source and standalone distribution to 2.0.1
2014-07-21 12:36:24 -07:00
Davis W. Frank
ff1fa6a893
Updating version to 2.0.1
2014-07-21 12:35:34 -07:00
Davis W. Frank
ba1f8bc036
Merge branch 'master' of https://github.com/pivotal/jasmine
2014-07-21 12:33:42 -07:00
Davis W. Frank
a5be51f912
First cut at 2.0.1 release notes
2014-07-21 12:33:39 -07:00
Rajan Agaskar
d64ed6ebe9
Merge pull request #632 from kissrobber/bug_fix
...
Fixes incorrect use of signature args
- Not currently an issue, since always called with '2', but could break unexpectedly if argSlice is used without reading the body.
2014-07-21 06:46:05 -07:00
kissrobber
062dc6b15a
fix a potential bug
2014-07-21 00:35:33 +09:00
slackersoft
33641578e6
update release doc to use github releases
2014-07-18 14:27:18 -07:00
slackersoft
a1c109ea17
Contains is explicitly false if actual is undefined or null
...
Fix #627
2014-07-18 13:18:22 -07:00
slackersoft
62212bbfa4
use released jasmine selenium runner
2014-07-18 13:07:11 -07:00
Rajan Agaskar
6a89d084f4
Merge pull request #621 from bengrunfeld/docs-installation
...
Add installation instructions to README
2014-07-07 12:56:32 -07:00
bengrunfeld
013c4f725f
Add Ruby Gem and Python Egg to docs
2014-07-07 10:11:13 -06:00
bengrunfeld
c064488192
Add installation instructions to README
2014-07-07 09:37:44 -06:00
Sheel Choksi
f20df57607
Keeping jasmine_selenium_runner in Gemfile only for now
2014-06-28 18:09:41 -07:00
Sheel Choksi
48f7a5f17b
Point to head of jasmine_selenium_runner
...
jasmine_selenium_runner on master now has a fix for printing circular
objects which is needed since Jasmine has some circular objects that are
included now that we return passedExpectations (but was a bug with
failedExpectations anyways)
2014-06-28 17:59:29 -07:00
Sheel Choksi
f7ff47706c
Remove 'empty' as an option as a spec result
...
- Having the 'empty' state for a spec result can be considered a
breaking change to the reporter interface
- Instead, we determine if a spec has no expectations using the added
key of 'passedExpectations' in combination of the 'failedExpectations'
to determine that there a spec is 'empty'
[fixes #73741032 ]
2014-06-27 23:50:28 -07:00
Alex Treppass
5f34be446c
keeping track of passed expectations
2014-06-27 22:34:05 -07:00
Sheel Choksi
e1e49e8292
Bumping built distribution
2014-06-27 22:19:44 -07:00
paladox2015
ae94dd1bfa
Update json2.js
2014-06-27 10:51:02 +01:00
Lee Penkman
eb1bd25445
namespace html-reporter -> jasmine_html-reporter
2014-06-22 21:47:46 -07:00
Lee Penkman
aac6968ed8
Stop Jasmine's CSS affecting the style of the body tag
...
[fixes #600 ]
2014-06-22 21:47:07 -07:00
slackersoft
1bad048c15
Extract afterAll checking from queueRunner
2014-06-20 08:16:42 -07:00
Sheel Choksi
7d93541c09
Throw a more specific error when 'expect' is used without a currentSpec
...
If an async test has timed-out, there could still be some expectations
that are scheduled to run after the fact in which case curerntSpec will
be null. Rather than the type error that would result, we now indicate
that 'expect' was used at an unexpected time.
This also helps cases where an 'expect' is being used at a top-level,
showing an error message in the console for this case as well.
[fixes #602 ]
2014-06-06 23:49:58 -07:00
Drew Freyling
29aad761d9
Smushed with PNG Gauntlet.
2014-06-06 23:09:08 -07:00
Sheel Choksi
7d3de92cef
Merge pull request #594 from plukevdh/reporter-reset
...
HTML Reporter reset previous DOM when re-initialized
2014-06-06 22:59:52 -07:00
Sheel Choksi
13e0dd27c9
Narrow down raise exceptions query selector
...
Finding by any input tag is a little bit broad [#605 ]
2014-06-06 22:20:18 -07:00
slackersoft
f0892a55aa
report when an async afterAll doesn't call in time
2014-06-06 18:41:06 -07:00
Sheel Choksi
fc6603e99f
Merge pull request #580 from pablofiu/detailedGeneralWorkflow
...
added detailed steps on how to contribute coding
2014-06-02 23:04:35 -07:00
Luke van der Hoeven
07cce0b1d1
clear prior test results on multiple inits
2014-05-23 15:59:56 -04:00
Luke van der Hoeven
6750559211
failing spec for multiple inits
2014-05-23 15:58:09 -04:00
Pablo Alejandro Fiumara
0419780682
added detailed steps on how to contribute coding
2014-04-25 01:18:38 -03:00
Gregg Van Hove
6066c71966
Add failing specs for expectation failures in afterAll
2014-04-18 16:37:27 -07:00
Gregg Van Hove
0d4b04d37c
rename afterAllException to afterAllError
...
It should also handle expectation failures
2014-04-18 16:00:02 -07:00
Javen Wang
7ad261837a
disabled suite should still call onStart callback
2014-04-12 00:35:47 +08:00
Sheel Choksi
00c8e37257
Pass through custom equality testers in toHaveBeenCalledWith [ fixes #536 ]
2014-03-26 22:19:03 -07:00
Christopher Amavisca and Davis W Frank
e53b487017
- Add a main entry point for the jasmine-core npm
...
- jasmine-core can now self test with the jasmine-npm
- Add node examples files
- Add node_boot.js for node environment
- Move jasmine-core npm packaging to .npmignore
- removing src_dir and src_files from jasmine.json b/c jasmine-npm does not support requiring source files automatically.
2014-03-21 17:21:52 -07:00
Sheel Choksi
ed5cd6ba2c
Merge pull request #550 from slothmonster/fix-copyright-year
...
Fix outdated copyright year (update to 2014)
[skip ci]
2014-03-16 18:36:21 -07:00
Greg Cobb and Luan Santos
213a6023fd
Add package.json to egg to get correct version number
...
[#67556148 ][#551 ]
2014-03-14 10:51:26 -07:00
Adam Deibert
7d220fcd1b
Fix outdated copyright year (update to 2014)
2014-03-14 01:42:39 -07:00
Greg Cobb and Luan Santos
c1382c77b4
Enable bundler cache
2014-03-12 13:46:25 -07:00
Greg Cobb and Luan Santos
311263a3df
Fix build in IE8 (IE8 doesn't support Object.freeze)
2014-03-12 13:45:46 -07:00
mikemoraned
33e4f5efbe
Allow users to set the maximum length of array that the pretty-printer
...
will print out.
Currently, jasmine's pretty printer will iterate over an entire array,
formatting every element recursively. For very large arrays, this can
crash the page, or cause a 'slow script' warning.
This commit exposes a 'MAX_PRETTY_PRINT_ARRAY_LENGTH' option. If an
array larger than this is encountered, recursion will stop and the
array length will be printed instead e.g. "Array[20000000]".
The 'MAX_PRETTY_PRINT_ARRAY_LENGTH' option defaults to 100. This is
length of array will not kill your browser, but will allow you
to see big arrays, if you can stomach the output.
2014-03-12 12:16:01 -07:00
Greg Cobb and Luan Santos
367d3dcf66
Rebuild distribution
2014-03-12 11:51:49 -07:00
Greg Cobb and Luan Santos
21de44a204
Remove space between key and colon when pretty printing objects
...
[#4005255 ]
2014-03-12 11:47:47 -07:00
Greg Cobb and Luan Santos
c9e37a2a1c
Refactor prettyPrinter to work with immutable objects
...
[#50766813 ][#266 ]
2014-03-12 11:41:18 -07:00
Davis W. Frank
9e927af56e
Merge pull request #548 from pivotal/python
...
Create jasmine-core python egg
2014-03-11 14:05:45 -07:00
Greg Cobb
fc173e9a5e
Add logo image to readme
2014-03-11 13:54:47 -07:00
Greg Cobb
62a7f64659
Update readme with correct code climate link
2014-03-11 13:49:51 -07:00
Greg Cobb and Luan Santos
3e739e4bc9
Create jasmine-core python egg
2014-03-11 13:40:28 -07:00
Greg Cobb and Luan Santos
ba6f99423f
Add jasmine logo image to html runner
...
[#3984585 ]
2014-03-10 17:16:31 -07:00
Christopher Amavisca, Greg Cobb and Luan Santos
3a5672cd33
Show message if no specs are found in console reporter
...
[#12784235 ]
2014-03-10 12:00:49 -07:00
Christopher Amavisca, Greg Cobb and Luan Santos
af4cc76e2a
Show message if no specs are found
...
[#12784235 ]
2014-03-10 11:23:27 -07:00
Christopher Amavisca, Greg Cobb and Luan Santos
1922514f2d
Specs without expectations should be alerted to the user
...
- Add console.error to the HtmlReporter when there is a spec without any expectation
- Change the spec's link text and color to include a warning
- Create a status for specs to label them as "empty"
- console is not accessible to IE unless you have developer tools open,
so protect against that by mocking console.
[#59424794 ]
2014-03-10 11:19:07 -07:00
Christopher Amavisca and Greg Cobb
668846147c
Fix issues with displaying error messages for afterAll (browser compatibility)
...
- Switch from showing error stack to showing message/description since only chrome/ff support stack
- Fallback to error.description if error.message is undefined
- Made exceptionList variable name consistent between both reporters
2014-03-06 18:25:49 -08:00
Christopher Amavisca and Greg Cobb
76fafa0388
Deprecate suite/spec ordering hook .
...
- Remove parameter from env.execute()
- Remove deprecated test
- Set runnablesToRun to always start with the topSuite
[#66789174 ]
2014-03-06 16:54:53 -08:00
Christopher Amavisca and Greg Cobb
bed1c15ea4
HtmlReporter shows error alerts for afterAllExceptions
...
-Add list of exceptions in HtmlReporter to push to on error
-Create alerts for each exception in the list (with stack trace)
[#67055688 ]
2014-03-06 15:39:04 -08:00
Christopher Amavisca and Greg Cobb
6caf4c5de2
Print afterAllExceptions to the console.
...
- Add afterAllException function to ConsoleReporter
- Print the stack traces of the errors at the end of the console output
[#67055730 ]
2014-03-06 15:02:55 -08:00
Christopher Amavisca and Greg Cobb
97ae9a2d88
After all exceptions dispatch to reporter hook
...
- Add 'afterAllException' hook to reporter dispatch, we might want to make this more generic in the future
- Add afterAllException function to HtmlReporter
[#66789174 ]
2014-03-06 12:01:37 -08:00
slackersoft
71dbffeaef
Merge branch 'recursive-containing' of https://github.com/cbandy/jasmine into cbandy-recursive-containing
2014-03-05 21:01:34 -08:00
Christopher Amavisca and Greg Cobb
a3c3505086
beforeAll can have expectations and passes expectation failures to its children
...
[#66789174 ]
2014-03-05 16:27:58 -08:00
Christopher Amavisca and Greg Cobb
a9e0112a9b
Throw error if you add a custom matcher or equality outside of a runnable
...
[#66789174 ]
2014-03-05 14:37:17 -08:00
Christopher Amavisca and Greg Cobb
a2ac5ef3b6
Throw error if you define a spy outside of a runnable
...
[#66789174 ]
2014-03-05 14:27:19 -08:00
Christopher Amavisca and Greg Cobb
b200952195
Only clear resources if suite is not disabled
...
[#66789174 ]
2014-03-05 14:00:57 -08:00
Rajan Agaskar
9c6d03d3ac
README.md: Add link to Jasmine 2.0 release notes
...
- To help people upgrading find a list of what they'll need to change.
2014-03-05 11:31:39 -08:00
Christopher Amavisca, Greg Cobb and Sheel Choksi
752a36d3ff
Manage spys/matchers/custom equalities for beforeAll
...
- Refactor expectations to take list of matchers
- Add spyRegistry to manage runnables' spies
- Add clone util
[#66789174 ]
2014-03-05 10:28:37 -08:00
Gregg Van Hove and Sheel Choksi
52026fb0f7
beforeAll/afterAll can be timed out and errors are applied to all children specs
2014-03-03 16:13:59 -08:00
Gregg Van Hove and Sheel Choksi
e17a2cb1e0
share usercontext for full suite
2014-03-03 11:57:32 -08:00
Gregg Van Hove and Sheel Choksi
ec5695acc1
first (naive) pass at beforeAll/afterAll
2014-03-03 09:26:39 -08:00
Chris Bandy
47884032ad
Fix ObjectContaining to match recursively
...
matchersUtil.equals() does not expect a matcher as its first argument,
so send the "actual" value first and the "expected" value second.
2014-03-02 11:42:37 -06:00
slackersoft
d7053612f5
Build distribution to include MockDate
...
- Forgot to do this when merging the pull request
- Also fix quotes for string to match jshint rules
2014-03-01 13:18:15 -08:00
Christopher Amavisca and Sheel Choksi
9d1e92f5e2
Clean up more remnants of dev_boot
2014-02-27 18:02:14 -08:00
Elana Koren and Gregg Van Hove
eebba2ecca
Support browsers that don't supply a Date.now()
...
- install the mockDate by calling `mockDate` on `clock` instead of
passing an argument to `clock.install()`
[Finishes #66606132 ] Closes #361
2014-02-27 11:55:25 -08:00
Elana Koren and Gregg Van Hove
627a262085
Merge branch 'mock-date' of https://github.com/jalopez/jasmine into jalopez-mock-date
2014-02-27 10:03:35 -08:00
Christopher Amavisca and Sheel Choksi
305bd73142
Instead of dev boot use a custom helper to defined j$
2014-02-26 17:35:10 -08:00
Elana Koren and Gregg Van Hove
fb853ad5b5
Don't include jasmine_selenium_runner from github, now that it's
...
published to rubygems
[finish #66472672 ]
2014-02-26 15:30:17 -08:00
Greg Cobb and Sheel Choksi
640f94a1bd
Don't allow calling the same done callback multiple times
...
[finishes #62585700 ][fixes #523 ]
2014-02-25 18:06:30 -08:00
Greg Cobb and Sheel Choksi
5aac3e3292
Refactor Spec and QueueRunner [ #62585700 ]
...
- QueueRunner now responsible for timing out async specs instead of
Spec
- Make sure only spec functions are timeoutable and not suites (due to
the refactor)
2014-02-25 18:06:30 -08:00
Charles Hansen and Gregg Van Hove
84160ff51d
revert to old version of checking the docs
2014-02-25 11:28:02 -08:00
Charles Hansen and Gregg Van Hove
e972bac80d
No longer try to push to github, we'll update jasmine in docs manually
2014-02-25 10:58:59 -08:00
Charles Hansen and Gregg Van Hove
455b6bade8
bundle install in docs repo
2014-02-25 10:56:41 -08:00
Charles Hansen and Gregg Van Hove
23c0e379e0
update edge docs when changes are made to jasmine
2014-02-25 10:42:59 -08:00
Robin Böhm
31d71ac22f
add single quote check to jshint and fix src files for that
...
[fixes #522 ]
2014-02-24 16:28:16 -08:00
Greg Cobb and Sheel Choksi
095b02ad83
Follow redirects when trying to connect to sauce
2014-02-24 16:13:25 -08:00
Greg Cobb and Sheel Choksi
98c258a659
Bump built distribution [ #503 ][finishes #66350898 ]
2014-02-24 15:47:34 -08:00
Michal Mocny
85fa148f18
Support running jasmine within CSP (remove eval)
...
[fixes #503 ]
2014-02-24 15:44:11 -08:00
Sheel Choksi
76ca5ef6d4
Allow matcher custom failure messages to be a function
...
By deferring the evaluation of these messages, we can avoid the
expensive creation of them when in the majority use case (tests are
passing) they are not needed.
These failure messages were causing performance problems with larger
objects needed to be pretty printed as discussed in #520 and brought up
by @rdy.
[fixes #65925900 ][fixes #520 ]
2014-02-18 20:05:30 -08:00
Sheel Choksi
46d2c43da1
Revert "Use default failure message for toBeNaN"
...
Forgot that NaN has special casing that it needs a custom error message
for
This reverts commit b6c03a34e7 .
2014-02-18 19:14:16 -08:00
Sheel Choksi
b6c03a34e7
Use default failure message for toBeNaN
...
It is providing the same functionality by default without a custom error message
2014-02-17 22:45:54 -08:00
Sheel Choksi
4ddf316388
Add in default rake task
2014-02-16 14:57:14 -08:00
Sheel Choksi
a8cbef3123
More color blind friendly CSS from @dleppik
...
Updating the passing and failing colors in HTML reporter to
help red/green color blind users using the colors suggested by @dleppik
Console reporter still likely needs similar changes but there's less
options there
[#463 , #509 , finishes #60613086 ]
2014-02-16 14:56:18 -08:00
Sheel Choksi
a937d8d74f
Merge pull request #521 from robinboehm/load-grunt-tasks
...
use load-grunt-tasks
2014-02-16 14:53:07 -08:00
Robin Böhm
2fc2802809
use load-grunt-tasks
2014-02-16 22:13:53 +01:00
Sheel Choksi
7cf899a4ea
Special case printing -0
...
Use the 1/x trick to determine if a value is -0 and special case the
printing of it.
[closes #496 ]
2014-02-09 14:14:33 -08:00
Sheel Choksi
83c0ea7f91
Fix error message in jasmine.any
...
The expected any 'class' was not being included in the error message
due to accessing the wrong property
2014-02-09 14:06:47 -08:00
Sheel Choksi
289c8313d1
Short spec to document why we close over Date and ensure cross-browser compatibility
...
[closes #506 ]
2014-02-09 12:20:03 -08:00
tcorral
b5775aec4f
Allow stub or spy Date object safely using a closure to get a clean copy
...
[closes #506 ]
2014-02-09 12:20:03 -08:00
Davis W. Frank
21b01f4a5d
Whitespace Markdown fix
2014-01-24 09:32:20 -08:00
Davis W. Frank
71faeea7b0
First attempt at publishing an npm
2014-01-24 09:31:38 -08:00
Sheel Choksi
de7d005b3d
Break out quick start guide on newline
...
[skip ci]
2014-01-19 14:21:21 -08:00
Sheel Choksi
7acf5d4220
Add in link to quick start of Jasmine, closes #498
...
[skip ci]
2014-01-19 14:16:00 -08:00
slackersoft
2a8b5a30b6
Use \d7 instead of plain 'x' for more square appearance
...
[finishes #48434179 ]
2014-01-18 17:33:57 -10:00
Sheel Choksi
9c7ba43ebd
Clean up a bunch of spec global variable leaks
...
Also some formatting changes to highlight when using one 'var' with comma operator
2014-01-18 14:17:14 -08:00
Sheel Choksi
8ca08ff999
Run Object.create(null) spec on all browsers not IE 8
...
IE 8 doesn't support Object.create so there shouldn't be a need to run this spec in IE 8
2014-01-18 13:12:07 -08:00
slackersoft
15aa3ecb5d
Better support in pretty printer when an object has null prototype
...
- Fixes #500
2014-01-17 19:56:43 -10:00
Davis W. Frank
2670bb40a7
Get rid of freeze property for now - it's not adding value.
2014-01-10 10:23:14 -08:00
Sheel Choksi
c8ffa6000b
Reproducing change made in #479 that was made to build distribution instead of src
...
It was lost when I rebuilt the distribution
2014-01-09 22:14:04 -08:00
Sheel Choksi
06a553503d
Better failure message when something is thrown that's not an error
...
Change from 'undefined : undefined' to '<thing that was thrown> thrown'
Pointed out by @charleshansen
2014-01-09 22:10:40 -08:00
Sheel Choksi
aab4808410
Bump built distribution
2014-01-09 22:07:59 -08:00
Sheel Choksi
b525313cdb
Make the check for pending spec exception work for values that don't have toString
2014-01-04 23:11:20 -08:00
Sheel Choksi
f576395620
Bump built distribution copyright's for 2014
2014-01-04 23:11:20 -08:00
Sheel Choksi
b161e9e3df
Merge pull request #486 from nextmat/link_fix
...
Update link at top of README
2014-01-01 20:00:18 -08:00
Matt Sanders
94ecb998bb
Update link at top of README
...
Allows access to Jasmine 2.0 docs
2013-12-27 00:29:35 -07:00
Davis W. Frank
38daa43c7e
Merge pull request #479 from shprink/fix_jasmine_html
...
force query selector to seek within the html-reporter element
2013-12-19 09:42:15 -08:00
Davis W. Frank
9fb9c12066
Merge pull request #478 from shprink/adding_netbeans_to_gitignore
...
adding netbeans project folder to the gitignore list
2013-12-19 09:37:19 -08:00
shprink
de2fb225b0
adding netbeans project folder to the gitignore list
2013-12-19 10:20:49 +01:00
shprink
4f4ae086aa
force query selector to seek within the html-reporter element
2013-12-19 10:19:02 +01:00
Sheel Choksi
8510bdd947
Update mailing list link
...
It seems that Github was interpreting it as a repository link. Made it an explicit mailto instead.
2013-12-17 18:37:10 -08:00
Sheel Choksi
66bd8c7825
Adding older standalone zips from downloads page to our dist folder
2013-12-17 12:19:53 -08:00
Christopher Jobst and Sheel Choksi
a736e664ea
Remove the old RC standalone distributions.
2013-12-16 15:49:27 -08:00
Christopher Jobst and Sheel Choksi
812b14d000
Update README and remove rc release notes
...
RC release notes have been merged into release_notes/20.md
2013-12-16 12:42:17 -08:00
Christopher Jobst and Sheel Choksi
a2a8b5dde2
Create a 2.0 distribution
2013-12-16 12:33:34 -08:00
Christopher Jobst
78bed99ba3
Add in 2.0 release notes
2013-12-16 11:17:51 -08:00
pimterry
b1d4ab09af
Add tests for call return value tracking
2013-12-08 13:40:25 +00:00
pimterry
3b52d015ea
Track return values of spy functions
2013-12-08 13:40:24 +00:00
Sheel Choksi
f9191d7b0d
Merge pull request #473 from pimterry/callTrackingTests
...
Refactored the createSpy tests, to add unit tests for its part of call tracking
2013-12-07 16:57:57 -08:00
pimterry
83a692d5a8
Use the correct Jasmine version in the spy integration tests
2013-12-07 22:16:24 +00:00
pimterry
14a8c2ca09
Move spy integration tests out of the unit test suite
2013-12-07 20:52:02 +00:00
pimterry
b2e8de7bcd
Mock callTracker in spy tests for better test isolation
2013-12-07 20:43:38 +00:00
pimterry
1d98a23b14
Add tests for call tracking in createSpy
2013-12-07 20:27:08 +00:00
Sheel Choksi
16ffd3b3fb
Fix up specs that failed when maximumSpecCallbackDepth is set to 1
2013-11-22 23:04:42 -08:00
Sheel Choksi
6bc87ad223
Merge pull request #466 from
...
maciej-filip-sz:DelayedFunctionScheduler-patch
Sets and executes timeouts set during a tick.
2013-11-17 17:17:31 -08:00
Maciej Filip Szkodziński
555d328cf2
Moved last currentTime assignment to tick.
2013-11-17 17:14:29 -08:00
Maciej Filip Szkodziński
c78fba4b13
Sets and executes timeouts set during a tick.
...
All timeouts and intervals set during a tick were being scheduled to run
at delay + end-of-tick, instead of delay + time-of-outer-timeout.
Scheduled run-at times were shifted because currentTime was being
incremented before executing scheduled functions.
Additionally, the execute loop was iterating over a functions-to-run
array, created from scheduledFunctions before starting. Any changes to
scheduledFunctions were being ignored during the tick, and the next tick
would ignore any functions which should have been executed in the past.
The commit is a rewrite of DelayedFunctionScheduler, preserving the
public interface. Execution of scheduled functions updates currentTime
on each iteration, and each time takes the functions with the lowest
runAtMillis from the schedule, if they aren't higher than endTime.
2013-11-17 17:14:29 -08:00
Sheel Choksi
8a6d7828c6
Make all async functions be subject to the timeout
...
[finishes #60798058 ]
2013-11-14 23:01:43 -08:00
Sheel Choksi
c888b0c1b8
Slight refactoring of clearing timeouts when an exception is thrown
2013-11-14 20:48:28 -08:00
Sheel Choksi
72e9851217
Bumping built distribution
2013-11-14 18:16:32 -08:00
Sheel Choksi
7ee5073921
Fix bad merge
2013-11-11 21:01:36 -08:00
Sheel Choksi
614a18453e
Rename Spec's queueRunner to more accurately be a queueRunnerFactory
2013-11-11 20:53:13 -08:00
Rajan Agaskar
916f889c01
Merge pull request #462 from tidoust/clear-timeout-async
...
Clears timeout timer even when async spec throws an exception
2013-11-07 09:40:43 -08:00
François Daoust
4a7b79ad0d
Regression spec added for timeout timer in an async spec
...
The spec ensures that the timeout timer is properly cleared out
even when the async spec throws an exception.
2013-11-07 16:08:41 +01:00
François Daoust
775e2ff0a9
Clears timeout timer even when async spec throws an exception
...
When an async spec throws a (sync) exception for some reason, the
exception was correctly caught and reported by Jasmine but the timeout
timer continued to run in the background.
For instance, running the (rather stupid) example below would report
the exception immediately but would also make the process loop for 5s
(and report the exception depending on the reported being used).
describe('exception', function () {
it('is caught but timer continues to run', function (done) {
throw new Error('Oh no!');
});
});
This happened because the timout timer is set in Spec while the
"try... catch" block is in the queue runner. The "callDone" function
of "timeoutable" that resets the timer was thus not called.
The commit simply introduces a "try... catch" block within the
`timeoutable` function to ensure that "callDone" gets called even
when an exception is thrown.
2013-11-07 14:51:46 +01:00
Sheel Choksi
1b6725ec25
Updating Spec#getFullName spec to work in IE 8
...
Forgot that the pretty printer is not functional in IE 8, which
subsequently brings down toHaveBeenCalledWith
2013-11-04 21:59:06 -08:00
Sheel Choksi
952eb59707
Change test for how a spy gets its full name
...
- Removes another TODO
- A spec uses its full name as soon as it is created (for the result
object) and so it needed to be tested differently
2013-11-04 21:38:01 -08:00
Sheel Choksi
de6a305b44
Move the various integration specs into their own folder
...
- There is now an integration folder inside of spec/core
- Killed the TODOs about moving around integration specs
2013-11-03 16:48:35 -08:00
Sheel Choksi
8513201fa3
Add in missing repository field to package.json
...
Removes the following warning when doing a `npm install`: 'npm WARN
package.json jasmine-core@2.0.0-rc5 No repository field.'
2013-11-02 18:28:53 -07:00
JR and Sheel Choksi
6e07dccb68
Make getGlobal() work in strict mode
...
Slight modifications to implementation in pull #437
2013-11-01 11:06:57 -07:00
JR and Sheel Choksi
fcc50cc6f4
Rename Release.markdown to be more consistently named
2013-10-31 14:27:30 -07:00
Sheel Choksi
9e8466ba2b
Merge pull request #458 from jsoref/readme
...
Rename README for consistency
2013-10-31 14:24:43 -07:00
Kristóf Marussy
4350045d61
Replaced deprecated octal literal with hexadecimal
...
Octal literals are deprecated in JavaScript 1.5 and Gjs were generating
warnings because of them.
2013-10-31 14:03:06 -07:00
Rajan Agaskar
666e9c341e
Merge pull request #460 from jsoref/releasenotes
...
Improving Release note text
2013-10-30 20:52:30 -07:00
Josh Soref
5830d9f86b
Improving Release note text
2013-10-30 23:14:57 -04:00
August Toman-Yih and Sheel Choksi
ea888e4c03
Fix triple/tripple spelling error
2013-10-30 17:30:25 -07:00
Josh Soref
c7e3ca6c8a
Spelling: Fix spelling errors
...
* equal
* existence
* expectation
* expected
* intend
* message
* report
* singular
2013-10-30 20:12:05 -04:00
Josh Soref
06db4a8583
Rename README for consistency
2013-10-30 10:31:15 -04:00
Rajan Agaskar and Sheel Choksi
a2debf60b6
Use jasmine.addMatchers instead of reaching through jasmine.Expectation [finishes #59518946 ]
2013-10-29 18:35:17 -07:00
Sheel Choksi
04c7db9259
Update built distribution to include latest 2.0.0-rc5 fixes
2013-10-29 17:40:15 -07:00
Sheel Choksi
8585ef69a5
Update clock not installed message to reflect current boot installation process
2013-10-29 17:33:51 -07:00
Sheel Choksi
cb5aea1fcf
Fix builds by working around browser timing functions not being successfully overridden
2013-10-29 17:32:04 -07:00
Sheel Choksi
966f76b481
Add in missing clock uninstall
2013-10-29 17:28:41 -07:00
Sheel Choksi
40e3020fdc
Build distribution for 2.0.0-rc5 and associated standalone distribution
2013-10-29 14:03:02 -07:00
Sheel Choksi
69549a6ff3
Add in 2.0.0-rc5 release notes
2013-10-29 14:03:01 -07:00
Sheel Choksi
a03fad8911
Move built console.js into lib and include in standalone distribution
...
[finishes #59679110 ]
2013-10-29 14:03:01 -07:00
Sheel Choksi
61993cf1fc
Expose Jasmine's topSuite [finishes #59774024 ]
2013-10-29 11:27:12 -07:00
Kyriacos Souroullas and Sheel Choksi
cd9d5284cd
Matchers can have a negativeCompare
...
- Passing in a 'negativeCompare' will cause that function to be used when it is a 'not' assertion
- Otherwise, the reversal of the compare's result will be used instead
[finishes #59703824 ]
2013-10-28 17:13:18 -07:00
Kyriacos Souroullas and Sheel Choksi
e346e7dcc1
Revert removal of compare nesting
...
Since we want the user to be able to pass a negative comparison function, the extra layer of wrapping is now needed
2013-10-28 17:13:09 -07:00
Davis W. Frank
dd8a455f91
Adding Code Climate badge to README
2013-10-25 12:25:27 -07:00
Davis W. Frank
9e149d1e0f
Move node dev deps forward, add .jshintrc to support latest grunt-contrib-jshint and Code Climate score
2013-10-25 12:23:57 -07:00
Sheel Choksi and Tim Jarratt
797984f173
Add newlines to end of files
2013-10-25 10:57:43 -07:00
Sheel Choksi and Tim Jarratt
29c5c127e5
Refactor Suite.addSpec and .addSuite to .addChild
2013-10-25 10:52:31 -07:00
Sheel Choksi and Tim Jarratt
26581b4c91
Rename Suite.children_ to .children
...
Also removed some unit tests that were brittle, and already tested by
better, more round-trip tests.
2013-10-25 10:25:50 -07:00
Javier López Pardo
3186b24a66
add acceptance tests for mock clock with date
2013-10-25 14:59:07 +02:00
Javier López Pardo
81b822fea9
Add specs for mock date
2013-10-25 14:41:32 +02:00
Javier López Pardo
fb8bede8ea
Add FakeDate object
2013-10-25 13:25:09 +02:00
Davis W. Frank
243ff80196
Fixing global leak for 'timer'
2013-10-24 17:17:05 -07:00
Davis W. Frank
284bb0b608
Giving Sheel his due
2013-10-24 16:55:51 -07:00
Sheel Choksi
6453ed656b
Suites just have children instead of separating into specs/suites
2013-10-24 16:35:00 -07:00
Sheel Choksi
a1a948b8df
Remove completeCallback from suite as its unused
2013-10-24 16:34:34 -07:00
Sheel Choksi
7a4876ecfa
Also move function to determine whether specs should catch exceptions into closure
2013-10-24 16:24:55 -07:00
Sheel Choksi
d9ece1f14f
Remove version/versionString and currentRunner
...
- Instead of version/versionString, jasmine.version should be sufficient
- currentRunner was exposing Jasmine's internal top level suite
2013-10-24 15:42:46 -07:00
Sheel Choksi
f1613ce77c
Move additional methods from Env prototype to env closure
...
- Users can no longer spelunk the spec tree from topSuite
- Users no longer have access to currentSuite/currentSpec
- Other miscellaneous (arguably less useful) methods have also been tucked
away into the closure, like suiteFactory
2013-10-24 15:28:01 -07:00
Sheel Choksi
a3424ea265
Remove addCustomEqualityTester and addMatchers from global
...
These functions are available on the jasmine namespace
2013-10-24 14:00:05 -07:00
Sheel Choksi
ab0b2b783c
Move next spec/next suite ids into closure
...
No longer exposing these from the environment
2013-10-24 13:43:04 -07:00
Sheel Choksi
d0aff9ed02
Use toThrowError instead of toThrow in places where we are expecting an error
2013-10-24 12:15:17 -07:00
Sheel Choksi
a309117758
Remove TODO: should be easier to load polyfill for timeout functions as Jasmine does not get references to these functions until boot.js is loaded
2013-10-24 11:58:21 -07:00
Sheel Choksi
0c6e590a93
A spec without expectations is considered passing
...
- Specs are passing by default unless told otherwise
- Getting the result.status of a spec before the spec has run is now
undefined instead of pending
[finishes #59422744 ]
2013-10-24 11:34:42 -07:00
Sheel Choksi
d06da150de
Stop passing in queryString to HTMLReporter, it is unused
2013-10-23 11:06:42 -07:00
Sheel Choksi
39d7ebf28e
Remove an extra layer of wrapping for matchers/custom matchers
...
Helps reduce how nested custom matchers have to be for users as well as
Jasmine internal matchers
[#59161378 ]
2013-10-20 22:21:56 -07:00
Sheel Choksi
5f429fcb37
Re-enable CustomMatchersSpec and update for current version of custom matchers
2013-10-20 21:58:16 -07:00
Sheel Choksi
b6eb9a4d5e
Remove now unused updateInterval that was being set in specs
2013-10-20 17:12:40 -07:00
Sheel Choksi
fdb7df812c
Improve error message when a spec doesn't call the async callback within the default time interval
2013-10-19 21:18:06 -07:00
Davis W. Frank
81299860aa
Merge pull request #450 from slackersoft/manualClockUninstall
...
Env no longer automatically uninstalls the clock after each spec
2013-10-18 15:51:10 -07:00
slackersoft
ca6fa6f711
Env no longer automatically uninstalls the clock after each spec
...
- Behaves more like how we want plugins to behave
[#58281436 ]
2013-10-16 18:39:03 -07:00
Davis W. Frank
5aaafed4d8
Move clock from global to jasmine; provide a function to access the clock.
2013-10-10 16:24:58 -07:00
Davis W. Frank
c28c124f58
removed addMatchers from the global. This should have been in previous commit
2013-10-10 14:11:44 -07:00
Davis W. Frank
f0a1adb61c
Continuing boot change with docs
2013-10-10 12:00:46 -07:00
Davis W. Frank
5ff2aecab8
Moving a documented-up boot.js from the website back into core
2013-10-10 11:59:59 -07:00
Davis W. Frank
8ca8197b4c
Make exposure of addMatchers and addCustomEqualityTesters be on jasmine instead of inconsistent.
2013-10-10 11:32:21 -07:00
Davis W. Frank
55716723b5
Adding Compass as a dev dependency in order to build HTMLreporter CSS
2013-10-10 11:27:40 -07:00
Davis W. Frank
3973cc5a71
Merge pull request #443 from kryger/patch-1
...
Fixed broken link to contributing guide
2013-10-08 07:48:53 -07:00
Lukasz Kryger
95af58ade6
Fixed broken link to contributing guide
2013-10-08 11:33:55 +01:00
slackersoft
6641d64305
Make addCustomEqualityTester available on jasmine global
...
- User shouldn't have to `jasmine.getEnv()` to add one
[#54582648 ]
2013-10-06 11:32:38 -07:00
slackersoft
7c1fcd7bb5
Regenerate jasmine.js for QueueRunner fix
2013-10-06 11:32:19 -07:00
slackersoft
e91d0341a4
Revert "Make addCustomEqualityTester available on jasmine global"
...
Oops, this made it on global object, not `jasmnie`
This reverts commit 144ff174f6 .
2013-10-06 11:11:46 -07:00
slackersoft
144ff174f6
Make addCustomEqualityTester available on jasmine global
...
- User shouldn't have to `jasmine.getEnv()` to add one
2013-10-06 11:05:35 -07:00
Gregg Van Hove and Tim Jarratt
af4bfa8bc4
Env should use the "public" QueueRunner interface
2013-10-04 17:04:22 -07:00
Gregg Van Hove and Tim Jarratt
620e3f5992
Run docs tests under phantomjs
2013-10-04 13:32:56 -07:00
Gregg Van Hove and Tim Jarratt
ea76a30d85
Update standalone distributions
...
[#30296755 ]
2013-10-04 12:28:27 -07:00
Gregg Van Hove and Tim Jarratt
adde1b4a5b
Doc js files from jasmine.github.io should be part of CI build
...
[Finish #50572569 ]
2013-10-04 12:10:38 -07:00
Gregg Van Hove and Tim Jarratt
07e7ad2314
Update jasmine_favicon.png
...
Using the new image from google drive. It's 32x32px but browsers should
be able to downsize that to 16x16 if they need to
[Finish #57170588 ]
2013-10-04 10:55:01 -07:00
slackersoft
b5b77b318a
Argument matcher for an array containing at least the specified entries
2013-10-03 18:21:47 -07:00
Davis W. Frank
706180ad01
2.0 rc3 release notes
2013-10-03 16:36:08 -07:00
Davis W. Frank
547c9cfde9
Adding Anchorman back in as a dependency
2013-10-03 16:35:56 -07:00
Gregg Van Hove and Tim Jarratt
d3ec12e62a
buildStandaloneDist should also build jasmine.js
2013-10-03 15:28:42 -07:00
Gregg Van Hove and Tim Jarratt
749c15fe07
Bump version to rc3 in jasmine.js
2013-10-03 15:28:26 -07:00
Gregg Van Hove and Tim Jarratt
7e071547f5
Custom matchers fail to behave as expected
...
If they return false, that should be respected.
Submitted via @tjgrathwell
[Finish #58184156 ]
close #434
2013-10-03 15:13:27 -07:00
Gregg Van Hove
6354ee17e5
Merge pull request #439 from tjarratt/pull_request_travis
...
Don't try to use SauceLabs on pull request builds
2013-10-03 12:32:32 -07:00
Gregg Van Hove and Tim Jarratt
255a50baee
Update contribution guidelines for pull requests
...
[Finish #45961121 ]
2013-10-03 12:30:07 -07:00
Tim Jarratt
520a8c85a2
Don't bother trying to still use firefox
2013-10-03 12:07:57 -07:00
Gregg Van Hove and Tim Jarratt
6de355544f
Make firefox with Sauce explicitly the default test
...
Apparently Travis-ci will create a default test separate from your
matrix includes and this resulted in some testrun duplication.
2013-10-03 11:44:48 -07:00
Gregg Van Hove and Tim Jarratt
95572fb314
Don't try to use SauceLabs on pull request builds
2013-10-03 11:24:57 -07:00
Gregg Van Hove and Tim Jarratt
18e1ab93ea
Release for rc3
2013-10-03 09:55:36 -07:00
Davis W. Frank
0c4113e167
Quick fix - Spec needs j$ at execute time
2013-10-02 22:45:33 -07:00
Gregg Van Hove and Tim Jarratt
a563e67015
Move selenium_runner.yml to spec/javascripts/support
...
- The selenium runner gem should support configurable path as the main
gem does so we don't need to do this. This workaround is kind of
gross.
2013-10-02 16:48:13 -07:00
Gregg Van Hove and Tim Jarratt
fab489851e
Fix paths for node specs
...
[#58126010 ]
2013-10-02 16:41:07 -07:00
Gregg Van Hove and Tim Jarratt
1c19b8e38a
Move spec files back out of spec/javascripts
...
- Jasmine gem allows us to specify a path to jasmine.yml via ENV
[finish #58126010 ]
2013-10-02 16:32:35 -07:00
Gregg Van Hove and Tim Jarratt
fc258b3d36
Make it easy to copy the title of failing specs
...
[finish #58121820 ]
2013-10-02 15:14:41 -07:00
Mike Stay
ffa6138d75
Make getGlobal() work in strict mode
...
An update of fb3e1acb09
ES5 strict mode does not promote an undefined 'this' to the global object. The only way to get the global object in strict mode is to say 'this' while in the global scope.
2013-10-02 12:38:25 -06:00
Gregg Van Hove and Tim Jarratt
51dd66a4cc
Turn the exceptions spec back on, it still works
2013-10-02 10:24:24 -07:00
Gregg Van Hove and Tim Jarratt
37a3135d6a
cleanup whitespace
2013-10-01 16:30:17 -07:00
Gregg Van Hove and Tim Jarratt
cb8ba74937
Don't add periods to the full name of a spec
...
- Breaks links for spec filters
- Looks strange if users add their own
[fix #58043244 ] fix #427
2013-10-01 16:28:33 -07:00
Gregg Van Hove and Tim Jarratt
70fb0f0ed5
Update Firefox pretty print test
...
At some point, firefox changed the exception message.
2013-09-30 15:43:44 -07:00
Sheel Choksi
15889494c5
Update node suites to not rely on previous accidental global j$ and create its own
2013-09-29 14:59:58 -07:00
Sheel Choksi
da33c7823e
Add missing var in front of j$ to avoid polluting global namespace
...
Users should only have 'jasmine' in global namespace, j$ should be
fully internal unless developing for jasmine
As brought up by Morten Maxild
2013-09-29 14:46:55 -07:00
Gregg Van Hove
04e1d8420e
Ensure tunnel_identifier is properly quoted for travis builds
2013-09-25 14:24:57 -07:00
Gregg Van Hove and Rajan Agaskar
19b2472761
Really make tunnel_identifier a string.
...
yay.
2013-09-25 11:24:41 -07:00
Gregg Van Hove and Rajan Agaskar
1fc614ad19
Tunnel identifier must be a string
...
- Travis provides a float.
2013-09-25 11:03:45 -07:00
Gregg Van Hove and Rajan Agaskar
84692f545c
Use jasmine_selenium_runner to run specs via Sauce
2013-09-25 10:45:53 -07:00
Gregg Van Hove and Rajan Agaskar
5017d1a4f1
Make rake jasmine:ci run specs correctly.
...
- Will replace rake core_specs.
- Remove obsolete dependencies & files -- most of these were for build tasks we
are no longer using. Notably, rspec and spec_helper were deleted.
2013-09-25 10:11:02 -07:00
Gregg Van Hove and Rajan Agaskar
963cd5e850
Make rake dev dependency
2013-09-24 11:31:21 -07:00
Gregg Van Hove and Rajan Agaskar
527394068e
Update specs to use new HTTP Runner interface.
2013-09-24 11:30:50 -07:00
Gregg Van Hove and Rajan Agaskar
5e279a1393
Remove unnecessary Jasmine.configure.
2013-09-20 11:16:40 -07:00
Gregg Van Hove and Rajan Agaskar
8f0f0a607e
update self test to work with gem runner interface
2013-09-20 11:09:35 -07:00
Gregg Van Hove and Rajan Agaskar
4891d578e3
Set default rake task
2013-09-19 10:15:15 -07:00
Sheel Choksi
efc384c6d6
Allow Env to take optional spec/suite ids when asked to execute
2013-09-17 19:55:49 -07:00
Sheel Choksi
d60786a06c
More clearly differentiate between spec and suite ids
2013-09-17 19:55:48 -07:00
Sheel Choksi
66010d01ec
Give reporting symbols a little bit more height
...
Ensures they don't appear cut off when in the last row
2013-09-16 21:05:24 -07:00
Sheel Choksi
1619067ddd
Merge pull request #428 from tjgrathwell/htmlreporter-inline-block-dots
...
Change HTMLReporter symbols to be inline-block instead of floated
2013-09-16 20:55:49 -07:00
Travis Grathwell
79a75f5bdb
HTMLReporter symbols are inline-block rather than floated
...
On a very large test suite (8000 specs), a significant amount
of time is spent just drawing the spec dots. Some sort of
worse-than-linear artifact that summons itself only when you
have 8000 floated elements trying to hang out together.
This performance penalty is not seen with inline-block.
In Chrome 29:
Floated dots: 16.795s
Inline-block dots: 2.774s
Setting the dots to 'display: none;' takes about the same time
as the inline-block figure, so this is probably a low enough bound
(no need for chunked rendering or who knows what).
2013-09-10 19:46:51 -07:00
Sheel Choksi
7158e048a6
Update Jasmine CSS build process
...
- Update compass configuration to build jasmine.scss into lib
- Remove src/html/jasmine.css (since jasmine.scss builds directly into
lib now)
- Bump lib/jasmine-core/jasmine.css to be latest from scss
2013-09-09 21:41:24 -07:00
Sheel Choksi
f8f064d12d
Update jasmine-performance.yml
...
Get it back into working condition and more similar to jasmine.yml
2013-09-09 21:41:24 -07:00
Sheel Choksi
8ac085c103
Use jasmine.DEFAULT_TIMEOUT_INTERVAL for async timeout
...
Allows a user to specify their desired timeout interval for async specs
and change it on a per spec basis (for particularly slow specs, for example).
As pointed out by @Eric-Wright in #422 . [finishes #55996798 ]
2013-09-08 21:41:45 -07:00
Sheel Choksi
03dfea967c
Remove unused jasmine.DEFAULT_UPDATE_INTERVAL
2013-09-08 14:18:34 -07:00
Sheel Choksi
f463e1f7aa
Consistent 'this' between befores/it/afters
...
Change the 'this' user functions are called with to be an empty object
instead of the QueueRunner so that if the user puts properties on it,
they won't conflict.
Also, changes async specs to be called with a proper 'this', as pointed
out by @Eric-Wright in #419 and #420 .
[finishes #56030080 ]
2013-09-07 18:28:03 -07:00
Sheel Choksi
4bff199c2a
Rename a spy's callReturn and callThrow
...
.and.callReturn is now .and.returnValue
.and.callThrow is now .and.throwError
[finishes #56281634 ]
2013-09-06 21:55:14 -07:00
Sheel Choksi
e3f0389ac2
Change andThrow to always throw an Error
...
If an error is passed in, it is thrown, otherwise the argument passed
in is wrapped in an Error
[finishes #50607615 ][closes #372 ]
2013-09-05 23:05:45 -07:00
Sheel Choksi
be0f7b4117
EnvSpec for timing out async spec fix
...
Spec still can't work for maximumSpecCallbackDepth = 1 until further
mock clock enhancements. Fixes the specs running twice issue caused by
the previous commit.
2013-09-02 21:48:44 -07:00
Sheel Choksi
edb46a6f7c
Fix spec in EnvSpec.js for specs that hang
...
This spec would hang when maximumSpecCallbackDepth was set to 1
[Fixes #54168730 ]
2013-09-02 20:39:37 -07:00
Sheel Choksi
a442acb8aa
Mock Clock now correctly schedules delayed functions during a 'tick'
2013-09-02 18:50:17 -07:00
Davis W. Frank
fc409f39a1
Workaround and bug exposure for IE8 and PrettyPrinter, which doesn't work well when trying to pretty print the native timer functions on IE. Make Jasmine's suite green and call out for a fix once we re-write the pretty printer. [Finishes #54168708 ]
2013-09-01 15:38:14 -07:00
Davis W. Frank
ba55cb5e38
Mock clock now less intrusive, replacing global timer funcions only when clock is installed. [ Fixes #54168708 ]
2013-08-27 22:46:01 -07:00
Davis W. Frank
2d4f398dd6
Merge branch 'master' of https://github.com/pivotal/jasmine
2013-08-27 22:43:06 -07:00
Sheel Choksi
5ba6e51e1c
Restore custom failure messages for toHaveBeenCalledWith
...
As pointed out by @tjgrathwell
2013-08-26 23:24:43 -07:00
Davis W. Frank
ba43e37356
Updating GOALS doc after rc2
2013-08-06 08:04:37 -07:00
Sheel Choksi
0f42f2709a
Update PrettyPrinter to better check for an Object
...
Includes test case to fix FF as suggested by @ondras
Fixes #409
2013-08-03 11:49:20 -07:00
Sheel Choksi
4c4317b80e
Update BrowserFlags to include Firefox
...
- DRYs up the browser checking code
- Adds in Firefox as another flag
- Makes it possible to do checks like `if (env.ieVersion)` to target all
IE versions
2013-08-03 11:45:13 -07:00
Davis W. Frank
b4bb99dfdf
Merge pull request #410 from martyhines/fix-broken-link
...
Updated contribute.markdown links
2013-07-31 07:54:42 -07:00
martyhines
d721418490
Updated contribute.markdown links
2013-07-31 10:40:28 -04:00
Davis W. Frank
45fd8df861
Adding ignores for latest RVM/RbEnv convention
2013-07-30 08:08:24 -07:00
Davis W. Frank
0e800ee243
Rename to GitHub convention; Makes this doc available during pull request creation
2013-07-30 08:07:22 -07:00
Davis W. Frank
8a8cc03dea
Add release notes & GitHub releases instructions
2013-07-28 20:59:57 -07:00
Davis W. Frank and Sheel Choksi
be0e6222c5
Bumping to 2.0.0-rc2 due to an old, yanked 2.0.0-rc1
2013-07-28 17:55:29 -07:00
Davis W. Frank and Sheel Choksi
8c696ffc71
Release prep for 2.0.0-rc1
2013-07-28 17:31:24 -07:00
Davis W. Frank and Sheel Choksi
3dda67fe60
Building jasmine.js with last change. I'm sorry.
2013-07-28 17:03:12 -07:00
Davis W. Frank and Sheel Choksi
66d9b3d690
Moving call depth down to a lower number to increase CI stability at the expense of performance.
2013-07-28 17:01:49 -07:00
Davis W. Frank
c350694c1b
Small release note edits
2013-07-27 14:41:38 -07:00
Davis W. Frank
25d674f2c5
Merge branch 'master' of https://github.com/pivotal/jasmine
2013-07-27 11:51:37 -07:00
Davis W. Frank
35bc200e31
First pass at 2.0rc1 release notes
2013-07-27 11:51:32 -07:00
JR Boyens
9e886b3972
Don't test for stack traces in Safari 5
2013-07-26 17:49:52 -07:00
JR Boyens
edd7e3932b
Newer Firefoxen dislike large callback depths; tweak down to keep maximum recursion errors at bay
2013-07-26 17:26:17 -07:00
JR Boyens
0420e295f4
Resolve node issues
2013-07-26 16:44:48 -07:00
JR Boyens
8d295a2612
Move more things out to the core_script
2013-07-26 12:35:24 -07:00
JR Boyens
d10b93cd28
Add node specs to the Travis build
2013-07-26 12:28:11 -07:00
JR Boyens
358b9424b5
If specs fail in node, they should exit with a non-zero exit code
2013-07-26 12:14:01 -07:00
JR Boyens
2571a6fbbb
First pass at Release Notes for 2.0
2013-07-26 12:01:42 -07:00
JR Boyens
00f88edc04
[Finishes #52731407 ] Escape special regex characters from the spec param
2013-07-26 11:28:15 -07:00
JR Boyens
98fa58ee49
Async timeout support
2013-07-26 11:27:40 -07:00
Colin O'Byrne and JR Boyens
984074ec95
small QueueRunner refactors
2013-07-24 17:38:26 -07:00
Colin O'Byrne and JR Boyens
6bb8a91301
inline the specConstructor
2013-07-24 15:20:15 -07:00
Colin O'Byrne and JR Boyens
97ce396008
Build distribution; fix test in FF
2013-07-24 14:41:55 -07:00
Colin O'Byrne and JR Boyens
051f3499ec
Revert "[Finishes #45476285 ] Add timeout support to async tests"
...
This reverts commit 8f5d0beb8c .
Async timeout support is just not ready for prime time.
2013-07-24 14:39:06 -07:00
Colin O'Byrne and JR Boyens
8f5d0beb8c
[Finishes #45476285 ] Add timeout support to async tests
2013-07-23 17:07:02 -07:00
Colin O'Byrne and JR Boyens
9609aba25f
[Finishes #52959947 ] Warn user about spy conflicts; Refactor spy tests to more reflect responsibilities and removed duplicate tests
2013-07-23 17:00:30 -07:00
Colin O'Byrne and JR Boyens
30aec66ce5
[Finishes #14177231 ] copy properties onto spy
2013-07-22 14:54:43 -07:00
Colin O'Byrne and JR Boyens
663a58d617
[Finishes #51528655 ] spies should support and.stub()
2013-07-22 14:39:06 -07:00
Davis W. Frank & Sheel Choksi
3847557bbc
Squashed spy refactor and new spy syntax
...
Jasmine spies now have a 'and' property which allows the user to
change the spy's execution strategy-- such as '.and.callReturn(4)'
and a 'calls' property which allows inspection of the calls a spy
has received.
* This is a breaking change *
There is a CallTracker that keeps track of all calls and arguments
and a SpyStrategy which determines what the spy should do when it
is called.
2013-07-22 14:29:52 -07:00
Colin O'Byrne and JR Boyens
18c30566bd
Move from global to Env
2013-07-22 14:29:52 -07:00
Colin O'Byrne and JR Boyens
f2306729cd
Improve isIE check to allow us to check for a minimum version
2013-07-22 14:22:38 -07:00
Colin O'Byrne and JR Boyens
2165d71dc5
Update matrix for Safari 5
2013-07-22 14:04:23 -07:00
Greg Cobb and JR Boyens
8c1881053c
Resolve remaining test issues
2013-07-22 11:57:47 -07:00
Sheel Choksi
61a1f93488
Older IE fixes
...
Still not green, but getting close. Summary of Older IE discrepancies:
- Older IE doesn't have apply/call on the timing functions
- Older IE doesn't allow applying falsy arguments
- Older IE doesn't allow setting onclick to undefined values
- Older IE doesn't have text property on dom nodes
2013-07-21 19:44:47 -07:00
Sheel Choksi
d4f78922cd
Update built distribution, it's a few commits behind
2013-07-21 18:36:12 -07:00
Sheel Choksi
04ac41d911
Fix phantomjs by using fnNameFor
...
Phantomjs's execptions toString include a ': ' at the end, so instead
use the exception's name property
2013-07-21 15:34:44 -07:00
Sheel Choksi
75b9dc64af
Add in Safari version number since that seems to get Sauce to run it
2013-07-21 12:34:35 -07:00
Davis W. Frank
2d7fe0b6ce
Merge pull request #388 from sheelc/html_self_test
...
Have Jasmine HTML use the source files in specs
2013-07-21 10:33:26 -07:00
Davis W. Frank
44feee57ac
Merge pull request #394 from albertandrejev/ObjectContaing-message
...
ObjectContaining wrong filed value error message
2013-07-21 10:30:45 -07:00
Davis W. Frank
1394899c3c
Even more explanation. Closes #396 .
2013-07-21 08:27:01 -07:00
Davis W. Frank
d0825a37a3
Cleaning up with latest command line tools
2013-07-21 07:53:50 -07:00
Davis W. Frank
fc3d08bf40
Merge pull request #397 from valera-rozuvan/remove_unnecessary_parameter_to_function_call
...
Removed unnecessary parameter from suiteFactory() call.
2013-07-21 07:41:22 -07:00
JR Boyens
990cc41f45
Remove debugger statement
2013-07-19 18:55:07 -07:00
JR Boyens
03ffe5ce6a
DRY up some sopping wet code
2013-07-19 18:51:05 -07:00
Greg Cobb and JR Boyens
1b0b4f22a0
Fix IE10
2013-07-19 17:34:04 -07:00
Greg Cobb and JR Boyens
a6953df28c
Add corrected tunnel identifier
2013-07-19 15:13:41 -07:00
Greg Cobb and JR Boyens
5e71f3031e
Update broken travis.yml
2013-07-19 15:04:40 -07:00
Greg Cobb and JR Boyens
4ea4ed25ee
Revert previous change
2013-07-19 14:29:35 -07:00
Greg Cobb and JR Boyens
39d40a1cad
Come on Travis... build it
2013-07-19 14:14:24 -07:00
Greg Cobb and JR Boyens
d40e0cebac
Use Sauce Labs to test Jasmine against a metric ton of browsers
2013-07-19 11:29:12 -07:00
Greg Cobb and JR Boyens
89a54ea2bb
Hacking the Gibson
2013-07-18 17:29:33 -07:00
Greg Cobb and JR Boyens
bc9c857f43
Valid YAML again
2013-07-18 17:12:39 -07:00
Greg Cobb and JR Boyens
24a7f55fa6
DEBIAN env variable is defined on the OS X host as well
2013-07-18 17:11:10 -07:00
Greg Cobb and JR Boyens
182cff4bd4
Build matrix tweak
2013-07-18 17:05:05 -07:00
Greg Cobb and JR Boyens
5dce5b1272
Try multi-language OS X build
2013-07-18 16:57:01 -07:00
Greg Cobb and JR Boyens
7c17b06856
Make chromedriver executable
2013-07-18 16:42:48 -07:00
Greg Cobb and JR Boyens
6569176cc9
Run specs on multiple browsers
2013-07-18 16:32:33 -07:00
Greg Cobb and JR Boyens
0f803430e4
Testing out travis changes
2013-07-18 15:30:04 -07:00
Greg Cobb and JR Boyens
821f13dff5
Don't refer to window for the sake of Node specs
2013-07-18 13:59:25 -07:00
Greg Cobb and JR Boyens
3e2d9baec2
[Finishes #40853563 ] Allowed the DelayedFunctionScheduler to support strings that are eval'd
2013-07-18 13:57:51 -07:00
Greg Cobb and JR Boyens
f637c1f833
Add images dir
2013-07-18 10:07:47 -07:00
Greg Cobb and JR Boyens
82b6904093
[Finishes #52810607 ] separate out the build standalone tasks
2013-07-18 09:51:27 -07:00
Greg Cobb and JR Boyens
0daae4d7b4
Update examples for 2.0
2013-07-16 10:00:16 -07:00
Sheel Choksi
f68657f14e
Have Jasmine HTML use the source files in specs
...
Similar to the changes in Jasmine core and console, this gets the
HTML specs of Jasmine using j$ instead of jasmine so that they use
the source files instead of the built distribution
2013-07-13 23:36:29 -07:00
Sheel Choksi
c91df21a96
Detailed error messages in toThrow/toThrowError
...
- included what was thrown for failure messages in toThrow and toThrowError
- fixed typo from 'execption' to 'exception' in toThrowError failure messages
- clarified failure messages in toThrowError to include specific error types
[Fixes #52680709 ]
2013-07-12 23:24:50 -07:00
Sheel Choksi
5b986c953c
Remove symlinked boot.js from spec/support
...
[Finishes #52810587 ]
2013-07-11 21:29:28 -07:00
Sheel Choksi
a932320d6c
Merge pull request #401 from sheelc/async_queue_runner
...
Async queue runner fixes
2013-07-10 21:00:24 -07:00
Sheel Choksi
aabf8cec82
Specs/Suites wait for an async spec to finish
...
Go back to having all suites and specs run asynchronously so that
they properly wait for any async specs that there might be
2013-07-10 20:52:18 -07:00
Sheel Choksi
ccdcb293f4
Add back in forgotten 'env' to Env integration specs
...
As pointed out by @jdmarshall. Fixes #399
2013-07-07 21:56:26 -07:00
Sheel Choksi
ec7d58fce0
QueueRunner continues running functions in async case
...
Continue running functions even if an async spec throws an
exception during the synchronous portion of the spec
2013-07-07 21:56:26 -07:00
Davis W. Frank and Sheel Choksi
7f6b16ccf2
Only clear stack when QueueRunner is done with its functions
2013-07-03 15:20:45 -07:00
Sheel Choksi
34b8bf5fb0
Remove Env's calculation of executionTime
...
[#45659879 ]
2013-07-03 14:12:19 -07:00
Davis W. Frank and Sheel Choksi
179e54b9fb
Refactor suite timing out of Env and into each Reporter
...
[finishes #45659879 ]
2013-07-03 09:30:05 -07:00
Davis W. Frank and Sheel Choksi
09fe7b0540
Have QueueRunner run specs iteratively if possible, fallback to recursion for async specs
...
This prevents the stack from growing as large for the normal cases and is giving a significant speedup for the performance suite
2013-07-02 16:37:38 -07:00
Davis W. Frank and Sheel Choksi
264b1fea50
Merge the node performance suite into the node suite
...
The node performance suite can be run with node: `node
spec/node_suite.js --perf`
2013-07-02 16:37:38 -07:00
Davis W. Frank and Sheel Choksi
dcf7a0867e
Test asynchronous parts of Jasmine asynchronously
2013-07-02 16:37:38 -07:00
Davis W. Frank and Sheel Choksi
f5bc9faf63
Rename for stack-clearing post spec run to be more clear; use the real setTimeout when clearing stack
2013-07-02 09:51:41 -07:00
Davis W. Frank and Sheel Choksi
2916a8a1ff
Cleaning up explicit dependencies
2013-07-01 15:56:29 -07:00
Valera Rozuvan
8ac33ff6c2
Removed unnecessary parameter from suiteFactory() call.
2013-07-01 14:02:25 +03:00
Davis W. Frank
661a884416
Merge pull request #392 from albertandrejev/jasmine.Any
...
jasmine.any Boolean support
2013-06-21 10:07:35 -07:00
Albert Andrejev
7acc6b327a
ObjectContaining wrong filed value error message
2013-06-21 15:16:41 +03:00
Albert Andrejev
e40e0c9170
jasmine.any Boolean support
2013-06-21 15:07:55 +03:00
Davis W. Frank
7ae3fa9fef
Fixed some specs that were not referring to the correct instance of Jasmine
2013-06-10 22:45:04 -07:00
Davis W. Frank
e73b9e7902
Merge pull request #384 from sheelc/apireporter_execution_time
...
Add execution time elapsed to JsApiReporter
2013-06-09 20:52:10 -07:00
Sheel Choksi
ffdf1eb16d
Add execution time elapsed to JsApiReporter
...
Since this information is desired in ConsoleReporter, HtmlReporter,
and now JsApiReporter, the executionTime is passed through in
jasmineDone from Env instead of making each reporter compute it.
Fixes #30 , [Finishes #45659879 ]
2013-06-09 12:09:06 -07:00
Davis W. Frank
d5f1264416
Merge pull request #383 from sheelc/remove_format_exception
...
Remove unused formatException from util
2013-06-09 10:13:11 -07:00
Sheel Choksi
579fddc2d2
Remove unused formatException from util
...
The ExceptionFormatter is used instead of formatException from jasmine util
2013-06-08 21:46:16 -07:00
Davis W. Frank
313e607135
Merge pull request #369 from sheelc/query-selectors
...
Query selectors
2013-06-07 07:38:11 -07:00
Davis W. Frank
b6599d52aa
Merge pull request #358 from sheelc/safari_exception_fix
...
Fix spec to throw error, ensuring a stack property
2013-06-07 07:37:39 -07:00
pivotalprivate
582ad6512a
Merge pull request #379 from sheelc/toThrowError_fixup
...
Fix up refactoring mistake in toThrowError
2013-06-05 09:54:12 -07:00
Sheel Choksi
600be098af
Fix up my refactoring mistake in toThrowError
...
strengthen the associated tests to protect against it in the future
2013-06-04 19:49:11 -07:00
Davis W. Frank
b87eb240b3
Merge pull request #378 from sheelc/toThrowError_modifications
...
Avoid instantiating passed in errorType in toThrowError
2013-06-03 21:24:38 -07:00
Sheel Choksi
7055d95584
Avoid instantiating passed in errorType in toThrowError
...
since the passed in errorType could be a custom user function,
we instead detect if its an instanceof Error by using a Surrogate
(inspired by Backbone's use of surrogacy)
2013-06-03 21:05:27 -07:00
Sheel Choksi
1c87060804
Fix spec to throw error, ensuring a stack property
...
In Safari Mac 6.0.4 (and possibly other versions), a new error does
not have the stack property. Throwing the error and then catching it
ensures that the stack property has the correct value.
This fix gets the specs to run green in Safari.
2013-06-03 19:25:37 -07:00
Sheel Choksi
b4acdbd90a
Remove use of getElementsByTagName and getElementsByClassName
...
Replace calls to these functions with querySelector and querySelectorAll
2013-06-03 19:24:53 -07:00
Davis W. Frank
fbb9f53524
Fixing red build. Not sure why, but this spec was green in Chrome and Node.js
2013-06-03 10:31:52 -07:00
Davis W. Frank
0ac497db6b
Simplifying toThrow:
...
- It still supports no expected, which means that something was thrown
- Expected value is now tested via equality in order to pass
Adding toThrowError:
- toThrowError() passes if an Error type was thrown
- toThrowError(String) & toThrowError(RegExp) compare Expected to the Error message
- toThrowError(Error constructor) compares Expected to the constructor of what was thrown
- toThrowError(Error constructor, String) & toThrowError(Error constructor, RegExp) compares both the Error and the message
Also, equality now handles Errors, enforcing the message as part of the equality.
2013-06-03 09:24:43 -07:00
Davis W. Frank
9e31201f1a
Breaking out Spies into their own source file
2013-06-03 08:22:45 -07:00
Davis W. Frank
d53002c63a
Matchers & Matchers specs now broken up into individual files. There is now a requireMatchers jasmineRequire function to attach matchers properly.
2013-06-02 22:22:25 -07:00
Davis W. Frank
3271dc8838
Last commit did not include self-test with Any and ObjectContaining in separate files. Fixed.
2013-06-02 22:16:30 -07:00
Davis W. Frank
475aacbfbb
[Finishes #50607273 ] - added specs to cover the cases from GitHub issue #371
2013-05-29 20:16:12 -07:00
Davis W. Frank
8303c79f26
Adding spec to cover equality of frozen objects, per GitHub issue #266
2013-05-29 12:32:01 -07:00
Davis W. Frank
5700ace2c9
Squashed matchers refactor - matchers now unit-testable apart from Expectation and Spec.
2013-05-28 16:54:01 -07:00
Davis W. Frank
aca43bd3a3
Squashed commit of work to make Jasmine a collection of isolated modules. Note now that in our test suite, "jasmine" now always refers to the build jasmine loaded from jasmine.js and "j$" always refers to the code in the src directories.
...
Also, dev_boot.js is now a copy of boot.js and has additional changes to load jasmine the second time, into the j$ reference.
2013-05-28 14:09:20 -07:00
Davis W. Frank
7516bba2b0
Updating gem source to secure version
2013-05-21 11:47:47 -07:00
Davis W. Frank
4f19d34ad7
Merge pull request #363 from robinboehm/remove-deprecated-matcherspp
...
Remove deprecated jasmine.Matchers.pp function.
2013-05-12 11:35:02 -07:00
Robin Böhm
c40b64a24c
Remove deprecated jasmine.Matchers.pp function. Marked deprecated at may 2010.
2013-05-12 09:37:07 +02:00
Davis W. Frank
baad5ff01f
Merge pull request #356 from sheelc/spec_titles
...
Add titles to specs in HtmlReporter
2013-04-28 23:11:40 -07:00
Sheel Choksi
bf2adf55eb
Add titles to specs in HtmlReporter
...
Each spec symbol contains a title, which is the full name of the
spec it represents.
[Finishes #48420677 ]
2013-04-28 21:35:12 -07:00
Davis W. Frank
dd8d3f9788
Fix [ #48420035 ]
2013-04-20 08:27:38 -07:00
Rajan Agaskar
9c4467bac0
Merge pull request #347 from sheelc/regex-exception-matching
...
Regex exception matching
2013-04-08 18:16:09 -07:00
Sheel Choksi
c017257164
add in regex matching for toThrow matcher
2013-04-07 16:15:07 -07:00
Sheel Choksi
2445fb36dc
simplify failure message logic in the toThrow matcher
2013-04-06 22:06:14 -07:00
Sheel Choksi
eec6d7d23e
update lib/jasmine-core/jasmine.js to make 'grunt execSpecsinNode' pass again
2013-04-06 22:03:31 -07:00
Davis W. Frank
3110da62e5
Update Contribute.markdown
2013-04-01 11:35:22 -07:00
pivotalprivate
d41b281eb1
Update Contribute.markdown
...
Adding link for how to get grunt-cli installed
2013-04-01 11:32:57 -07:00
Davis W. Frank
6feb124853
Remove JSDocs from everywhere in the Repo - source code, GHPages, etc. We're not using them and the stale docs were confusing. Fixes #338 Fixes #99
2013-03-26 23:11:24 -07:00
Davis W. Frank
3be247ceb1
Merge branch 'master' of https://github.com/pivotal/jasmine
2013-03-24 09:42:14 -07:00
Davis W. Frank
edc2bfae93
All Jasmine file manipulation/development moved from Thor to Grunt. Thor has been removed completely. Run grunt --help to see available tasks.
...
Canonical Jasmine version now lives in `package.json` (Node formatted) and is copied into Jasmine source (JavaScript and Ruby)
Jasmine distribution now has MIT license and Pivotal Labs copyright at the top of each distributed file.
2013-03-24 09:41:42 -07:00
Davis W. Frank
01b2fc612c
Merge pull request #340 from CaioToOn/fix-clock-settimeout
...
DelayedFunctionScheduler tick, setTimeout/Interval delay defaults to 0
2013-03-13 15:47:09 -07:00
Caio Cunha
d8f6aac2cd
Added spec for #tick default delay
2013-03-13 11:00:30 -03:00
Caio Cunha
e7a930a5b3
DelayedFunctionScheduler tick, setTimeout/Interval delay defaults to 0
...
If ommited or null, delay for refered methods will default to 0. This
will make setTimeout and setInterval methods to behave as expected by
[HTML5 specs](http://www.w3.org/TR/html51/webappapis.html#timers ):
"Let timeout [delay] be the second argument to the method, or zero if the
argument was omitted."
This commit also fixes an issue with tick() being called without arguments,
that causes the scheduler to break and stop working after this call.
2013-03-13 10:55:46 -03:00
Dan Hansen and Davis W. Frank
6b2d8da55f
Cleanup Gruntfile so that all tasks are registered at the top level
...
[Finishes #45559005 ]
2013-03-04 16:43:48 -08:00
Dan Hansen and Davis W. Frank
538b32e401
Default character encoding is now UTF-8
2013-03-04 16:24:21 -08:00
Davis W. Frank
e6e8908f49
Merge pull request #332 from bjornblomqvist/preserve-whitespace-in-result-message
...
Fixes #296 , Whitespace failures will now be esier to understand.
2013-03-03 22:27:55 -08:00
Davis W. Frank
86dafd5d2d
Merge pull request #329 from sunliwen/master
...
Build status should be updated
2013-03-03 21:14:14 -08:00
Davis W. Frank
aa60d5f00d
Update util.js
...
Removed old jsDoc comments
2013-03-03 21:11:30 -08:00
Davis W. Frank
079e6e1e08
Merge pull request #333 from bjornblomqvist/utf8-fix
...
fix so that utf-8 characters are rendered correctly in the browser
2013-03-03 21:03:42 -08:00
Dan Hansen and Davis W. Frank
7706512525
Delegate to originalJasmine for the version string in test
2013-03-03 16:19:56 -08:00
Dan Hansen and Davis W. Frank
e09fd40933
Move to grunt for building all distribution files.
...
* canonical version number of jasmine-core is now is package.json
* `grunt buildDistribution` builds jasmine.js, jasmine-html.js, jasmine.css and outputs them to the dist dir
* `grunt buildStandaloneDist` builds the example spec runner files and compresses them to dist/jasmine-VERSION.zip
* `grunt compass` compiles jasmine.css
* jasmine.Env handling of version is backwards compatible, but uses the version string directly (and nicely deprecated)
* Ruby/thor tasks that did the above deleted
2013-03-03 16:04:38 -08:00
Dan Hansen and Davis W. Frank
6eecc562ff
This spec is for a case where FF *sometimes* loses it's exception
...
message property. Fixed the spec using a double so that the test will
run green on non-FF environments.
2013-03-01 14:32:58 -08:00
Dan Hansen and Davis W. Frank
cf7bb0269b
Added grunt to project.
...
Move from embedded "fork" of jsHint to using grunt's jsHint module.
Cleaned ALL jsHint errors.
Added jasmine.util.isUndefined as alternative to extra careful protection against undefined clobbering
2013-03-01 14:28:18 -08:00
Dan Hansen and Davis W. Frank
b22bf9a031
Protect against a FF bug: Exceptions don't always have a message property even though they were instantiated with one. Using Error#toString alleviates this
2013-03-01 10:43:09 -08:00
Dan Hansen and Davis W. Frank
b7af6abca5
Support pending specs with:
...
- xit
- it with a null function body ( it("should be pending");
- calling pending() inside a spec
- having a spec without any expectations
Pending and Filtered specs now call Reporter interface specStarted so that reporting acts as expected.
Pending and Filtered spec names are present and styled in the HTML reporter
Using xit used to disable a spec. Disabling is now just when a spec is filtered out at run time (usually w/ the reporter).
Suites are still disabled with xdescribe and means its specs are never executed.
2013-03-01 10:41:25 -08:00
Dan Hansen and Davis W. Frank
d6da13a8dd
Attempt at normalizing error stacks across browsers.
...
Failed expectations now have a `stack` property, remove `trace.stack`
2013-02-27 16:37:31 -08:00
Dan Hansen and Davis W. Frank
dc4563d45c
Require jasmine gem in the rakefile
2013-02-27 10:30:03 -08:00
Dan Hansen and Davis W. Frank
92492c0144
Env#addMatchers is no longer exposed on spec, it is exposed globally in boot.js.
2013-02-26 16:41:46 -08:00
Dan Hansen and Davis W. Frank
d6987a6c84
Cleanup
2013-02-26 13:39:06 -08:00
Dan Hansen and Davis W. Frank
43c8fdd33f
Update travis yml to use the new build script
2013-02-26 12:50:50 -08:00
Dan Hansen and Davis W. Frank
98ae076f0c
* JsApiReporter - better inteface for getting spec results (it's a slice!)
...
* Removed RSpec dependency from running self_test/CI - includes using new Jasmine::Formatter::Console from the gem
*
2013-02-26 12:24:59 -08:00
Dan Hansen and Davis W. Frank
2c06e36b9b
Fix for default state of exceptionCatching from HTML ui
2013-02-26 12:21:02 -08:00
Darwin
5a744884fe
fix so that utf-8 characters are rendered correctly in the browser
2013-02-26 15:58:01 +01:00
Darwin
e6888b840d
Fixes #296 , Whitespace failures will now be esier to understand.
2013-02-26 12:41:19 +01:00
Dan Hansen
e682d18387
When filtering spec, match against the full name of the spec
2013-02-22 14:36:46 -08:00
Dan Hansen and Davis W. Frank
10b09ea9f5
Moved dependencies out of HtmlReporter and into boot.js - QueryString for spec filtering and UI around raising exceptions checkbox; New object for handling spec filtering for browsers;
2013-02-19 15:29:50 -08:00
Dan Hansen and Davis W. Frank
c53b36a9b2
Fix Build: Firefox doesn't hoist function definitions in for loops
2013-02-19 15:26:08 -08:00
Dan Hansen and Davis W. Frank
af71f4d2f9
Remove vestiges of old HTMLReporter
2013-02-19 13:45:25 -08:00
Dan Hansen and Davis W. Frank
83227f2163
Merge branch '2_0'
...
src/html/HtmlReporter.js
2013-02-19 12:09:33 -08:00
Dan Hansen and Davis W. Frank
f865758124
Updated jasmine.js
2013-02-19 11:52:16 -08:00
Davis W. Frank
3fc79bac9e
* Removed old Queue & Runner in favor of Suite using the new QueueRunner
...
* New reporter interface across all reporters
* xdescribe & xit now store disabled specs
* Rewrite of HtmlReporter to support new interface and be more performant
2013-02-19 11:45:05 -08:00
Davis W. Frank
05977203a6
Cleanup of Exception formatting (incl. better Browser support re:
...
toString;
NestedResults is dead, remove it from jasmine.yml
2013-02-19 11:37:13 -08:00
Sun, Liwen
5bea864e1c
Update README.markdown
2013-02-16 21:17:37 +08:00
Davis W. Frank
a9eaa66da5
removing the exception formatter from the util namespace
2012-12-09 09:29:05 -08:00
Davis W. Frank
30bf565e69
removing jasmine.VERBOSE - not used
2012-12-08 12:02:42 -08:00
Davis W. Frank
668dd784ef
Remove jasmine.util.extend
2012-12-08 11:48:11 -08:00
Davis W. Frank & Rajan Agaskar
4ad43267ab
Update immediate goals.
...
- This commit should get rebased out before merging to master
2012-12-07 17:51:17 -08:00
Davis W. Frank & Rajan Agaskar
be6b87a31b
Remove obsolete NestedResults
2012-12-07 17:37:20 -08:00
Rajan Agaskar
43552494ee
Remove jasmine.CATCH_EXCEPTIONS
...
- HTMLReporters should be rewritten to make this sort of thing easier.
- Fix HTMLReporter try/catch switch
- We can't really call resultCallback & throw, so that's been reverted
for now.
2012-12-07 17:26:59 -08:00
Rajan Agaskar
98c99c4ebb
Remove obsolete MessageResult
...
- jasmine.log is no longer supported.
2012-12-07 16:44:41 -08:00
Rajan Agaskar
4318de4647
Remove obsolete bindOriginal, timing bindings.
...
- Handled by boot now.
2012-12-07 16:40:58 -08:00
Davis W. Frank & Rajan Agaskar
a526ebf261
Re-add async support (achieved via done callbacks)
...
- TODO: pull out queueRunner into a new object.
2012-12-07 16:36:24 -08:00
Davis W. Frank & Rajan Agaskar
c2e1327f39
Permit HTMLReporter to render every 250ms
...
- This is necessary for the user to see spec results fill-in
progressively.
- There is a slight performance loss. 250 - 500ms seems to deliver the
same amount of loss. This is still at parity with Jasmine 1.x
2012-12-07 14:49:19 -08:00
Davis W. Frank & Rajan Agaskar
234f2a1585
Reintroduce fn that clears stack occasionally
...
- setTimeout will clear stack, prevent overflow. We run this once every
thousand specs.
- Browser users will probably want a time-based clear rather than spec
count based clear, as a thousand tests is typically quite slow. The
reporter should provide this.
2012-12-07 14:49:14 -08:00
Davis W. Frank & Rajan Agaskar
c584f182ab
Fix getFullName on spec.
...
- Fixes specFiltering on nested specs
2012-12-07 11:32:52 -08:00
Davis W. Frank & Rajan Agaskar
74f928fd54
Re-add Mock Clock behavior as global 'clock'
...
- Use clock.install, clock.tick...
- Add unit coverage.
- Fixes old bug in function scheduler
2012-12-07 10:04:47 -08:00
Davis W. Frank & Rajan Agaskar
a1011e7748
Rewrite Spec & allow Jasmine to be namespaced
...
- THere seems to be a performance regression. Large test suites may
throw
- Regressions: Mock Clock won't install correctly, async specs are
temporarily not supported.
- Async spec runs/waits interface is gone. Blocks are gone.
- Move most global usage into jasmine.Env constructor.
- Remove optional 'Jasmine running' from HtmlReporter -- caused
NS_FACTORY_ERROR in firefox when tested
2012-12-06 09:10:24 -08:00
Vikki
8b02bf731b
Make all tests use syntax compatible with IE6/7/8
2012-12-04 09:15:40 -08:00
Davis W. Frank & Rajan Agaskar
779dee1211
Remove results from Queue
...
- consequently, Runner & Suite no longer have results.
- Results come back to reporters from Spec, we should not have a need to
walk them later via suite/runner (in fact, no reporter used results on
suite/runner -- only bad tests)
- Remove/clean up tests relying on #results
- Remove integration tests that duplicate already tested behavior
2012-12-03 15:57:16 -08:00
Davis W. Frank & Rajan Agaskar
1f5e790c41
Remove Matchers report code cruft.
...
- Code that used reportWasCalled was removed previously.
2012-12-03 15:46:29 -08:00
Davis W. Frank & Rajan Agaskar
cd3a0c854b
buildExpectationResult now returns a data object.
...
- Meant for passing to reporters.
2012-12-03 15:46:29 -08:00
Davis W. Frank & Rajan Agaskar
f9cbad1512
Fix mistaken toFail() expect usage
...
- It looks like toEqual got globally replaced where it shouldn't have
been
2012-12-03 15:46:29 -08:00
Davis W. Frank & Rajan Agaskar
f840458b34
Encapsulate ExpectationResult
2012-12-03 15:46:29 -08:00
Davis W. Frank & Rajan Agaskar
34bd1969e7
Add performance smoke suite
2012-12-03 15:46:29 -08:00
Davis W. Frank & Rajan Agaskar
dfed37531e
Add unit coverage for ExpectationResult
2012-12-03 15:46:29 -08:00
Davis W. Frank & Rajan Agaskar
08f5a8c98f
Track abstract goals for Jasmine 2.0
2012-12-03 15:46:28 -08:00
Davis W. Frank & Rajan Agaskar
8d94d0bfc5
Move ExpectationResult into its own file
2012-12-03 15:46:28 -08:00
Rajan Agaskar
3e5da57cf9
Remove jasmine.XmlHttpRequest
...
- Cruft left over from when jasmine offered an "include" function
2012-12-03 15:46:28 -08:00
Davis W. Frank & Rajan Agaskar
e2af08e0a6
Move most jasmine global usage into boot.
...
- thor build scripts broken for now.
2012-12-03 15:46:26 -08:00
Davis W. Frank & Rajan Agaskar
b6c3999c3a
Version 1.3.1
2012-12-03 15:40:01 -08:00
Davis W. Frank & Rajan Agaskar
6785d1a05c
Re-add pages submodule for release build script
...
- Use public github url
2012-12-03 15:40:00 -08:00
dev
e74f09df9c
Fixing test runner failures in IE 6/7/8 whereby HtmlReporter.js bails out as we're using for (reserved keyword) as object property name. Fix is just to quote the name which allows IE6/7/8 to run the tests. I think this might also fix Issue #303 on main repo ( https://github.com/pivotal/jasmine/issues/303 )
2012-12-03 15:40:00 -08:00
Davis W. Frank & Rajan Agaskar
f7c9aaa996
Setup Travis build
2012-12-03 15:40:00 -08:00
Davis W. Frank & Rajan Agaskar
86994b25db
Use jasmine-gem for jasmine-core tests
2012-12-03 15:40:00 -08:00
Davis W. Frank & Rajan Agaskar
9a7c76ea23
Releasing 1.3
...
- Allow users to set the pretty-printer's recursion depth
- When pretty-printing objects, don't include inherited properties.
- Change toBeCloseTo matcher to be more consistent
- Added toBeNaN matcher
- Add checkbox to test runner which toggles catching of exceptions duri
- Add config option which stops jasmine from capturing exceptions in a
2012-12-03 15:40:00 -08:00
Max Brunsfeld
e3a013ae99
Allow users to set the pretty-printer's recursion depth
...
Currently, jasmine's pretty printer traverses objects
to 40 levels of nesting. If an object is more deeply
nested than that, an exception is thrown. I find that
after a few levels of nesting, the output becomes
difficult to read. The process of serializing such
deep objects also sometimes crashes the browser or
causes a 'slow script' warning.
This commit exposes a 'MAX_PRETTY_PRINT_DEPTH' option.
It also causes the pretty printer to skip over
parts of an object that are nested to deeply by simply
printing out 'Object' or 'Array', rather than throwing
an exception.
2012-12-03 15:40:00 -08:00
Max Brunsfeld
ead9aa6d5a
When pretty-printing objects, don't include inherited properties.
...
When making assertions about complex objects, Jasmine's
failure message are sometimes gigantic and difficult
to read because the string representation of an object
contains all of the methods and properties in its
prototype chain. This commit causes the pretty printer
to only display on object's own properties.
2012-12-03 15:40:00 -08:00
Joost Elfering
d9467317a8
adding a check for the sticky regExp option supported by Firefox and accepted by the ES6. Note that the tests for this case are checking for the support of the sticky parameter. the logic is still tested by the other expect statements in browsers that do not support sticky but will never enter that block as creating a regExp with that flag is not allowed. Coverage is still good. See pivotal/jasmine#234
2012-12-03 15:40:00 -08:00
Joost Elfering
63ad879c12
added some specs to strengthen the coverage pivotal/jasmine#234
2012-12-03 15:40:00 -08:00
Joost Elfering
b95c43ab7c
resolving issue that was identified via pivotal/jasmine#199 where RegExp objects were not properly compared resulting in non-matching RegExp objects to always return true. a patch to jasmine.Env.equals_ adds an extra step for RexExp objects to be compared.
2012-12-03 15:40:00 -08:00
gvanhove
3685d3199c
less confusing messages for toHaveBeenCalledWith
2012-12-03 15:40:00 -08:00
Gunnar Ahlberg
a34077a8af
cover spy on on undefined method
2012-12-03 15:40:00 -08:00
James Cracknell
ac55e26870
Added toBeNaN matcher
2012-12-03 15:40:00 -08:00
PLOE09
acdc497361
Add JSDoc @return-tag to 'spyOn' and 'expect' functions support
...
code completion in Spket IDE
2012-12-03 15:40:00 -08:00
Christopher Mitchell
b527ccd2fa
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-12-03 15:40:00 -08:00
Kevin Connor
cfa95fcf2c
create downloads dir if needed during build_standalone_distribution
2012-12-03 15:40:00 -08:00
Alexey Androsov
ae9ddd74a2
update jsdoc for jasmine.Matchers.prototype.toThrow
...
expected argument is optional
2012-12-03 15:40:00 -08:00
Kevin Locke
26f0f6f213
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-12-03 15:40:00 -08:00
rgould
c5ba032d28
Regenerate jasmine.js after adding ensured support.
2012-12-03 15:39:59 -08:00
rgould
bbc4c70c91
Add 'ensured' blocks to the queue.
...
This blocks will be run even when a preceeding block sets the abort
flag. This is so that we can support afterEach calls running when the
spec fails due to a timeout.
2012-12-03 15:39:59 -08:00
John Firebaugh
c5c57247f8
Test that show that afterEach and after are not being called when a waitsFor times out.
2012-12-03 15:39:59 -08:00
John Firebaugh
9990eb7b6e
Test that afterEach is called after a failing spec.
2012-12-03 15:39:59 -08:00
John Firebaugh
b5b50182b2
Consolidate all waitsFor specs in the same describe block.
2012-12-03 15:39:59 -08:00
Oliver Caldwell
4d106c2b33
Wrapped the reserved word, "for", in quotes.
...
This stops it throwing errors in IE and other browsers. I think the newer Firefox and Chrome versions are the only browsers to not die when running it.
2012-12-03 15:39:59 -08:00
Dave Burt
5e594946bb
Change toBeCloseTo matcher to be more consistent.
...
It now calculates and compares a difference, rather than rounding
two separate quantities and testing for their equality.
2012-12-03 15:39:59 -08:00
Davis W. Frank
6ac4b686a3
Move to an earlier RedCarpet to fix an incompatibility with Rocco. Regen of gh-pages.
2012-12-03 15:39:59 -08:00
Davis W. Frank & Rajan Agaskar
fd91433792
Version 1.3.1
2012-12-03 09:51:08 -08:00
Davis W. Frank & Rajan Agaskar
1f9004eaa3
Re-add pages submodule for release build script
...
- Use public github url
2012-12-03 09:47:48 -08:00
dev
58e6747930
Fixing test runner failures in IE 6/7/8 whereby HtmlReporter.js bails out as we're using for (reserved keyword) as object property name. Fix is just to quote the name which allows IE6/7/8 to run the tests. I think this might also fix Issue #303 on main repo ( https://github.com/pivotal/jasmine/issues/303 )
2012-12-03 09:38:57 -08:00
Davis W. Frank & Rajan Agaskar
4c083856be
Setup Travis build
2012-12-03 09:38:54 -08:00
Davis W. Frank & Rajan Agaskar
b94522193c
Use jasmine-gem for jasmine-core tests
2012-11-28 14:25:39 -08:00
Davis W. Frank & Rajan Agaskar
867de62699
Releasing 1.3
...
- Allow users to set the pretty-printer's recursion depth
- When pretty-printing objects, don't include inherited properties.
- Change toBeCloseTo matcher to be more consistent
- Added toBeNaN matcher
- Add checkbox to test runner which toggles catching of exceptions duri
- Add config option which stops jasmine from capturing exceptions in a
2012-11-27 13:47:02 -08:00
Rajan Agaskar
74cdc5a04f
Merge pull request #290 from maxbrunsfeld/smaller-pretty-print2
...
smaller, more configurable pretty-printing of objects
2012-10-29 09:32:40 -07:00
Max Brunsfeld
ddbee65aa8
Allow users to set the pretty-printer's recursion depth
...
Currently, jasmine's pretty printer traverses objects
to 40 levels of nesting. If an object is more deeply
nested than that, an exception is thrown. I find that
after a few levels of nesting, the output becomes
difficult to read. The process of serializing such
deep objects also sometimes crashes the browser or
causes a 'slow script' warning.
This commit exposes a 'MAX_PRETTY_PRINT_DEPTH' option.
It also causes the pretty printer to skip over
parts of an object that are nested to deeply by simply
printing out 'Object' or 'Array', rather than throwing
an exception.
2012-10-28 12:27:26 -07:00
Max Brunsfeld
beeb872a82
When pretty-printing objects, don't include inherited properties.
...
When making assertions about complex objects, Jasmine's
failure message are sometimes gigantic and difficult
to read because the string representation of an object
contains all of the methods and properties in its
prototype chain. This commit causes the pretty printer
to only display on object's own properties.
2012-10-28 12:27:26 -07:00
Rajan Agaskar
dbcb0b7983
Merge pull request #234 from yopefonic/master
...
comparison for regExp that compares pattern and modifiers
2012-10-26 19:51:47 -07:00
Joost Elfering
c8436d1d44
adding a check for the sticky regExp option supported by Firefox and accepted by the ES6. Note that the tests for this case are checking for the support of the sticky parameter. the logic is still tested by the other expect statements in browsers that do not support sticky but will never enter that block as creating a regExp with that flag is not allowed. Coverage is still good. See pivotal/jasmine#234
2012-10-27 01:51:19 +01:00
Joost Elfering
639f757f6f
added some specs to strengthen the coverage pivotal/jasmine#234
2012-10-27 01:50:34 +01:00
Joost Elfering
d65bdc7e59
resolving issue that was identified via pivotal/jasmine#199 where RegExp objects were not properly compared resulting in non-matching RegExp objects to always return true. a patch to jasmine.Env.equals_ adds an extra step for RexExp objects to be compared.
2012-10-27 01:50:34 +01:00
Rajan Agaskar
a1ed56741b
Merge pull request #193 from slackersoft/spy_called_with_messages
...
less confusing messages for toHaveBeenCalledWith
2012-10-05 17:53:11 -07:00
Rajan Agaskar
7473b455dc
Merge pull request #225 from gunnarahlberg/master
...
spec that to spy on an undefined method throws exception
2012-10-05 17:44:00 -07:00
Rajan Agaskar
b6fb23b069
Merge pull request #254 from jcracknell/nan-matcher
...
Added toBeNaN matcher
2012-10-05 17:31:36 -07:00
Rajan Agaskar
386e83b53f
Merge pull request #280 from ronaldploeger/master
...
JSDoc @return-tag to 'spyOn' and 'expect' functions
2012-10-05 17:10:51 -07:00
PLOE09
f2b25f1780
Add JSDoc @return-tag to 'spyOn' and 'expect' functions support
...
code completion in Spket IDE
2012-09-14 16:36:32 +02:00
Davis W. Frank
5ca2888301
Merge pull request #242 from ChrisTM/master
...
Fix swapped template values in build_standalone_runner.rb.
2012-09-02 22:58:08 -07:00
Davis W. Frank
147cb36760
Merge pull request #269 from kconnor/master
...
create downloads dir if needed during build_standalone_distribution
2012-09-02 17:42:11 -07:00
Davis W. Frank
107463ad57
Merge pull request #251 from doochik/patch-1
...
update jsdoc for jasmine.Matchers.prototype.toThrow
2012-09-02 17:40:51 -07:00
Davis W. Frank
39a55d8f10
Merge pull request #257 from kevinoid/no-window-or-exports
...
Don't assume exports is defined when window is undefined
2012-09-02 17:40:16 -07:00
Rajan Agaskar
4b48dc1069
Merge pull request #260 from rgould/master
...
Guarantee that afterEach and after blocks are always run
2012-09-01 13:05:41 -07:00
Rajan Agaskar
921f52862f
Merge pull request #270 from Wolfy87/patch-1
...
Wrapped the reserved word, "for", in quotes.
2012-08-15 14:17:29 -07:00
Oliver Caldwell
ea2ffb7b01
Wrapped the reserved word, "for", in quotes.
...
This stops it throwing errors in IE and other browsers. I think the newer Firefox and Chrome versions are the only browsers to not die when running it.
2012-08-15 21:44:28 +02:00
Kevin Connor
54fbc48eb2
create downloads dir if needed during build_standalone_distribution
2012-08-15 12:41:09 -07:00
Davis W. Frank
06c900ab20
Merge pull request #264 from dburt/master
...
Change toBeCloseTo matcher to be more consistent
2012-08-12 09:23:15 -07:00
Davis W. Frank
3e070e9db6
Move to an earlier RedCarpet to fix an incompatibility with Rocco. Regen of gh-pages.
2012-08-11 16:53:08 -07:00
Dave Burt
7e04571ec0
Change toBeCloseTo matcher to be more consistent.
...
It now calculates and compares a difference, rather than rounding
two separate quantities and testing for their equality.
2012-07-31 15:03:55 +10:00
rgould
ddd48f2c88
Regenerate jasmine.js after adding ensured support.
2012-07-24 18:54:36 -04:00
rgould
1c2e50d244
Add 'ensured' blocks to the queue.
...
This blocks will be run even when a preceeding block sets the abort
flag. This is so that we can support afterEach calls running when the
spec fails due to a timeout.
2012-07-24 18:45:30 -04:00
rgould
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
Kevin Locke
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
James Cracknell
f910df00bb
Added toBeNaN matcher
2012-07-12 20:04:14 -06:00
Alexey Androsov
500b856cfa
update jsdoc for jasmine.Matchers.prototype.toThrow
...
expected argument is optional
2012-07-10 15:12:32 +04:00
Rajan Agaskar
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
Alex Kwiatkowski
1771ec3c63
Add checkbox to test runner which toggles catching of exceptions during tests
2012-06-24 00:02:52 -04:00
Alex Kwiatkowski
2385acedd8
Add config option which stops jasmine from capturing exceptions in a test
2012-06-23 23:12:31 -04:00
Christopher Mitchell
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
Davis W. Frank
7bbcf51d45
Removed Frank for GHPages generation. Now using Rocco and a Thor task to build it
2012-05-27 13:16:20 -07:00
ragaskar
b6f96bc121
Version 1.2.0
...
- Bump version
- Update pages submodule
2012-05-14 07:35:47 -07:00
Rajan Agaskar
feebfbba68
Update README.markdown
2012-05-09 09:51:29 -07:00
Rajan Agaskar
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
Gunnar Ahlberg
4f218f7d6a
cover spy on on undefined method
2012-05-02 14:11:22 +02:00
Matt Parker
bb1a4428db
update the copyright and remove the blank "what's here" section.
2012-04-13 23:30:12 -03:00
Davis W. Frank
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
ragaskar
fbbccf6ef7
Bump to 1.2.0.rc3
2012-04-04 09:48:00 -07:00
ragaskar
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
Davis W. Frank
d46ca4f506
correct for 1.2.0.rc2
2012-04-03 15:35:08 -07:00
Davis W. Frank
ee7af4496c
Pages updated for 1.2.0.rc1
2012-04-02 18:37:35 -07:00
Davis W. Frank
e22c4492a5
release prep for 1.2.0.rc1
2012-04-02 18:34:59 -07:00
Davis W. Frank
d63836afb4
Fix for copying built Github pages to the submodule properly
2012-04-02 18:33:38 -07:00
Davis W. Frank
06f1edc197
Merge branch 'master' of github.com:pivotal/jasmine
2012-04-01 17:03:06 -07:00
Davis W. Frank
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
Mark Rushakoff
d15964b7dc
fix JasmineDev#has_node? for Ruby 1.8.7
2012-04-01 15:44:36 -07:00
Davis W. Frank
6e22754c10
1.2.0.rc1 commit
2012-04-01 13:19:24 -07:00
Davis W. Frank
bab4538404
Fix to name the standalone distribution from the version number
2012-04-01 13:11:53 -07:00
Davis W. Frank
06d191af74
Merge branch 'master' of github.com:pivotal/jasmine
2012-04-01 13:08:55 -07:00
Davis W. Frank
ad78d0d0d8
Fixed bug where version for Ruby gem wasn't correct
2012-04-01 13:08:42 -07:00
Davis W. Frank
733a6a4ae4
Merge pull request #208 from mark-rushakoff/ansicolor-cleanup
...
Remove remaining references to term-ansicolor
2012-04-01 13:00:57 -07:00
Mark Rushakoff
3e0cad41f5
Remove remaining references to term-ansicolor
2012-04-01 12:30:38 -07:00
Davis W. Frank
885832e920
Forgot to update Contribute to include new Thor tasks
2012-04-01 11:36:29 -07:00
Davis W. Frank
3a0ada034b
Move sources order to Ruby, which is where it's used.
2012-04-01 11:28:57 -07:00
Davis W. Frank
674197aef8
Removed TermAnsiColor gem (uses GPL and isn't needed anymore)
2012-04-01 10:51:04 -07:00
Davis W. Frank
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
gvanhove
a3ccd8b0d3
less confusing messages for toHaveBeenCalledWith
2012-03-02 19:28:15 -08:00
Davis W. Frank
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
Davis W. Frank
c87cf71f4f
Merge pull request #156 from cathoderay/master
...
fixing typo
2012-01-08 12:46:14 -08:00
Davis W. Frank
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
Davis W. Frank
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
Davis W. Frank
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
Edward Tsech
551464b8d2
Remove double negative in docs (not.toNotContain, not.toNotEqual)
2012-01-04 16:21:54 +01:00
Davis W. Frank
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
Dane O'Connor
94a153ed15
add linux support to rake spec:browser
2012-01-03 17:12:20 -05:00
Davis W. Frank
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
gvanhove
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
gvanhove
ac096f9911
convert objectContaining to use jasmineMatches and jasmineToString
2011-11-14 18:29:30 -08:00
gvanhove
08d72926ff
More renaming of hash
2011-11-14 18:29:30 -08:00
gvanhove
67ec0af254
use jasmineMatches for equality testing of complicated matchers
2011-11-14 18:29:30 -08:00
gvanhove
4f2fcff15a
Use jasmineToString for printing out complicated matchers
2011-11-14 18:29:30 -08:00
gvanhove
7158fc2426
Rename hashContaining to objectContaining, since this is javascript. Also call the toString from prettyPrinter
2011-11-14 18:26:48 -08:00
gvanhove
992367dcbc
New matcher "hashContaining" similar to rspec's hash_including
2011-11-14 18:26:48 -08:00
gvanhove
ce886e20e4
commit updated version into jasmine.js
2011-11-14 18:26:48 -08:00
grosser
86b0c80cc9
fix task list not displaying properly on github for contribute.markdown
2011-11-13 09:18:34 -08:00
grosser
7dff84b1dc
add license to gemspec so automated tools can pick it up
2011-11-13 09:12:29 -08:00
Ronald Andreu Kaiser
8c22b26d9c
fixing typo
2011-11-11 16:42:50 -02:00
Davis W. Frank & Sean Durham
ad4f48dcd4
Add new HTMLReporter
2011-11-04 14:43:19 -07:00
Davis W. Frank & Rajan Agaskar
de9e2abad5
Use correct name for Davis.
2011-11-04 14:31:15 -07:00
ragaskar
41f496001f
Version bump to 1.1.0
2011-09-10 13:51:11 -04:00
ragaskar
6b5956724b
Version bump to rc4
2011-09-01 07:26:07 -04:00
Rajan Agaskar
ec24992250
Merge pull request #123 from Osukaru/master
...
fixed html comments in SpecRunner.html example
2011-09-01 04:23:41 -07:00
Osukaru
83f232237d
fixed html comments
2011-08-26 01:22:11 +03:00
Rajan Agaskar
98d32bb4a4
Merge pull request #111 from qfox/patch-1
...
Add missing semi.
2011-07-21 04:07:52 -07:00
qfox
c4f27ae377
ASI trolling
2011-07-21 00:58:53 -07:00
ragaskar
a075c75bce
Version bump to 1.1.0.rc3
2011-07-13 07:23:29 -04:00
ragaskar
a617b59e6a
Bump to rc2
2011-06-24 21:34:29 -04:00
ragaskar
917b37481e
Update rake
2011-06-24 21:25:06 -04:00
ragaskar
67bbc98faa
Bump version
2011-06-24 21:22:19 -04:00
Davis W. Frank
620f7b6e4c
Updates to Pages; Updates to docs;
2011-06-23 19:02:17 -07:00
ragaskar
b722f416c7
Write out version.rb on dist build
2011-06-23 07:55:04 -04:00
ragaskar
634a7dc402
Rollback pages submodule bump
2011-06-23 07:32:05 -04:00
Davis W. Frank
a4522e4dce
Updated Release readme
2011-06-21 20:19:28 -07:00
Davis W. Frank
e113c338d0
Merge branch 'master' of github.com:pivotal/jasmine
2011-06-21 20:11:10 -07:00
ragaskar
b81f690a25
Require JSON in time for the gemspec
2011-06-21 08:05:41 -04:00
ragaskar
c06e189699
Ignore tags
2011-06-21 08:05:20 -04:00
Davis W. Frank
67b6cfb828
Improve the rake standalone task
2011-06-20 18:27:57 -07:00
Davis W. Frank
57e622fb2a
Fix to version structure for "release_candidate"
2011-06-20 18:17:24 -07:00
Davis W. Frank
c0664dd6aa
merge
2011-06-20 08:46:37 -07:00
Davis W. Frank
b640ce6fc0
wip on readme for release
2011-06-20 07:32:40 -07:00
ragaskar
e9af7834f5
Better argument handling in Jasmine::Core#spec_files
2011-06-18 09:43:14 -04:00
ragaskar
0d43ae9c38
Give Jasmine::Core access to jasmine specs
...
[#13128217 ]
2011-06-18 09:39:23 -04:00
ragaskar
30431a3958
Gem-ize jasmine
...
[Finishes #13128217 ]
2011-06-17 21:01:42 -04:00
Davis W. Frank
3775919c92
remove old, commented-out tasks
2011-06-17 08:23:17 -07:00
Davis W. Frank
a692ff8c95
Need HAML in the Gemfile; continued fixes to the Rake tasks
2011-06-17 08:20:22 -07:00
Davis W. Frank
e4e9b51544
rename TrivialConsoleReporter to ConsoleReporter
2011-06-16 22:35:57 -07:00
Davis W. Frank
0b97951766
Better coloring of output of Rake tasks; Turn off colored output in Rake tasks if not on a TTY (not sure if it works in Hudson); Add support to TCR for turning off colors since there is code to calc options but it wasn't used; NOTE: coloring in TCR should be MUCH better tested.
2011-06-16 22:34:11 -07:00
Davis W. Frank
75dd391d57
should fix red build
2011-06-16 08:33:59 -07:00
Davis W. Frank
ae24e00c0f
Support for release candidates in the version.json file; propagates up through the version string everywhere: filenames, ZIP, source code
2011-06-15 18:37:12 -07:00
Davis W. Frank
6b2e45eab5
Refactor of standalone build tasks; Better templating of the core runner.html and the example SpecRunner.html
2011-06-15 09:15:40 -07:00
Davis W. Frank
e59171935f
breaking up distribution tasks; moving version to a template to have a simpler concat function
2011-06-14 08:30:14 -07:00
Davis W. Frank
2ba0aa371c
Refactor how the distribution is built
2011-06-13 08:23:10 -07:00
Davis W. Frank
c2ed71717f
Remove link to github page from Runner
2011-06-11 16:51:16 -07:00
Davis W. Frank
09e8822107
WIP on new Contribution docs
2011-06-11 16:47:12 -07:00
Davis W. Frank
15763c2eb0
Output number of expected specs for browser, node before running specs. NOTE: We distribution tasks still broken.
2011-06-11 15:59:34 -07:00
Davis W. Frank
3f264cde34
fix so that all specs are pulled into runner.html
2011-06-11 14:48:41 -07:00
Davis W. Frank
f83cb7f766
Runner.html is now generated (ensures all source & specs get tested); beginnings of refactoring of Rake tasks.
2011-06-09 19:24:51 -07:00
Davis W. Frank
9d5470ff55
removing expectation count from TCR to match browser reporter
2011-06-08 18:36:58 -07:00
Davis W. Frank
86b095e5a4
Src & Spec dirs now have same structure; console/, core/, and html/
2011-06-08 18:30:35 -07:00
Davis W. Frank
4c6dafa3f5
OCD
2011-06-08 08:36:03 -07:00
Davis W. Frank
3f4adf7715
Removed dead code
2011-06-08 08:29:39 -07:00
Davis W. Frank
af7f1818b0
Revert back to the old jasmine.css
2011-06-05 21:55:51 -07:00
Davis W. Frank
12f56787b0
Move building single-file JS to use a JSON file with initial priority files
2011-06-05 21:55:32 -07:00
Davis W. Frank
e88d88e427
Move all core files into src/core.
...
Move Browser & Node specs to test against lib/jasmine.js instead of the separate source. Yes, this makes development a little harder but it's better to test that jasmine.js was built correctly.
2011-06-05 21:28:26 -07:00
Davis W. Frank
ba10d178b2
Better stack trace on exception. Better results if exception is due to true exception
2011-06-01 21:14:59 -07:00
Davis W. Frank
da297d0f56
And what I meant was *this* commit was pulling in the fixes to TrivialConsoleReporter
2011-05-25 08:28:16 -07:00
Davis W. Frank
7ead5388c2
merge in fixes to TrivialConsoleReporter: correct # of specs, no longer limited by column length
2011-05-25 08:14:18 -07:00
Davis W. Frank
a445a62e7c
TrivialConsoleReporter now reports the correct number of specs that were executed. TCR is still very heavily mocked instead of using testing an actual Jasmine environment. But now at least the numbers are correct.
2011-05-16 18:28:46 -07:00
Davis W. Frank
1d65d56a92
TrivialConsoleReporter refactor & fixes. No longer limitied to 50 columns of dots.
2011-05-16 08:08:12 -07:00
ragaskar
d875d1d997
Don't run TrivialConsoleReporter specs if TrivialConsoleReporter is not loaded
2011-05-06 23:18:57 -04:00
ragaskar
1fae8f0a31
Rebuild main jasmine lib
2011-05-06 23:08:49 -04:00
ragaskar
c1f8151bcb
Add png suitable for favicon
2011-05-06 22:40:53 -04:00
ragaskar
bd8a3baed1
Remove unused image files
2011-05-06 22:30:48 -04:00
ragaskar
118324b451
Don't show 'Jasmine waiting for...' console messages unless jasmine.VERBOSE is set to true
2011-05-06 19:07:00 -04:00
ragaskar
c30f7d1aa7
Fail with an error if node is not installed when running rake spec
2011-05-06 18:34:42 -04:00
ragaskar
de7be4b316
ignore rvmrc
2011-05-06 18:32:58 -04:00
Davis W. Frank
b02aa9840a
fixed bad merge of gvanhove's describe exception fix
2011-04-17 21:44:41 -07:00
Davis W. Frank
61de2268fe
toBeCloseTo matcher merged in
2011-04-17 21:18:41 -07:00
gvanhove
dd32048383
Failure messages for toHaveBeenCalledWith print out the name of the spy
2011-04-17 20:55:32 -07:00
gvanhove
32e736aa47
commit updated version into jasmine.js
2011-04-17 20:55:32 -07:00
Steve Conover
38e9af8f68
integrating TrivialConsoleReporter into node_suite.js, deleting some code pulled over from jasmine-node
2011-04-17 20:50:57 -07:00
Carl Jackson & Davis W. Frank
e826fbb170
More README edits for the Contributor guide
2011-03-09 13:31:03 -08:00
Carl Jackson & Davis W. Frank
0c77662c5b
One more README tweak
2011-03-09 13:15:33 -08:00
Davis W. Frank
75fb19bc49
README changes
2011-03-09 08:16:47 -08:00
Davis W. Frank
6ec825f62d
Updating docs. Version goes to 1.1.0
2011-03-08 18:39:13 -08:00
Davis W. Frank
fc994108db
Update Rakefile a bit. Added more rake tasks to run specs.
2011-03-08 18:38:46 -08:00
Davis W. Frank
70aed2d900
move all "assertion" to "expectation"
2011-03-08 18:37:44 -08:00
Davis W. Frank
ccfa17499f
Merge remote branch 'sconover/trivial_console_reporter' into work
2011-03-07 22:35:25 -08:00
Davis W. Frank
ab087ef5f8
Pendantic terminology
2011-03-07 22:34:58 -08:00
Davis W. Frank
0ef6582f73
Merging in sconover/jshint
2011-03-07 22:30:43 -08:00
Steve Conover
a1ba43c864
call back when done
2011-02-28 23:58:06 -08:00
Steve Conover
88ee377662
integrated trivial console into a real-world situation and dicovered a couple mistakes/misses
2011-02-28 23:18:53 -08:00
Steve Conover
f5afe18a6b
semicolon fixes subsequent to jshint run
2011-02-28 22:56:04 -08:00
Steve Conover
2731716ccb
making this consistent
2011-02-28 22:39:16 -08:00
Steve Conover
4e5083d570
style rf
2011-02-28 22:36:31 -08:00
Steve Conover
b9cbd3c5a0
integration test - failure scenario
2011-02-28 22:30:03 -08:00
Steve Conover
e42026ee84
rename *node to *console
2011-02-28 21:15:57 -08:00
Steve Conover
a1f58f8be4
rf
2011-02-28 21:15:57 -08:00
Steve Conover
ac00d765d2
integration tests - passing scenarios
2011-02-28 21:15:57 -08:00
Steve Conover
b1dceeacd4
stack traces
2011-02-28 21:15:57 -08:00
Steve Conover
5018f0d1c2
spec failure - description
2011-02-28 21:15:57 -08:00
Steve Conover
9704550b33
rf
2011-02-28 21:15:56 -08:00
Steve Conover
882c287191
specs/assertions/failures
2011-02-28 21:15:56 -08:00
Steve Conover
7d2b900b48
remember suite results as suites finish
2011-02-28 21:15:56 -08:00
Steve Conover
f701fdc132
needful
2011-02-28 21:15:56 -08:00
Steve Conover
eb49fab652
print elapsed time in summary
2011-02-28 21:15:56 -08:00
Steve Conover
e8c8a0bdfd
run result - passed green, failed red
2011-02-28 21:15:56 -08:00
Steve Conover
e6a080039f
print started when the test run starts
2011-02-28 21:15:56 -08:00
Steve Conover
c485c33a3c
skipped specs mean yellow star
2011-02-28 21:15:56 -08:00
Steve Conover
8fbf3ba859
newline at 50 characters
2011-02-28 21:15:56 -08:00
Steve Conover
dccafe33b0
style reform
2011-02-28 21:15:56 -08:00
Steve Conover
c1d2718bea
red F, duh
2011-02-28 21:15:55 -08:00
Steve Conover
945a9ba638
failing spec makes a red dot
2011-02-28 21:15:55 -08:00
Steve Conover
528b5abeda
beginning of trivial node reporter, based on jasmine-node. jshint rules exclude bad escapements WRT ansi colors, beacuse that's ok.
2011-02-28 21:15:55 -08:00
Davis W. Frank
d7cced2e7c
How to for release
2011-02-27 14:22:53 -08:00
Davis W. Frank
3be0610572
adding latest pages
2011-02-27 14:00:45 -08:00
Davis W. Frank
5e90115eaf
removing incorrectlt added submodule
2011-02-27 12:33:47 -08:00
Davis W. Frank
148317eb90
1.0.2, finishing to Frank for static pages
2011-02-27 12:26:38 -08:00
Davis W. Frank
45b4e1316c
updating for new pages
2011-02-27 10:36:13 -08:00
Davis W. Frank
aee4c5926c
.gitmodules
2011-02-27 09:48:17 -08:00
Steve Conover
f41af6c2d0
jshint passes - run 'node jshint/run.js'. running jshint with a couple jshint options and workarounds to allow certain jasmine-specific styles. many actual style problems are fixed. the jshint run is integrated into rake jasmine:lint.
2011-02-26 15:07:59 -08:00
Steve Conover
9f90c4eca5
initial jshint commit. including the library, made a runner for jasmine.
2011-02-26 11:23:25 -08:00
Steve Conover
545752ae20
semicolons
2011-02-26 11:01:33 -08:00
Steve Conover
c04f1b1fa8
node spec/node_suite.js runs all dom-independent jasmine specs. basic commonjs support for jasmine along the way. node_suite.js and runner.html are both green.
2011-02-26 10:53:55 -08:00
Davis W. Frank
fa9741dbda
removed old ghpages dir
2011-02-25 08:14:48 -08:00
Davis W. Frank
560cb2edcb
wip
2011-02-25 08:10:34 -08:00
Davis W. Frank
9a12b32a3a
swapping ignore from Jekyll to staticmatic
2011-01-25 13:23:01 -08:00
Christian Williams
bd15ed6a45
Really? "File.exist?", not "File.exists?"? Whatever.
2010-11-09 13:10:40 -05:00
Christian Williams
fa74051071
Don't commit Gemfile.lock.
2010-11-09 09:48:30 -05:00
Christian Williams
127fe049d9
Build for 1.0.1.
2010-10-05 13:51:29 -07:00
Christian Williams
550e378dc0
Fix download page regen after redesign.
2010-10-05 13:50:55 -07:00
Christian Williams
377703745f
Making the checkboxes work fine on IE. onchange doesnt work very well with checkboxes there. The target is not set too.
...
Original author: Fabio M. Costa <fabiomcosta@gmail.com >
2010-10-05 13:27:50 -07:00
Fabio M. Costa
8ecfd26325
Making the checkboxes work fine on IE. onchange doesnt work very well with checkboxes there. The target is not set too.
2010-10-05 13:25:24 -07:00
Christian Williams
2d10cc1404
IE doesn't have console.log.apply(); fall back to console.log() in that case.
2010-10-05 13:11:27 -07:00
Christian Williams & Ryan Richard
63df354e78
Drop in jsdoc template (from jsdoc-toolkit 2.1.0).
2010-10-05 13:11:04 -07:00
John Firebaugh
dbcabd397e
Test that show that afterEach and after are not being called when a waitsFor times out.
2010-09-29 08:25:58 -07:00
John Firebaugh
a8b0a0ee4f
Test that afterEach is called after a failing spec.
2010-09-29 08:19:43 -07:00
John Firebaugh
60a5d60f42
Consolidate all waitsFor specs in the same describe block.
2010-09-28 20:43:50 -07:00
Christian Williams
c8d9fc562f
Un-hide release notes for 1.0.
...
Shade prerelease standalone versions in download list.
2010-09-14 13:42:38 -07:00
Christian Williams
1530ad25f9
Regenerate index.html with standalone download link.
2010-09-14 13:01:42 -07:00
Christian Williams
b2557e4ebe
Build dist for 1.0.0.
2010-09-14 12:58:02 -07:00
Christian Williams
85c265e7c5
Bump version to 1.0.0!
2010-09-14 12:54:23 -07:00
Christian Williams
cc36a1808b
Add link to jasmine site from html runner.
2010-09-12 13:11:33 -07:00
Christian Williams
685344342a
Add MIT.LICENSE to standalone zip.
2010-09-08 13:38:55 -07:00
Christian Williams
a4eab045a0
Fix version format -- 1.0.0.rc1 instead of 1.0.0RC1, and include in standalone zip.
2010-08-26 13:15:15 -07:00
Christian Williams
cd0346b449
Allow version parts to have non-numeric components (e.g. "rc1").
2010-08-26 13:11:54 -07:00
Christian Williams
f134c6e386
Regenerate download page.
2010-08-25 18:44:27 -07:00
Christian Williams
75238bd3b1
Update version to 1.0.0 for RC1.
2010-08-25 18:25:52 -07:00
Christian Williams
b8b4457b6b
Regenerate jasmine.js.
2010-08-25 18:18:49 -07:00
Christian Williams
b33b2d2cf1
toThrow()'s (and some other matchers') .not message is misleading.
2010-08-25 18:16:37 -07:00
Christian Williams
3ec736f64c
Regenerate jasmine.js.
2010-08-25 18:07:14 -07:00
Christian Williams
e7a57606a2
Allow waitsFor() arguments to be specified in arbitrary order.
...
Default waitsFor() timeout is now specified in env.defaultTimeoutInterval; defaults to 5 seconds.
Deprecate waits() block in favor of waitsFor().
2010-08-25 18:04:52 -07:00
Christian Williams
55149310c3
Fixed bug: waitsFor() hangs forever if latch function never returns true.
2010-08-25 17:16:19 -07:00
Christian Williams
254ebb8a03
Update jasmine.js.
2010-08-25 15:46:57 -07:00
Christian Williams
762f88e3c8
Some exploration and refactoring re waitsFor() bug: waitsFor() hangs forever if latch function never returns true.
2010-08-19 23:55:21 -07:00
Christian Williams
b3715075e3
Add custom messages for inverted spy matchers.
2010-08-13 00:32:32 -07:00
Christian Williams
9af81b627b
Missing semicolons.
2010-08-05 23:10:09 -07:00
Christian Williams
5d44da0238
Remove acknowledgements and analytics code from README.
2010-08-05 00:54:54 -07:00
Christian Williams
93952890c3
Deprecate toNotBe, toNotEqual, toNotMatch, and toNotContain matchers.
2010-08-05 00:50:59 -07:00
Christian Williams
5182e00c66
Wrapped matcher functions return undefined after expect() for futureproofing; we might want to allow matcher chaining, e.g.:
...
expect(x).toBeGreaterThan(3).and.toBeLessThan(6));
or other stuff e.g.:
expect(x).toBeTrue().because("it just needs to be");
2010-08-04 13:52:38 -07:00
Christian Williams
676af93bea
Refactor toThrow() matcher specs.
2010-08-03 18:51:31 -07:00
Christian Williams
4d7b839473
Fix not.toThrow() matcher exception when used with no args.
2010-08-02 18:36:26 -07:00
Todd Persen
89afebd86b
Update copyright years.
2010-07-30 11:59:30 -04:00
Christian Williams
31020bb51d
Try adding analytics code.
2010-07-28 18:18:18 -07:00
Christian Williams
17e9a038a2
2010-07-28 18:17:10 -07:00
Todd Persen
1e01000c17
Update MIT License and add to README.
2010-07-28 11:20:29 -04:00
Christian Williams
6562b5a3b4
Add warning to SpecRunner.html when running from non-built source.
2010-07-27 18:47:12 -07:00
Christian Williams & Jay Phillips
15955df258
Styling.
2010-07-23 18:25:21 -07:00
Christian Williams & Jay Phillips
81bf4784cd
Move User Guide to site.
2010-07-23 18:23:53 -07:00
Christian Williams & Jay Phillips
14486f5912
Add jekyll to Gemfile.
2010-07-23 18:19:16 -07:00
Christian Williams & Jay Phillips
9842c8ff81
Move User Guide from github README to here.
2010-07-23 18:08:33 -07:00
Christian Williams
feb4618c31
Add Gemfile.
2010-07-23 10:06:19 -07:00
Christian Williams & Jay Phillips
c6acfb3982
Merge branch 'master', remote branch 'origin'
2010-07-21 18:55:55 -07:00
Tom Crayford
ba5bd3f866
Jasmine.createSpy() throws a reference error, jasmine.createSpy() does not.
2010-07-18 00:45:23 +08:00
Christian Williams & Harry Ugol
0331209413
Merge branch 'master' of git://github.com/pivotal/jasmine
2010-07-09 14:51:13 -07:00
Christian Williams
57491a0088
README updates.
2010-07-05 22:56:37 -07:00
Christian Williams
e6b6d9ca95
2010-07-05 22:46:55 -07:00
Christian Williams
bf44d4b0db
Change link to downloads.
2010-07-01 00:06:28 -07:00
Christian Williams
3da73bd519
Remove unused lib/consolex.js.
2010-06-30 23:49:34 -07:00
Christian Williams
61c0fe781c
Styling fix.
2010-06-30 00:09:01 -07:00
Harry Ugol & Tyler Schultz
766f3546bf
Add gem reference.
2010-06-28 10:52:22 -07:00
Lee Byrd & Christian Williams
f6d1f7d871
checking in master's SHA
2010-06-25 18:19:02 -07:00
Lee Byrd & Christian Williams
5e843e087b
updating gh-pages SHA
2010-06-25 18:13:58 -07:00
Lee Byrd & Christian Williams
51c0563608
bumping version to 0.11.1
2010-06-25 18:11:18 -07:00
Lee Byrd & Christian Williams
9e3036fbf7
Doc fix.
2010-06-25 17:40:50 -07:00
Lee Byrd & Christian Williams
dcc8b460d1
Rakefile updates pages/index.html.
2010-06-25 17:35:08 -07:00
Lee Byrd & Christian Williams
c533b67aa5
Remove vestiges of ruby ci code from jasmine core.
...
Add missing lib/jasmine-html.js.
2010-06-25 15:16:43 -07:00
Lee Byrd & Christian Williams
7a69d64669
Add dist to .gitignore.
...
Exclude hidden files from standalone zip.
2010-06-25 10:07:08 -07:00
Lee Byrd & Christian Williams
ed80a0cad7
Re-add lib/jasmine.css for jasmine-gem.
2010-06-24 17:37:13 -07:00
Lee Byrd & Christian Williams
85351f2c1c
Build html support classes (just TrivialReporter for now) into jasmine-html.js.
2010-06-24 17:33:46 -07:00
Lee Byrd & Christian Williams
1057596665
New example project.
...
Generate jasmine-standalone-x.x.x.zip.
2010-06-24 17:15:06 -07:00
Lee Byrd & Christian Williams
22065fafad
By default don't display "Jasmine Running..." console log for each spec. Re-enable by setting TrivialReporter's logRunningSpecs to true.
2010-06-24 11:10:58 -07:00
Lee Byrd & Christian Williams
2939aff80c
deprecating wasCalled, wasCalledWith, wasNotCalled, wasNotCalledWith and adding toHaveBeenCalled, and toHaveBeenCalledWith
2010-06-24 10:34:03 -07:00
Lee Byrd & Christian Williams
6a0e452788
Oops, remove call to jasmine.log().
2010-06-23 17:12:38 -07:00
Lee Byrd & Christian Williams
00296b02e0
Regenerate jsdoc.
2010-06-23 11:31:55 -07:00
Lee Byrd & Christian Williams
8f5f6a6d27
The single-file lib/jasmine.js no longer has a version number in the filename. We'll make it available for download with the version number seperately.
...
Add lint check for 'window'.
Remove last 'window' reference.
2010-06-23 11:31:38 -07:00
Lee Byrd & Christian Williams
ed47ececa9
The single-file lib/jasmine.js no longer has a version number in the filename. We'll make it available for download with the version number seperately.
2010-06-23 11:26:01 -07:00
Lee Byrd & Christian Williams
9c8180d8d0
Fixed bug where multiple calls to jasmine.Clock.useMock cause multiple tear downs
2010-06-23 11:03:05 -07:00
Lee Byrd & Christian Williams
6a9f74e849
Add jsdoc for jasmine.log.
2010-06-23 10:53:10 -07:00
Lee Byrd & Christian Williams
3be2455d8c
README change.
2010-06-23 10:28:02 -07:00
Lee Byrd & Christian Williams
40b0c49d25
Point example_runner.html to latest jasmine version.
...
Update README.
2010-06-23 10:21:21 -07:00
Lee Byrd & Christian Williams
82e04c327a
Bumped version to 0.11.0.
...
Regenerated docs and lib.
2010-06-22 17:52:25 -07:00
Lee Byrd & Christian Williams
2a3376d11e
Removed deprecated jasmine.include().
...
Removed deprecated ExpectationResult.details.
Removed deprecated Spec.getResults().
2010-06-22 17:38:15 -07:00
Lee Byrd & Christian Williams
413be6b4ca
Remove deprecated class jasmine.Reporters.
...
Fully deprecate old-style Matchers; will be removed in next major version.
2010-06-22 17:35:41 -07:00
Lee Byrd & Christian Williams
0539251fe6
Refactored TrivialReporter to handle duplicate suite names properly
2010-06-22 17:25:08 -07:00
Lee Byrd & Christian Williams
1154fcaf3b
Refactor.
2010-06-22 16:45:35 -07:00
Lee Byrd & Christian Williams
01d842fdfd
Removed references to 'window'; using jasmine.getGlobal() instead in order to better support non-browser environments.
...
Better protection around access to console.
The global object is now pretty-printed as "<global>", not "<window>".
Tests are a little closer to passing in node.js.
2010-06-22 16:22:09 -07:00
Lee Byrd & Christian Williams
e60f22a2e5
Changed 'type' field of MessageResult and ExpectationResult to 'log' and 'expect', respectively.
2010-06-22 14:48:47 -07:00
Lee Byrd & Christian Williams
e7cd6a473a
jasmine.log() and Spec#log() take multiple arguments which are pretty-printed and concatted together.
...
Log messages are handled correctly in TrivialReporter and JsApiReporter.
2010-06-22 12:23:54 -07:00
Lee Byrd & Christian Williams
3bdc96c00a
Re-enable and fix JsApiReporterSpec specs.
2010-06-22 12:04:34 -07:00
Lee Byrd & Christian Williams
b9bf42c6b5
Merge branch 'master' of git@github.com:pivotal/jasmine into HEAD
2010-06-22 10:43:48 -07:00
Lee Byrd & Christian Williams
2d138f1cfa
Refactor.
2010-06-22 10:30:06 -07:00
Lee Byrd & Christian Williams
e30b99e7b3
JsApiReporter reports nested suites correctly.
...
Runner#topLevelSuites() returns only top level suites.
Suite#specs(), Suite#suites(), and Suite#children() return immediate children.
2010-06-22 10:18:22 -07:00
DanielHeath
40272cd563
Fixed typo in example code.
2010-06-15 11:47:30 +08:00
Pivotal
c187adc096
Version bump to 0.10.4
2010-06-05 10:44:54 -04:00
Pivotal
5aa306cf66
Add unit specs for WaitsForBlock
2010-06-05 10:32:41 -04:00
Pivotal
462b50e84e
Replace unshift with splice (unshift not IE-safe)
2010-06-05 10:12:16 -04:00
Pivotal
46249bf515
Fix spec failure that occured when stack traces/line numbers are available
2010-06-05 10:07:58 -04:00
Christian Williams
03d7bfb7d4
Oops, shouldn't onComplete there.
2010-06-04 14:48:48 -04:00
Christian Williams
11292ff83c
Merge branch 'master' of git@github.com:pivotal/jasmine
2010-06-04 14:45:52 -04:00
Christian Williams
ab7678e713
Apply patch from Eric Pabst (May 18, 2010):
...
Replaced call to self.spec._next() with onComplete() when the test times out.
This is because there is no such function as _next(), and onComplete() seems to
do the right thing.
2010-06-04 14:45:42 -04:00
Eric Pabst
6431431dfc
Replaced call to self.spec._next() with onComplete() when the test times out.
...
This is because there is no such function as _next(), and onComplete() seems to do the right thing.
2010-06-05 02:44:51 +08:00
Christian Williams
a2041e90a6
Multiple befores/afters in a single describe should be executed in order (as declared for befores, in reverse for afters).
2010-06-04 14:41:16 -04:00
Christian Williams
ed49104fad
Jasmine should recover gracefully when there are errors in describe functions.
2010-06-04 14:14:31 -04:00
labday
803a2fb2ba
Fixing documentation error.
2010-05-28 05:52:48 +08:00
John Firebaugh
bb1928a75c
Remove geminstaller stuff.
...
This isn't a gem anymore, and geminstaller is deprecated.
2010-05-08 10:57:43 +08:00
John Firebaugh
7d5ff6985f
Rebuild to fix line endings.
2010-05-08 10:57:43 +08:00
ragaskar
841e93fc09
'Hide' currently unusable Rake tasks
2010-04-20 07:26:51 -07:00
bigfix
5cfb019b6b
Documentation and example fixes
2010-04-20 07:26:04 -07:00
Christian Williams & Ian Fisher
9f8d18b6b7
Version bump to 0.10.3
2010-04-01 16:03:52 -07:00
Christian Williams & Ian Fisher
f0574086de
Version bump to 0.10.3
2010-04-01 16:00:50 -07:00
Christian Williams & Ian Fisher
2212d755c3
Merge commit '5f10b2e623c6c21d1b692bde4a8a5c6d4015cd44'
2010-04-01 15:57:24 -07:00
Christian Williams & Ian Fisher
5f10b2e623
Added Env#versionString; nicer styling in TrivialReporter; hide passed and skipped tests by default, but allow them to be displayed.
2010-04-01 15:56:29 -07:00
Christian Williams
d8ed4156c7
Remove contrib/ruby dir.
2010-03-24 14:18:17 -07:00
Christian Williams
1469f83262
Deprecate jasmine.include().
2010-03-24 13:53:34 -07:00
Christian Williams
d6353a3db2
Typo.
2010-03-24 13:43:47 -07:00
ragaskar
9a5b46fd99
Version bump to 0.10.2
2010-03-18 20:35:36 -07:00
ragaskar
bf938ffc50
Correct number matching in equals_
2010-03-18 20:32:40 -07:00
ragaskar
c85079e9d0
Handle string comparisons correctly with equals_
2010-03-17 08:19:29 -07:00
ragaskar
dec92322f1
Add default jasmine rake task
2010-03-17 07:54:20 -07:00
Christian Williams
72ea614d5e
Rebuild lib/jasmine.
2010-03-15 12:15:50 -07:00
Christian Williams
184ff6fb2d
Typo.
2010-03-08 22:03:57 -08:00
Christian Williams
9830952461
Evaluate custom equality testers before any others.
2010-03-08 21:56:04 -08:00
Christian Williams
e9a2b0dcdb
Better deprecation messages.
2010-03-05 22:40:47 -05:00
Christian Williams
23d5c7180b
Keep jasmine.Matchers.pp() but throw an error message.
2010-03-05 22:36:42 -05:00
Christian Williams
a661e77345
Remove jasmine.Matchers.pp(), use jasmine.pp() instead.
2010-03-05 22:34:37 -05:00
Christian Williams
564b9a0c3e
Cleanup.
2010-03-05 22:11:11 -05:00
Christian Williams
2ab6af1e48
Add doc about Spec#after() method.
2010-03-05 22:10:05 -05:00
Christian Williams
22e9434a50
Correction d'une faute.
2010-03-03 23:51:11 -05:00
Christian Williams
581d948c93
Add quick mention of '.not' matcher inversion.
2010-03-03 23:48:10 -05:00
Christian Williams
7721f47f59
Update dist.
2010-03-01 23:12:12 -05:00
Christian Williams
49f295690a
Old-style custom matchers (those which call this.report()) are not supported with the ".not" matcher negation syntax.
2010-03-01 23:02:59 -05:00
Christian Williams
4b80a10969
Fix specs.
2010-02-27 12:00:35 -05:00
Christian Williams
6574dcc728
Merge branch 'master' into dot-not
2010-02-27 11:57:15 -05:00
Christian Williams
99bcfdcd0d
Spec cleanup.
2010-02-27 11:37:53 -05:00
Erik Hanson
fcfe23d516
fixed a couple Markdown formatting issues
2010-02-26 11:42:38 -08:00
Christian Williams
e1b3ca4066
Update spy expectation docs.
2010-02-25 22:01:25 -05:00
Christian Williams
5a7eea53b1
Update why-did-we-write-it sections.
2010-02-25 21:58:08 -05:00
Christian Williams
f9426a008e
Update why-did-we-write-it sections.
2010-02-25 21:56:42 -05:00
Rajan Agaskar
0bb7f4bd6a
README update
2010-02-24 19:59:39 -08:00
Rajan Agaskar
da49a0ce40
README update
2010-02-24 19:58:56 -08:00
Josh Susser
80d67d49a0
Bump version to 0.10.1
2010-02-24 19:45:30 -08:00
Josh Susser
6ca766d5ea
Update isArray_ function and add test coverage
2010-02-24 19:35:32 -08:00
Josh Susser
5e3eb884ca
Fix message bug with wasCalledWith. Throw on bad arguments to createSpyObj
2010-02-24 19:27:43 -08:00
Christian Williams
aef78b1ef1
MORE MARKDOWN LIES!!!
2010-02-20 14:46:26 -05:00
Christian Williams
f1f5d8de7d
GitHub's markdown previewer LIES!
2010-02-20 14:45:40 -05:00
Christian Williams
535d9abce0
Update docs about Matchers to use addMatcher().
2010-02-20 14:44:58 -05:00
Christian Williams
8679090bf3
Convert tabs to spaces.
2010-02-20 14:08:45 -05:00
ragaskar
b12605274d
Minor css bugfix, doc update
2010-01-27 19:19:30 -08:00
ragaskar
db1c6e659d
Updated ruby contrib so that CI task now compatible with Prototype
2010-01-23 13:50:44 -08:00
Davis W. Frank & Rajan Agaskar
d72b18c47b
README updates
2010-01-04 14:57:05 -08:00
Rajan Agaskar
81c2779731
HTML example name refactor
2009-12-30 17:03:02 -08:00
David Goudreau & Rajan Agaskar
163f5977a5
making jasmine know about ci
2009-12-28 16:45:01 -08:00
David Goudreau & Rajan Agaskar
99ab1f0e81
Remove saucelabs.yml copying
2009-12-28 16:32:20 -08:00
David Goudreau & Rajan Agaskar
02db3338fb
Add gems:geminstaller task
2009-12-28 16:19:39 -08:00
David Goudreau & Rajan Agaskar
ca841c9248
Adding geminstaller as build dependency
2009-12-28 16:02:09 -08:00
David Goudreau & Rajan Agaskar
c78460289a
trying to get saucelabs ci build to work
2009-12-28 15:45:15 -08:00
Christian Williams
a16cbe7e5b
Remove contrib dir.
2009-12-27 11:53:46 -06:00
Christian Williams
e986b024bc
Update generated files.
2009-12-25 14:19:27 -05:00
Christian Williams
bef9867b61
Merge branch 'master' of git@github.com:pivotal/jasmine
2009-12-25 11:41:07 -05:00
Christian Williams
d16e2b7992
Add partial support for not -- e.g. expect(xxx).not.toEqual(yyy). Old-style custom matchers not yet supported.
2009-12-24 17:01:13 -05:00
Christian Williams
20a00d517e
Refactor toThrow matcher.
2009-12-24 13:41:28 -05:00
Christian Williams
9f247eb278
Custom matchers may now work like regular matchers -- just return a boolean, don't call this.report(). The old style still works but is deprecated.
2009-12-24 12:15:18 -05:00
Christian Williams
b99bd08df9
Yes, really keep that undefined equals.
2009-12-24 12:11:59 -05:00
Christian Williams
72b5ede0da
Move custom matcher specs to their own suite.
2009-12-24 10:53:57 -05:00
ragaskar
21998dcb9d
Update Jasmine geminstaller to use gemcutter gems
2009-12-23 21:29:34 -08:00
ragaskar
ba8c16acd7
Rebuild jasmine, add rest-client to geminstaller (req'd by saucelabs-adapter
2009-12-23 07:38:18 -08:00
Fabio M. Costa
dd5e97bf14
with this fix jasmine runs on ie6
...
(cherry picked from commit 33a3b769e2b28aab01c1d6ee216c55e12539f417)
2009-12-23 07:14:47 -08:00
Nathan Wilmes & Davis W. Frank
d90852336f
Added wasNotCalledWith matcher, used argsForCall a bit less
2009-12-21 11:45:49 -08:00
Nate Clark
849a4efda8
adds support to run Jasmine suites on CI using Sauce Labs
2009-12-16 17:27:06 -08:00
Christian Williams
40ff1cb4c8
Merge branch 'safe-undefined' of git@github.com:pivotal/jasmine
2009-11-27 15:30:56 -05:00
Christian Williams
23c5289b7e
Fix regexp pretty printing for Chrome.
2009-11-27 15:27:52 -05:00
Christian Williams
7653107f0c
Use jasmine.undefined for all comparisons to the undefined value, since undefined itself may be redefined elsewhere
...
in app code. Thanks to Charlie Meyer at UIUC for the suggestion.
2009-11-26 11:12:06 -05:00
Christian Williams
2cb5bf146c
rake jasmine:build no longer builds docs; use default for that.
2009-11-26 10:41:10 -05:00
Christian Williams
4ebc3b5964
Update.
2009-11-26 10:29:50 -05:00
Joseph Palermo
701ee719e6
Fix loop so it works with extra methods added to Array
2009-11-22 22:18:53 -08:00
ragaskar
f99a5ff577
Merge branch 'matcher-refactor' of git://github.com/Xian/jasmine into xian_jasmine
2009-11-19 19:21:47 -08:00
Christian Williams
1a53838d97
Wrap base matchers from jasmine.Matcher prototype automatically at env instantiation time rather than manually.
2009-11-13 14:32:08 -05:00
Christian Williams
2fc78a0fe2
Moved last message formatting functions to be set up by matcher test function.
2009-11-13 13:34:10 -05:00
Christian Williams
60ea562560
Reuse an 'it' block.
2009-11-13 13:21:40 -05:00
Christian Williams
b0326d3078
Reorganizing spy matcher specs.
2009-11-13 12:30:22 -05:00
Christian Williams
752b91f118
Reorganizing spy matcher specs.
2009-11-13 12:21:34 -05:00
Christian Williams
b0ae461139
Nicer pretty printing of spy objects.
2009-11-12 16:49:48 -05:00
Christian Williams
ee5905d237
Fix html escaping of matcher failure messages.
2009-11-12 16:13:44 -05:00
Christian Williams
5a8a050c46
Removed toMatch and toNotMatch's message functions, now sufficiently handled by the default message builder.
2009-11-12 15:43:49 -05:00
Christian Williams
7be8247b2f
Fix pretty printing of RegExp objects.
2009-11-12 15:37:52 -05:00
Jared Grippe
2881a645a5
fixed two typos in README
2009-11-13 04:13:59 +08:00
Christian Williams
98e86817bf
Fix wasCalledWith matcher.
2009-11-12 15:03:55 -05:00
Christian Williams
3b92b9bb79
Remove message function from matchers where a formulaic message is good enough.
2009-11-12 14:36:58 -05:00
Christian Williams
1b3545c82a
Remove 'actual' param from matchers test and message functions. Use this.actual instead. This way, the signature of the test function matches how the matcher is called from a spec.
...
Spy matchers now throw an exception when called with non-spies, rather than returning false. This makes the message function simpler, and will work better with future dot-not support.
Added better specs for error conditions on spy matchers.
2009-11-12 12:47:44 -05:00
Christian Williams
2a5754600a
Add documentation for all non-private functions.
2009-11-10 17:32:29 -05:00
Christian Williams
ff8b9d8375
Oops, revert unintentional commit.
2009-11-10 14:30:26 -05:00
Christian Williams
1982fb51c9
Generate docs from source files, not lib.
2009-11-10 14:28:47 -05:00
Christian Williams
0810e4a01c
Rename UPDATE_INTERVAL to DEFAULT_UPDATE_INTERVAL.
2009-11-09 17:51:03 -05:00
Christian Williams
0f610b03d2
Merge branch 'master' of git@github.com:pivotal/jasmine
2009-11-09 17:42:21 -05:00
ragaskar
8feb285ca8
Ruby runner changes. Users of previous versions with Rake tasks that make use of additional runner options (helpers, etc) may be broken.
2009-10-31 21:47:11 -07:00
ragaskar
c21431415b
More helpful error message when a jasmine server is already running
2009-10-31 10:50:18 -07:00
ragaskar
f9d73761bb
Restore Matcher prototype methods for IDE joy
2009-10-30 19:29:19 -07:00
ragaskar
4c600311df
consolex update
2009-10-29 22:19:13 -07:00
ragaskar
827fd1da0e
Pass sensible arguments in ExpectationResults
2009-10-29 20:33:47 -07:00
ragaskar
328cc89980
Add deadlyicon console fix for safari
2009-10-29 19:48:23 -07:00
ragaskar
cf6d26d25f
Removing outdated info from README
2009-10-29 19:30:31 -07:00
Ryan Dy & Rajan Agaskar
b67d2a265d
major matcher refactor
2009-10-29 17:03:24 -07:00
ragaskar
8b23698852
TrivialReporter matcher message spec. Simplified TrivialReporter createDom.
2009-10-27 22:18:38 -07:00
pivotal
6a467fc00e
added tests for mockclock
2009-10-27 16:49:23 -07:00
Davis Frank & Rajan Agaskar
fa2d36c5dc
Minor doc fix
2009-10-27 13:33:22 -07:00
ragaskar
a0cac54492
README update
2009-10-24 17:06:42 -07:00
ragaskar
2059422955
Removed jasmine.env.currentlyRunningTests, use reporter to determine if jasmine is running
2009-10-24 17:01:40 -07:00
Erik Hanson & Rajan Agaskar
b35a2acfc8
Moved currentlyRunningTests to Runner instead of spec
2009-10-21 09:33:31 -07:00
pivotal
e77162f308
Merge branch 'master' of git@github.com:pivotal/jasmine
2009-10-21 09:30:38 -07:00
Erik Hanson & Rajan Agaskar
1c3b3b89be
Added geminstaller.yml
2009-10-21 09:30:16 -07:00
Christian Williams
970ef0cec2
Refactor.
2009-10-19 22:19:36 -07:00
Christian Williams
97ce2070d1
Remove version.json.
2009-10-19 22:18:51 -07:00
Christian Williams
b6e408aab8
Remove @deprecated methods.
2009-10-19 22:17:22 -07:00
Christian Williams
6b3bf1b3ba
Merge branch 'master' of git@github.com:pivotal/jasmine
...
Conflicts:
spec/runner.html
2009-10-19 22:02:05 -07:00
Christian Williams
5dd9c53176
Remove @deprecated methods.
2009-10-19 17:53:29 -07:00
Christian Williams
5f82bdbf1b
Fix test running in IE.
2009-10-19 17:29:33 -07:00
ragaskar
3109e7a4bb
Jasmine version to 0.10.0
2009-10-16 20:10:20 -07:00
Daniel Weaver & David Goudreau
397d202f54
Merge branch 'master' of git://github.com/pivotal/jasmine
2009-10-16 12:19:06 -07:00
ragaskar
2597c235d9
Updated docs to reflect 0.9.0 release
2009-10-15 23:27:19 -07:00
ragaskar
d222855cc8
TrivialReporter IE compatibility
2009-10-15 20:00:41 -07:00
ragaskar
308d02f72f
Trivial Reporter improvements, runner now returns specs()
2009-10-15 18:58:52 -07:00
ragaskar
35171c9222
Rebuild jasmine.js
2009-10-15 18:00:05 -07:00
ragaskar
e9e74f1800
Merge branch 'master' of git://github.com/deadlyicon/jasmine
2009-10-15 17:58:51 -07:00
ragaskar
85d3b2d14b
IE7 fixes
2009-10-15 17:48:28 -07:00
Jared Grippe
706b180a2c
fixed javascript syntax errors in README
2009-10-15 17:43:33 -07:00
Rajan Agaskar & Ryan Dy
beddbaf5c7
update jasmine runner to take focus spec
2009-10-14 10:28:23 -07:00
Rajan Agaskar & Ryan Dy
a907301dcb
Merge branch 'master' of git://github.com/pivotal/jasmine
2009-10-13 15:18:05 -07:00
Rajan Agaskar & Ryan Dy
1b1c2b1998
Allow jasmine::runner to take an optional list of styesheets
2009-10-13 15:16:20 -07:00
Rajan Agaskar & Ryan Dy
e7865295dd
Revert "Allow jasmine::runner to take an optional list of styesheets"
...
This reverts commit 6d8557608c .
2009-10-13 15:14:07 -07:00
Rajan Agaskar & Ryan Dy
6d8557608c
Allow jasmine::runner to take an optional list of styesheets
2009-10-13 15:12:35 -07:00
Rajan Agaskar & Ryan Dy
fd37be4dff
Merge branch 'master' of git://github.com/pivotal/jasmine
2009-10-13 14:51:33 -07:00
Rajan Agaskar & Ryan Dy
92ffcb47e2
SimpleServer.start now takes optional array of stylesheet paths for runner
2009-10-13 14:48:09 -07:00
Rajan Agaskar & Ryan Dy
c164d58a1a
Add calls accessor to spies
2009-10-13 14:28:46 -07:00
Rajan Agaskar & Ryan Dy
3459697cb4
merge in Queue fixes
2009-10-13 14:22:47 -07:00
Rajan Agaskar & Ryan Dy
31bb686fd5
Merge branch 'loop-dont-recurse' of git://github.com/Xian/jasmine into xian_jasmine
2009-10-13 14:12:35 -07:00
Christian Williams
5659a1e79e
jasmine.Queue iterates by looping rather than recursing, so stack overflows should be less likely.
2009-10-12 23:09:51 -05:00
Christian Williams
b7549196da
Blocks which complete synchronously have the completion de-nested. Big speed improvement, not quite sure why yet.
2009-10-12 21:23:57 -05:00
Christian Williams
a3ed49a5ed
Refactor.
2009-10-12 21:02:50 -05:00
Christian Williams
e1ebc1e692
Refactor Queue.js.
2009-10-12 17:22:00 -05:00
Christian Williams
d27684d280
Oops, only report results once.
2009-10-12 17:15:57 -05:00
Christian Williams
f9b3eff5ab
Got standalone HTML test page working again.
2009-10-12 17:13:54 -05:00
Christian Williams
34b479a1a4
Revert "Removed jasmine spec HTML runner (easier to use Rake tasks)"
...
Let's keep it around though so we can run tests without Ruby, eh?
This reverts commit e33ecf3665 .
2009-10-12 17:13:41 -05:00
Christian Williams
6ee8ed02a9
Revert "Removed jasmine spec HTML runner (easier to use Rake tasks)"
...
Let's keep it around so we can still run tests without Ruby, eh?
This reverts commit e33ecf3665 .
2009-10-10 10:18:35 -07:00
ragaskar
73c0d57c94
Tuning to prevent stack overflows in FF
2009-10-05 22:36:10 -07:00
Christian Williams & David Goudreau
cbc15d733d
Revert "Add no-op test:unit and test:integration tasks for EMI build only."
...
This reverts commit 61241140e8 .
2009-10-05 10:47:26 -07:00
Christian Williams & David Goudreau
61241140e8
Add no-op test:unit and test:integration tasks for EMI build only.
2009-10-05 10:19:02 -07:00
ragaskar
250c483a6b
Merged in Selenium optimizations from http://github.com/gannett/jasmine branch. Updated json2 to latest.
2009-09-29 22:09:30 -07:00
ragaskar
a394b564f4
runner-wide beforeEach, afterEach support
2009-09-28 16:24:45 -07:00
ragaskar
2588368231
Deprecate getResults() (use results()). Add some unit test coverage for jasmine.Spec. Add some unit test coverage for JsApiReporterSpec.
2009-09-28 11:13:44 -07:00
ragaskar
d09cacebc7
Fix HTML runner example
2009-09-15 13:02:20 -07:00
ragaskar
ddaab50b75
Documentation updates.
2009-09-09 18:46:29 -07:00
ragaskar
e33ecf3665
Removed jasmine spec HTML runner (easier to use Rake tasks)
2009-09-09 18:26:05 -07:00
ragaskar
26fdc7cc91
Fix for jasmine rake tasks, fix for window.eval issues
2009-09-09 18:18:00 -07:00
Christian Williams
724f1772b7
Merge branch 'master' of git@github.com:pivotal/jasmine
...
Conflicts:
Rakefile
examples/ruby/Rakefile
examples/ruby/spec/jasmine_spec.rb
lib/jasmine-0.9.0.js
src/Queue.js
2009-09-08 06:48:57 -07:00
Christian Williams
2a29bb3ad9
Revert "rakefile"
...
This reverts commit 368756e4d5 .
2009-09-08 06:23:26 -07:00
Christian Williams
3e7f870965
Revert "adding rake test subtasks (noop) for git submodule rake compatibility"
...
This reverts commit 4138fd3626 .
2009-09-08 06:20:43 -07:00
ragaskar
11f356e375
Integrate JasmineHelper
2009-09-04 23:04:48 -07:00
ragaskar
65cec7a2b9
Updated require for SimpleClient for greater selenium compatibility
2009-09-04 19:46:39 -07:00
ragaskar
4620ea6a44
Merged in Xian's speed fixes
2009-09-04 10:57:08 -07:00
Christian Williams & Kim Eric Mittler
3b702bd992
Add back support for Env's updateInterval.
2009-09-02 15:33:24 -07:00
Christian Williams & Kim Eric Mittler
bed9e118b6
Add time reporting.
2009-09-02 15:32:57 -07:00
Christian Williams & Kim Eric Mittler
8ba804e299
Change url from /run.html to /.
2009-09-02 12:51:39 -07:00
Christian Williams & Kim Eric Mittler
17b513eafb
Switch back to window.eval(xxx) instead of eval(xxx, window) -- arghghgh.
2009-09-02 12:38:17 -07:00
Christian Williams & Kim Eric Mittler
ca6b23684e
Time out if we can't load suite info within 60 seconds.
2009-09-02 12:36:51 -07:00
Christian Williams & Kim Eric Mittler
268cb0c6c5
Jasmine::Runner arranges for jasmine.js, json.js, and TrivialReporter.js to be included, so callers should remove those files.
2009-09-02 12:16:16 -07:00
Christian Williams & Kim Eric Mittler
5e8b52debf
Merge branch 'master' of git://github.com/pivotal/jasmine
2009-09-02 10:29:59 -07:00
ragaskar
43f819e9e2
Deprecated getAllSuites
2009-09-02 07:52:11 -07:00
ragaskar
4533d6a7cd
specs() refactor, added test coverage
2009-09-02 07:30:31 -07:00
ragaskar
50134eb1ac
Fix 'doubled' test runs in test runner
2009-09-01 21:21:54 -07:00
Kelly Nawrocke & Aram Price
4138fd3626
adding rake test subtasks (noop) for git submodule rake compatibility
2009-09-01 09:20:25 -07:00
ragaskar
b9ee6a9119
Version revision uses current timestamp
2009-08-27 22:23:51 -07:00
ragaskar
d7a47264ef
Automatically build jsdocs on rake build tasks
2009-08-27 22:15:50 -07:00
pivotal
187bde37ca
dwf/cj: added function and tests to get a suite's spec count
2009-08-27 14:21:10 -07:00
pivotal
7edeb13be8
dwf/cj - fixing .gitignore to ignore all of idea's files.
2009-08-27 10:16:45 -07:00
ragaskar
e8d582600c
Fixes for jasmine rake test:ci
2009-08-26 22:41:19 -07:00
ragaskar
7a446d53c0
Reorg. Added examples/ with html and ruby test runner examples
2009-08-26 22:13:30 -07:00
ragaskar
ba5b4ab166
Fix compatibility with the ruby contrib runner
2009-08-26 15:55:08 -07:00
Christian Williams & Kim Eric Mittler
985d08885e
Add Jasmine.cachebust.
2009-08-26 10:54:16 -07:00
Aram Price & Ryan Dy
368756e4d5
rakefile
2009-08-24 17:41:51 -07:00
Aram Price & Ryan Dy
a1bc4dc2e4
submodules
2009-08-24 16:32:48 -07:00
ragaskar
f9d61108ee
Minor version changes
2009-08-21 07:00:54 -07:00
ragaskar
3993969c41
Add versioning to jasmine
2009-08-20 22:16:14 -07:00
ragaskar
9b9a4b6835
Add test coverage for empty suite handling
2009-08-20 19:32:15 -07:00
ragaskar
96bcde80af
Minor logging fix
2009-08-20 19:21:07 -07:00
ragaskar
bc790d6b87
Rebuild jasmine.js
2009-08-19 08:50:56 -07:00
ragaskar
2a4241323d
Permit focused running with Queue-based runner
2009-08-19 07:55:51 -07:00
ragaskar
0a3358f249
Merge in new HTML runner. Tests green, regression on focused running.
2009-08-19 07:42:47 -07:00
Christian Williams & Kim Eric Mittler
1573bf58c5
Fix reporter bug.
2009-08-17 13:40:32 -07:00
Christian Williams & Kim Eric Mittler
1c9607ec33
Add a "run all" link.
2009-08-17 13:37:33 -07:00
xian
e9126fdd9b
Fix some problems with merge.
2009-08-14 18:04:52 -07:00
xian
ab65914233
Merge branch 'master' of git@github.com:emi/jasmine into htmlreporter
...
Conflicts:
lib/TrivialReporter.js
spec/bootstrap.js
spec/runner.html
2009-08-14 18:03:47 -07:00
Aaron Peckham & Christian Williams
027b28ecb0
Fix formatting.
2009-08-14 15:44:45 -07:00
Aaron Peckham & Christian Williams
8870f907e8
Fixed formatting.
2009-08-14 15:43:36 -07:00
Aaron Peckham & Christian Williams
ca077342f3
Added toBeLessThan and toBeGreaterThan matchers.
2009-08-14 15:39:28 -07:00
ragaskar
454d453207
add setTimeout to Queue so reporters get periodic updates
2009-08-13 07:52:44 -07:00
ragaskar
7b63960db0
Refactor Runner to use Queue; remove ActionCollection
2009-08-12 22:12:28 -07:00
Erik Hanson & Evan Cooney
3e68a2c2bc
remove a leftover call to "console.log"
2009-08-12 16:12:57 -07:00
Erik Hanson
4410c7cd94
added failure count to top of trivial reporter
2009-08-12 10:15:15 -07:00
Aaron Peckham & Christian Williams
93c7b092b3
Un-pad body.
2009-08-11 12:05:56 -07:00
Aaron Peckham & Christian Williams
624a6dd85c
More application of prettiness.
2009-08-10 18:07:03 -07:00
Aaron Peckham & Christian Williams
8f12dbf3b4
Suites are a little lighter colored.
2009-08-10 17:59:24 -07:00
Aaron Peckham & Christian Williams
2ef71580ad
Color suites to reflect spec pass/fail status.
2009-08-10 17:54:20 -07:00
Aaron Peckham & Christian Williams
4b244612c1
Visually group specs by suite.
2009-08-10 17:50:03 -07:00
Aaron Peckham & Christian Williams
b1a007dfb5
Move specFilter function to TrivialReporter.
2009-08-10 16:00:42 -07:00
Aaron Peckham & Christian Williams
e476f2375a
Allow individual specs to be rerun; show skipped tests in gray.
2009-08-10 15:39:48 -07:00
ragaskar
0061054aaa
minor runner test cleanup
2009-08-08 09:31:19 -07:00
ragaskar
56c26c5b55
Allow waits/runs in spec.after. spec.after runs in between spec end and afterEach.
2009-08-08 09:31:19 -07:00
ragaskar
8b998749f3
afterEach now allows for waits, runs blocks
2009-08-08 09:31:12 -07:00
ragaskar
b55399bd4b
beforeEach now supports waits and Runs blocks
2009-08-08 09:31:07 -07:00
ragaskar
0d6c6c2a35
Re-refactored Queue to use straightforward callbacks
2009-08-08 09:31:06 -07:00
ragaskar
9475de28b3
Queue/Spec refactor
2009-08-08 09:30:59 -07:00
ragaskar
b6a41c85e1
Killing .idea -- already in the .gitignore, but not ignored!
2009-08-08 09:30:53 -07:00
ragaskar
f73fd8ae95
Refactor Spec block execution into Queue
2009-08-01 14:56:29 -07:00
ragaskar
d5489a3e0d
Start of before/after refactor. Yank defineGetter on nestedResults. rake build task now sorts sources to minimize jasmine.js changes post-build
2009-08-01 10:43:03 -07:00
ragaskar
60f513cbff
minor Spec refactor
2009-07-30 22:31:57 -07:00
ragaskar
f84c67b98a
Merge in Pivotal changes
2009-07-29 22:41:38 -07:00
ragaskar
a1a278ee69
Major refactoring of Spec. Moved QueuedFunction to Block, WaitsBlock and WaitsForBlock. Waits and WaitsFor blocks now sequentially stackable
2009-07-29 22:27:11 -07:00