546 Commits

Author SHA1 Message Date
Mat Ryer
83d5662cdb added licence file (US spelling) 2015-12-07 16:22:53 -08:00
Ernesto Jiménez
d04dca765f Vendor dependencies and rewrite import paths 2015-12-02 20:32:31 +01:00
Ernesto Jiménez
a1f97990dd Merge pull request #247 from blakewilson-wf/false_assert_comments
True -> False in false assertion comments
2015-12-02 19:41:52 +01:00
Blake Wilson
0c260593d1 Edit comments for false assertions 2015-12-02 09:53:45 -06:00
Davide D'Agostino
d797d25e0f Merge pull request #245 from dencold/master
fixing comments for better GoDoc formatting
2015-11-21 18:54:01 -08:00
Dennis Coldwell
a3045216a7 found another formatting issue with NotEmpty func 2015-11-20 23:49:31 -08:00
Dennis Coldwell
c94cb5c230 small fix for example formatting on Empty func 2015-11-20 23:35:46 -08:00
Antonio Nicolás Pina
8879a0154e Unlock and relock not needed anymore. Addresses #167. 2015-11-20 13:39:52 +02:00
Antonio Nicolás Pina
384cc6617a Merge branch 'master' of https://github.com/stretchr/testify 2015-11-20 13:19:13 +02:00
Ernesto Jiménez
67106a5111 Sort map keys before diffing maps 2015-11-11 20:37:34 +01:00
Johnny Graettinger
ed275850b6 Add custom mock argument matching
Add an argumentMatcher type and MatchedBy() helper to the mock
package, enabling custom fine-grained argument matching behaviors.

