admin/jasmine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,266 Commits 1 Branch 0 Tags
234dc1a047f90587f773a7215409e124f080e4e0
Commit Graph

484 Commits

Author SHA1 Message Date
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
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
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
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
b54de4a180 Merge branch 'spidermonkey-compat' of https://github.com/ptomato/jasmine into ptomato-spidermonkey-compat 2015-01-26 11:47:09 -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
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
3a93f845d6 Use the stack trace from the Error object if supplied 
Fixes #734
 2015-01-12 11:51:45 -08:00
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
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
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
8bb2f67fb3 Properly record finishing an xdescribe so further cleanup works 
Fix #724
 2014-12-09 12:40:00 -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
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
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
590a9d9d41 bump version to 2.1.0 2014-11-14 07:54:19 -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
Charles Hansen
663fbd0cdb toContain works with array-like objects (Arguments, HTMLCollections, etc) 
Fix #699
 2014-10-30 13:08:16 -07:00
slackersoft
916dc03d9c build distribution with deprecated console 
[#80410002]
 2014-10-11 14:28:51 -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
8880729250 JsApiReporter suiteResults only includes suite results 
- It was including suite starts also

[#79533268]
 2014-10-08 22:33:36 -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
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
a58fd20d82 Build distribution for suite failed status changes 2014-09-26 18:35:06 -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
slackersoft
15f3d0e9d7 update doc comment for boot.js to match current documentation 2014-09-23 08:22:05 -07:00