Commit graph

889 commits

Author SHA1 Message Date
Jake Luer
c00707b59e Merge branch 'feature/karma' 2013-09-17 23:19:29 -04:00
Jake Luer
d7100b63b1 docs: add sauce badge to readme [ci skip] 2013-09-17 23:19:19 -04:00
Jake Luer
8a2e00b486 test: [sauce] use karma@canary to prevent timeouts 2013-09-17 23:12:16 -04:00
Jake Luer
cd5b24e13b travis: use karma to start connect 2013-09-17 22:31:45 -04:00
Jake Luer
c044833171 tests: [sauce] error in setup 2013-09-17 22:19:42 -04:00
Jake Luer
e541116036 tests: add sauce support to karma 2013-09-17 22:13:12 -04:00
Jake Luer
678c63e9c2 travis: only run on node 0.10 2013-09-17 17:24:11 -04:00
Jake Luer
a8f94bdcbb test: [karma] use karma phantomjs runner
- tests refactored as bdd instead of tdd
- removed test/browser bootstraps
- add karma-runner
2013-09-17 17:22:36 -04:00
Jake Luer
a2efcc3d58 Merge pull request #181 from tricknotes/fix-highlight
Fix highlight for example code
2013-06-29 07:35:39 -07:00
Ryunosuke SATO
68e71ab2a8 Fix highlight for example code
This fix is the same as #179.
2013-06-29 23:30:53 +09:00
Jake Luer
db4b9d7833 Release 1.7.2 2013-06-27 14:15:43 -04:00
Jake Luer
609beb7ecd coverage: add coveralls badge 2013-06-27 13:51:03 -04:00
Jake Luer
7084d60a5a test: [coveralls] add coveralls api integration. testing travis-ci integration 2013-06-27 13:40:19 -04:00
Jake Luer
4e032652db Merge branch 'master' of github.com:chaijs/chai
* 'master' of github.com:chaijs/chai:
  Modify method title to include argument name
  Fix to highlight code example
2013-06-27 13:07:54 -04:00
Jake Luer
7c7f4600f6 Merge branch 'feature/bower'
* feature/bower:
  bower: granular ignores
2013-06-27 13:07:37 -04:00
Jake Luer
550c61e358 Merge pull request #180 from tricknotes/modify-method-title
Modify method title to include argument name
2013-06-27 09:59:44 -07:00
Jake Luer
c3c5a013a7 Merge pull request #179 from tricknotes/highlight-code-example
Fix to highlight code example
2013-06-27 09:59:26 -07:00
Ryunosuke SATO
4b10292274 Modify method title to include argument name 2013-06-27 18:56:24 +09:00
Ryunosuke SATO
ab91b501a5 Fix to highlight code example
The indent count for code example sould be 4 not 3.
2013-06-27 18:54:19 +09:00
Jake Luer
77f3ab5cc8 bower: granular ignores 2013-06-25 12:33:01 -04:00
Jake Luer
a334c7d18e Release 1.7.1 2013-06-24 14:51:23 -04:00
Jake Luer
7097b53665 Release 1.7.1 2013-06-24 14:48:18 -04:00
Jake Luer
12467a6bfd Release 1.7.1 2013-06-24 14:46:03 -04:00
Jake Luer
d2895596be Merge branch 'feature/bower'. #175
* feature/bower:
  bower: add json file
2013-06-24 14:35:13 -04:00
Jake Luer
de00106ffa bower: add json file 2013-06-24 14:30:43 -04:00
Jake Luer
082b6654c0 build: browser 2013-06-17 20:58:39 -04:00
Jake Luer
c0f8e187a7 Release 1.7.0 2013-06-17 16:06:38 -04:00
Jake Luer
167d1a7193 error: remove internal assertion error constructor 2013-06-17 15:28:47 -04:00
Jake Luer
7bc580910e core: [assertion-error] replace internal assertion error with dep 2013-06-17 15:27:50 -04:00
Jake Luer
9e8b050e02 deps: add chaijs/assertion-error@1.0.0 2013-06-17 15:16:55 -04:00
Jake Luer
cfb6137054 docs: fix typo in source file. #174 2013-06-17 15:11:30 -04:00
Jake Luer
933192c7c9 Merge pull request #174 from piecioshka/master
Fixed typo
2013-06-16 13:28:08 -07:00
piecioshka
8e75569590 typo 2013-06-16 16:01:17 +02:00
Jake Luer
a60885a7c5 Merge branch 'master' of github.com:chaijs/chai
* 'master' of github.com:chaijs/chai:
  Fix `utils.inspect` with custom object-returning inspect()s.
  replaced tabs with 2 spaces
  added assert.notOk()
  Fix comparison objects.
2013-06-14 15:52:28 -04:00
Jake Luer
9b18703acb pkg: lock mocha/mocha-phantomjs versions (for now) 2013-06-14 15:51:29 -04:00
Jake Luer
b95038b994 Merge pull request #173 from chaijs/inspect-fix
Fix `utils.inspect` with custom object-returning inspect()s.
2013-06-14 11:16:34 -07:00
Domenic Denicola
7c72e673f4 Fix utils.inspect with custom object-returning inspect()s.
This code is lifted from the latest node utils.js: 896b2aa707/lib/util.js (L205-L209)

Without it, if an object contains another object whose custom `inspect()` method returns a non-string, `utils.inspect` gets confused and tries to do `nonString.indexOf`.

This fixes domenic/chai-as-promised#32, where Chai as Promised was trying to call `utils.inspect` on an `AssertionError` which contained as its "actual" property a Q promise. Since Q promises have custom `inspect` methods that return objects, not strings, this was triggered.
2013-06-13 23:12:58 -04:00
Jake Luer
bfa6493bf6 Merge pull request #171 from Bartvds/master
Added assert.notOk()
2013-06-09 13:26:02 -07:00
Bartvds
774a723bff replaced tabs with 2 spaces 2013-06-09 01:31:26 +02:00
Bartvds
080702ac87 added assert.notOk() 2013-06-08 18:16:44 +02:00
Jake Luer
8236814f8f Merge pull request #169 from katsgeorgeek/topics/master
Fix comparison objects.
2013-06-07 12:52:35 -07:00
George Kats
044dcff68d Fix comparison objects.
Regexp and Date objects can to be deep equal to objects with the same type.
2013-06-06 00:53:34 +03:00
Jake Luer
ad35240462 Release 1.6.1 2013-06-05 16:46:37 -04:00
Jake Luer
a1662280c6 Merge pull request #168 from katsgeorgeek/topics/master
Fix comparison equality of two regexps.
2013-06-05 13:31:38 -07:00
George Kats
2c4da4a91a Add test for different RegExp flags. 2013-06-05 23:26:42 +03:00
George Kats
f62eb19a66 Add test for regexp comparison. 2013-06-05 02:14:53 +03:00
George Kats
8328924edf Downgrade mocha version for fix running Phantom tests. 2013-06-05 00:59:22 +03:00
George Kats
9c9ea88766 Fix comparison equality of two regexps. 2013-06-05 00:41:26 +03:00
Jake Luer
710efef40f Merge pull request #161 from brandonpayton/master
Fix documented name for assert interface's isDefined method
2013-05-03 14:46:16 -07:00
Brandon Payton
21f0ee5b21 Fix documented name for assert interface's isDefined method 2013-05-03 12:25:36 -07:00