Commit Graph

  • 5e71f3031e Update broken travis.yml Greg Cobb and JR Boyens 2013-07-19 15:04:40 -07:00
  • 4ea4ed25ee Revert previous change Greg Cobb and JR Boyens 2013-07-19 14:29:35 -07:00
  • 39d40a1cad Come on Travis... build it Greg Cobb and JR Boyens 2013-07-19 14:14:24 -07:00
  • d40e0cebac Use Sauce Labs to test Jasmine against a metric ton of browsers Greg Cobb and JR Boyens 2013-07-19 11:29:12 -07:00
  • 89a54ea2bb Hacking the Gibson Greg Cobb and JR Boyens 2013-07-18 17:29:33 -07:00
  • bc9c857f43 Valid YAML again Greg Cobb and JR Boyens 2013-07-18 17:12:39 -07:00
  • 24a7f55fa6 DEBIAN env variable is defined on the OS X host as well Greg Cobb and JR Boyens 2013-07-18 17:11:10 -07:00
  • 182cff4bd4 Build matrix tweak Greg Cobb and JR Boyens 2013-07-18 17:05:05 -07:00
  • 5dce5b1272 Try multi-language OS X build Greg Cobb and JR Boyens 2013-07-18 16:57:01 -07:00
  • 7c17b06856 Make chromedriver executable Greg Cobb and JR Boyens 2013-07-18 16:42:48 -07:00
  • 6569176cc9 Run specs on multiple browsers Greg Cobb and JR Boyens 2013-07-18 16:32:33 -07:00
  • 0f803430e4 Testing out travis changes Greg Cobb and JR Boyens 2013-07-18 15:30:04 -07:00
  • 821f13dff5 Don't refer to window for the sake of Node specs Greg Cobb and JR Boyens 2013-07-18 13:59:25 -07:00
  • 3e2d9baec2 [Finishes #40853563] Allowed the DelayedFunctionScheduler to support strings that are eval'd Greg Cobb and JR Boyens 2013-07-18 13:57:51 -07:00
  • f637c1f833 Add images dir Greg Cobb and JR Boyens 2013-07-18 10:07:47 -07:00
  • 82b6904093 [Finishes #52810607] separate out the build standalone tasks Greg Cobb and JR Boyens 2013-07-18 09:51:27 -07:00
  • 0daae4d7b4 Update examples for 2.0 Greg Cobb and JR Boyens 2013-07-16 10:00:16 -07:00
  • f68657f14e Have Jasmine HTML use the source files in specs Sheel Choksi 2013-06-16 22:10:31 -07:00
  • c91df21a96 Detailed error messages in toThrow/toThrowError Sheel Choksi 2013-07-12 23:21:10 -07:00
  • 5b986c953c Remove symlinked boot.js from spec/support Sheel Choksi 2013-07-10 23:32:22 -07:00
  • a932320d6c Merge pull request #401 from sheelc/async_queue_runner Sheel Choksi 2013-07-10 21:00:24 -07:00
  • aabf8cec82 Specs/Suites wait for an async spec to finish Sheel Choksi 2013-07-08 23:00:42 -07:00
  • ccdcb293f4 Add back in forgotten 'env' to Env integration specs Sheel Choksi 2013-07-07 21:01:53 -07:00
  • ec7d58fce0 QueueRunner continues running functions in async case Sheel Choksi 2013-07-07 21:00:07 -07:00
  • 7f6b16ccf2 Only clear stack when QueueRunner is done with its functions Davis W. Frank and Sheel Choksi 2013-07-03 15:20:45 -07:00
  • 34b8bf5fb0 Remove Env's calculation of executionTime [#45659879] Sheel Choksi 2013-07-03 14:12:19 -07:00
  • 179e54b9fb Refactor suite timing out of Env and into each Reporter [finishes #45659879] Davis W. Frank and Sheel Choksi 2013-07-03 09:29:52 -07:00
  • 09fe7b0540 Have QueueRunner run specs iteratively if possible, fallback to recursion for async specs Davis W. Frank and Sheel Choksi 2013-07-02 16:05:26 -07:00
  • 264b1fea50 Merge the node performance suite into the node suite Davis W. Frank and Sheel Choksi 2013-07-02 14:03:42 -07:00
  • dcf7a0867e Test asynchronous parts of Jasmine asynchronously Davis W. Frank and Sheel Choksi 2013-07-02 12:09:48 -07:00
  • f5bc9faf63 Rename for stack-clearing post spec run to be more clear; use the real setTimeout when clearing stack Davis W. Frank and Sheel Choksi 2013-07-02 09:51:41 -07:00
  • 2916a8a1ff Cleaning up explicit dependencies Davis W. Frank and Sheel Choksi 2013-07-01 15:55:43 -07:00
  • 8ac33ff6c2 Removed unnecessary parameter from suiteFactory() call. Valera Rozuvan 2013-07-01 14:02:25 +03:00
  • 661a884416 Merge pull request #392 from albertandrejev/jasmine.Any Davis W. Frank 2013-06-21 10:07:35 -07:00
  • 7acc6b327a ObjectContaining wrong filed value error message Albert Andrejev 2013-06-21 15:16:41 +03:00
  • e40e0c9170 jasmine.any Boolean support Albert Andrejev 2013-06-21 15:07:55 +03:00
  • 7ae3fa9fef Fixed some specs that were not referring to the correct instance of Jasmine Davis W. Frank 2013-06-10 22:45:04 -07:00
  • e73b9e7902 Merge pull request #384 from sheelc/apireporter_execution_time Davis W. Frank 2013-06-09 20:52:10 -07:00
  • ffdf1eb16d Add execution time elapsed to JsApiReporter Sheel Choksi 2013-06-09 12:05:03 -07:00
  • d5f1264416 Merge pull request #383 from sheelc/remove_format_exception Davis W. Frank 2013-06-09 10:13:11 -07:00
  • 579fddc2d2 Remove unused formatException from util Sheel Choksi 2013-06-08 21:46:16 -07:00
  • 313e607135 Merge pull request #369 from sheelc/query-selectors Davis W. Frank 2013-06-07 07:38:11 -07:00
  • b6599d52aa Merge pull request #358 from sheelc/safari_exception_fix Davis W. Frank 2013-06-07 07:37:39 -07:00
  • 582ad6512a Merge pull request #379 from sheelc/toThrowError_fixup pivotalprivate 2013-06-05 09:54:12 -07:00
  • 600be098af Fix up my refactoring mistake in toThrowError Sheel Choksi 2013-06-04 00:25:12 -07:00
  • b87eb240b3 Merge pull request #378 from sheelc/toThrowError_modifications Davis W. Frank 2013-06-03 21:24:38 -07:00
  • 7055d95584 Avoid instantiating passed in errorType in toThrowError Sheel Choksi 2013-06-03 21:05:13 -07:00
  • 1c87060804 Fix spec to throw error, ensuring a stack property Sheel Choksi 2013-04-28 22:24:54 -07:00
  • b4acdbd90a Remove use of getElementsByTagName and getElementsByClassName Sheel Choksi 2013-05-20 23:11:35 -07:00
  • fbb9f53524 Fixing red build. Not sure why, but this spec was green in Chrome and Node.js Davis W. Frank 2013-06-03 10:31:52 -07:00
  • 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 Davis W. Frank 2013-06-03 09:24:43 -07:00
  • 9e31201f1a Breaking out Spies into their own source file Davis W. Frank 2013-06-03 08:22:45 -07:00
  • d53002c63a Matchers & Matchers specs now broken up into individual files. There is now a requireMatchers jasmineRequire function to attach matchers properly. Davis W. Frank 2013-06-02 22:22:25 -07:00
  • 3271dc8838 Last commit did not include self-test with Any and ObjectContaining in separate files. Fixed. Davis W. Frank 2013-06-02 22:16:30 -07:00
  • 475aacbfbb [Finishes #50607273] - added specs to cover the cases from GitHub issue #371 Davis W. Frank 2013-05-29 20:16:12 -07:00
  • 8303c79f26 Adding spec to cover equality of frozen objects, per GitHub issue #266 Davis W. Frank 2013-05-29 12:32:01 -07:00
  • 5700ace2c9 Squashed matchers refactor - matchers now unit-testable apart from Expectation and Spec. Davis W. Frank 2013-05-28 16:54:01 -07:00
  • 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. Davis W. Frank 2013-05-28 14:09:20 -07:00
  • 7516bba2b0 Updating gem source to secure version Davis W. Frank 2013-05-21 11:47:47 -07:00
  • 4f19d34ad7 Merge pull request #363 from robinboehm/remove-deprecated-matcherspp Davis W. Frank 2013-05-12 11:35:02 -07:00
  • c40b64a24c Remove deprecated jasmine.Matchers.pp function. Marked deprecated at may 2010. Robin Böhm 2013-05-12 09:37:07 +02:00
  • baad5ff01f Merge pull request #356 from sheelc/spec_titles Davis W. Frank 2013-04-28 23:11:40 -07:00
  • bf2adf55eb Add titles to specs in HtmlReporter Sheel Choksi 2013-04-28 21:27:51 -07:00
  • dd8d3f9788 Fix [#48420035] Davis W. Frank 2013-04-20 08:27:38 -07:00
  • 9c4467bac0 Merge pull request #347 from sheelc/regex-exception-matching Rajan Agaskar 2013-04-08 18:16:09 -07:00
  • c017257164 add in regex matching for toThrow matcher Sheel Choksi 2013-04-07 01:27:20 -07:00
  • 2445fb36dc simplify failure message logic in the toThrow matcher Sheel Choksi 2013-04-06 22:06:14 -07:00
  • eec6d7d23e update lib/jasmine-core/jasmine.js to make 'grunt execSpecsinNode' pass again Sheel Choksi 2013-04-06 22:03:31 -07:00
  • 3110da62e5 Update Contribute.markdown Davis W. Frank 2013-04-01 11:35:22 -07:00
  • d41b281eb1 Update Contribute.markdown pivotalprivate 2013-04-01 11:32:57 -07:00
  • 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 Davis W. Frank 2013-03-26 23:11:24 -07:00
  • 3be247ceb1 Merge branch 'master' of https://github.com/pivotal/jasmine Davis W. Frank 2013-03-24 09:42:14 -07:00
  • edc2bfae93 All Jasmine file manipulation/development moved from Thor to Grunt. Thor has been removed completely. Run grunt --help to see available tasks. Davis W. Frank 2013-03-24 09:41:42 -07:00
  • 01b2fc612c Merge pull request #340 from CaioToOn/fix-clock-settimeout Davis W. Frank 2013-03-13 15:47:09 -07:00
  • d8f6aac2cd Added spec for #tick default delay Caio Cunha 2013-03-13 11:00:30 -03:00
  • e7a930a5b3 DelayedFunctionScheduler tick, setTimeout/Interval delay defaults to 0 Caio Cunha 2013-03-13 10:55:46 -03:00
  • 6b2d8da55f Cleanup Gruntfile so that all tasks are registered at the top level Dan Hansen and Davis W. Frank 2013-03-04 16:43:21 -08:00
  • 538b32e401 Default character encoding is now UTF-8 Dan Hansen and Davis W. Frank 2013-03-04 16:24:21 -08:00
  • e6e8908f49 Merge pull request #332 from bjornblomqvist/preserve-whitespace-in-result-message Davis W. Frank 2013-03-03 22:27:55 -08:00
  • 86dafd5d2d Merge pull request #329 from sunliwen/master Davis W. Frank 2013-03-03 21:14:14 -08:00
  • aa60d5f00d Update util.js Davis W. Frank 2013-03-03 21:11:30 -08:00
  • 079e6e1e08 Merge pull request #333 from bjornblomqvist/utf8-fix Davis W. Frank 2013-03-03 21:03:42 -08:00
  • 7706512525 Delegate to originalJasmine for the version string in test Dan Hansen and Davis W. Frank 2013-03-03 16:19:56 -08:00
  • 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 Dan Hansen and Davis W. Frank 2013-03-01 16:13:45 -08:00
  • 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. Dan Hansen and Davis W. Frank 2013-03-01 14:32:58 -08:00
  • 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 Dan Hansen and Davis W. Frank 2013-03-01 14:24:30 -08:00
  • 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 Dan Hansen and Davis W. Frank 2013-03-01 10:43:09 -08:00
  • 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 Dan Hansen and Davis W. Frank 2013-02-28 12:04:29 -08:00
  • d6da13a8dd Attempt at normalizing error stacks across browsers. Failed expectations now have a stack property, remove trace.stack Dan Hansen and Davis W. Frank 2013-02-27 16:37:31 -08:00
  • dc4563d45c Require jasmine gem in the rakefile Dan Hansen and Davis W. Frank 2013-02-27 10:30:03 -08:00
  • 92492c0144 Env#addMatchers is no longer exposed on spec, it is exposed globally in boot.js. Dan Hansen and Davis W. Frank 2013-02-26 16:41:46 -08:00
  • d6987a6c84 Cleanup Dan Hansen and Davis W. Frank 2013-02-26 13:39:06 -08:00
  • 43c8fdd33f Update travis yml to use the new build script Dan Hansen and Davis W. Frank 2013-02-26 12:50:50 -08:00
  • 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 * Dan Hansen and Davis W. Frank 2013-02-26 12:24:59 -08:00
  • 2c06e36b9b Fix for default state of exceptionCatching from HTML ui Dan Hansen and Davis W. Frank 2013-02-26 12:21:02 -08:00
  • 5a744884fe fix so that utf-8 characters are rendered correctly in the browser Darwin 2013-02-26 15:58:01 +01:00
  • e6888b840d Fixes #296, Whitespace failures will now be esier to understand. Darwin 2013-02-26 12:41:19 +01:00
  • e682d18387 When filtering spec, match against the full name of the spec Dan Hansen 2013-02-22 14:36:46 -08:00
  • 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; Dan Hansen and Davis W. Frank 2013-02-19 15:29:50 -08:00
  • c53b36a9b2 Fix Build: Firefox doesn't hoist function definitions in for loops Dan Hansen and Davis W. Frank 2013-02-19 15:26:08 -08:00