admin/jasmine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,160 Commits 1 Branch 0 Tags
6ab70923b365f41a29b2b7cfe5ffceda678466ff
Commit Graph

174 Commits

Author SHA1 Message Date
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
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
4889583d5c Merge branch 'trackReturnValues' of https://github.com/pimterry/jasmine into pimterry-trackReturnValues 2014-09-22 13:04:01 -07:00
slackersoft
c82c958e0d Build distribution for earlier fixes 2014-09-16 13:05:11 -07: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
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
9402d59859 Suites report errors in afterAlls in the suiteDone event 
- remove `afterAllEvent` from reporters
 2014-09-03 22:18:20 -07:00
slackersoft
dd75394ea8 Merge branch 'issue655' of https://github.com/tgirardi/jasmine into tgirardi-issue655 2014-09-02 13:19:31 -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
5b397ff33e Revert "Deprecate suite/spec ordering hook ." 
This reverts commit 76fafa0388.

[#73742528]
 2014-08-28 11:54:27 -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
3c051fc291 bump to 2.0.3 to fix npm dependencies 2014-08-22 22:50:46 -07:00
slackersoft
89232db2ee Version bump to 2.0.2 2014-08-22 22:20:38 -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
753f4b44b4 Merge branch 'suite-start' of https://github.com/javenwang/jasmine into javenwang-suite-start 2014-08-06 13:24:01 -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
Davis W. Frank
227698f5fa Updating source and standalone distribution to 2.0.1 2014-07-21 12:36:24 -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
Sheel Choksi
00c8e37257 Pass through custom equality testers in toHaveBeenCalledWith [fixes #536] 2014-03-26 22:19:03 -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
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
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
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
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
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
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
98c258a659 Bump built distribution [#503][finishes #66350898] 2014-02-24 15:47:34 -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
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
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
slackersoft
15aa3ecb5d Better support in pretty printer when an object has null prototype 
- Fixes #500
 2014-01-17 19:56:43 -10: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
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
Christopher Jobst and Sheel Choksi
a2a8b5dde2 Create a 2.0 distribution 2013-12-16 12:33:34 -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