772 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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	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
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	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