This is particularly helpful when building mocks over complex argument
types where deep equality is cumbersome or can't be used. Ex, a matcher
might match over just the the URL of an argument *http.Request.
2015-11-09 18:11:46 -05:00
Ernesto Jiménez
e7a1d8890c Merge pull request #240 from agonzalezro/type
When implements shows the type of the given object is shown in the error
2015-11-07 23:40:24 +00:00
Álex González
635a01b704 Show type of the object instead just "Object" string
The `Implements` test was just showing a string instead the name of the
object that was not implementing the interface. Now the type of the
object is shown.
2015-11-08 00:18:55 +01:00
Ernesto Jiménez
82616deabd Merge pull request #239 from anacrolix/master
Avoid panic when calling EqualValues with nil
2015-11-07 12:43:16 +00:00
Matt Joiner
7d6ace9113 Handle case where one object is nil and the other is not 2015-11-07 19:02:25 +11:00
Ernesto Jiménez
a76410419d Merge pull request #232 from stretchr/issue-136
Fix #136 - Empty returns true for nil pointers
2015-11-07 04:46:19 +00:00
Ernesto Jiménez
7cb9aa9471 Save file once everything succeeds 2015-11-06 17:35:10 +00:00
Ernesto Jiménez
a22a0ef717 Merge pull request #233 from stretchr/issue-229
Show diff of values when Equal fails
2015-11-06 13:42:47 +00:00
Ernesto Jiménez
efd1b850c1 First version of code generation 2015-11-05 23:08:36 +00:00
Ernesto Jiménez
33c4c93911 Fixes #229 - show diffs for structs/maps/arrays/slices when Equal fails 2015-11-03 01:32:38 +00:00
Ernesto Jiménez
0d5a14c5a4 Fix #117: Update require.Contains docs 2015-11-02 02:08:28 +00:00
Ernesto Jiménez
c478a808a1 Fix #136 2015-11-02 01:41:59 +00:00
Ernesto Jiménez
8254b8f76b Fix #144 2015-11-02 01:24:09 +00:00
Ernesto Jiménez
ef3ce2dd13 Show struct fields in mock unexpected method error 2015-11-02 00:46:20 +00:00
Ernesto Jiménez
9d7bb92510 fix #201 - Remove broken link from README 2015-11-02 00:05:23 +00:00
Ernesto Jiménez
a74f1fecd2 Merge pull request #96 from ac7/quote_errors
Wrap NoError message with quote marks
2015-11-01 23:42:15 +00:00
Ernesto Jiménez
40b02b9eef Merge pull request #165 from tuvistavie/master
Support map keys for Contains/NotContains assertion.
2015-11-01 21:02:28 +00:00
Ernesto Jiménez
9a4de4d135 Merge pull request #211 from jaguilar/patch-1
Remove unnecessary branches.
2015-11-01 20:49:18 +00:00
Ernesto Jiménez
a0534acc7b Merge pull request #217 from juliancooper/assert-equivalent-json
Added assertion/requirement that checks if two JSON strings represent equivalent objects
2015-11-01 20:45:50 +00:00
Ernesto Jiménez
8efb9af708 Merge pull request #228 from stretchr/issue-149
Fixes issue #149: suite.Require() panics
2015-11-01 15:17:32 +00:00
Ernesto Jiménez
95644cab17 Fixes issue #149 2015-11-01 15:12:29 +00:00
Ernesto Jiménez
1467a551a0 Merge pull request #226 from spraveen1112/master
In README documentation of suite package #225
2015-11-01 12:11:48 +00:00
praveen shukla
6e25351910 modified the go.doc in suite package. 2015-10-20 10:51:47 +05:30
praveen shukla
be704a5c57 corrected the README documentation of suite package 2015-10-20 10:44:48 +05:30
Julian Cooper
2933ed99aa Deleted monolithic TestJSONEqWrapper from forward_requirements_test 2015-10-13 14:15:08 -07:00
Julian Cooper
2d0c0a478c JSONEq unmarshal's into an interface{} instead of attemping Map and Slice unmarshallings 2015-10-13 14:13:42 -07:00
Julian Cooper
7f6cb13c5c split JSONEq tests into individual assertions from one monolithic test 2015-10-13 13:36:47 -07:00
Ernesto Jiménez
f3960ab1f9 Merge pull request #223 from allgeek/master
fix race conditions related to mutation of expectedCall.Repeatability
2015-10-08 01:55:03 +01:00
Levi Corcoran
3c35d25e9b fix race conditions related to mutation of expectedCall.Repeatability 2015-10-07 16:34:11 -05:00
Ernesto Jiménez
2b15294402 Merge pull request #221 from brahmaroutu/gccgo_functionname_issue
Due to function name format differences, code fails with GCCGO
2015-09-29 19:35:40 +01:00
Srini Brahmaroutu
0df687d7a9 Due to function name format differences, code fails with GCCGO
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
2015-09-29 17:07:45 +00:00
Davide D'Agostino
a979bdb3ad Merge pull request #222 from ernesto-jimenez/update-travis
Add Go 1.4 and 1.5 to .travis.yml
2015-09-28 20:17:15 -07:00
Ernesto Jiménez
b1b3c1e4c0 Add Go 1.4 and 1.5 to .travis.yml 2015-09-29 01:58:17 +01:00
Ernesto Jiménez
bcd32dcc8b Merge pull request #220 from bmatsuo/fix-notnil-for-typed-nil-values
Fix NotNil assertion for typed nil values
2015-09-24 18:06:42 +01:00
Bryan Matsuo
ee60e76e54 Test Nil assertion behavior for typed nil values 2015-09-24 10:02:27 -07:00
Bryan Matsuo
fb64a0ab08 Fix NotNil assertion for typed nil values
The NotNil assertion had an error in its handling of typed nil values.
This change makes use of the helper function isNil (used by the Nil
assertion).  The helper function has correct handling of typed nil
values and when negated provides the expected semantics for
`assert.NotNil(t, x)`.

    if x == nil {
        assert.Fail(t, "is nil", x)
    }
2015-09-23 23:48:02 -07:00
Julian Cooper
930ea90dbd Added assertion/requirement that checks if two JSON strings represent equivalent objects 2015-09-23 10:34:52 -07:00
Ernesto Jiménez
b8dc1cecf1 Merge pull request #208 from tcsc/master
Allows mock call expectations to be defined in arbitrary order
2015-09-14 10:32:55 +01:00
James Aguilar
1cb1359759 Remove unnecessary branches.
reflect.DeepEqual already returns exactly what we want in both of these cases.
2015-08-28 18:56:01 -07:00
Ernesto Jiménez
7c2b1e5640 Merge pull request #210 from jcamenisch/master
Fix param order in ObjectsAreEqualValues after type conversion
2015-08-29 00:48:46 +01:00