Commit Graph

252 Commits

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