couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dav...@apache.org
Subject [13/50] meck commit: updated refs/heads/master to dde7590
Date Thu, 31 Jul 2014 21:31:07 GMT
Merge branch 'develop'

Conflicts:
	README.md


Project: http://git-wip-us.apache.org/repos/asf/couchdb-meck/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-meck/commit/f6ee2945
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-meck/tree/f6ee2945
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-meck/diff/f6ee2945

Branch: refs/heads/master
Commit: f6ee2945173f10b16685e67f785f421129a9aaaf
Parents: 161e240 52ec973
Author: Adam Lindberg <hello@alind.io>
Authored: Sat Aug 17 13:32:24 2013 +0200
Committer: Adam Lindberg <hello@alind.io>
Committed: Sat Aug 17 13:32:24 2013 +0200

----------------------------------------------------------------------
 .gitignore                             |    3 +
 .travis.yml                            |   10 +-
 CHANGELOG                              |    3 +-
 Makefile                               |   63 +-
 dialyzer.ignore-warnings               |    5 +
 rebar                                  |  Bin 0 -> 135567 bytes
 rebar.config                           |    5 +-
 src/meck.erl                           | 1150 ++++++++++++---------------
 src/meck_abstract.hrl                  |   19 -
 src/meck_args_matcher.erl              |  126 +++
 src/meck_code.erl                      |  118 +++
 src/meck_code_gen.erl                  |  198 +++++
 src/meck_cover.erl                     |   22 +-
 src/meck_expect.erl                    |  139 ++++
 src/meck_history.erl                   |  131 +++
 src/meck_matcher.erl                   |   83 ++
 src/meck_mod.erl                       |  118 ---
 src/meck_proc.erl                      |  641 +++++++++++++++
 src/meck_ret_spec.erl                  |  140 ++++
 src/meck_util.erl                      |   44 +
 test.config                            |   15 +
 test/meck_args_matcher_tests.erl       |   59 ++
 test/meck_expect_tests.erl             |  107 +++
 test/meck_history_tests.erl            |   83 ++
 test/meck_matcher_tests.erl            |   48 ++
 test/meck_performance_test.erl         |   12 +-
 test/meck_ret_spec_tests.erl           |   68 ++
 test/meck_test_module.erl              |    1 +
 test/meck_test_parametrized_module.erl |    7 -
 test/meck_tests.erl                    |  648 +++++++++++++--
 30 files changed, 3176 insertions(+), 890 deletions(-)
----------------------------------------------------------------------



Mime
View raw message