[DRE-commits] [ruby-shoulda-context] 03/08: Merge tag 'upstream/1.2.0'

[Cédric Boutillier]

This is an automated email from the git hooks/post-receive script.

boutil pushed a commit to branch master
in repository ruby-shoulda-context.

commit 26825fdf7168114a1874eb5125a0517942a4f103
Merge: 3b98673 e68e84d
Author: Cédric Boutillier <boutil at debian.org>
Date:   Tue Apr 1 09:59:29 2014 +0200

    Merge tag 'upstream/1.2.0'
    
    Upstream version 1.2.0
    
    # gpg: Signature faite le mar. 01 avril 2014 09:59:24 CEST avec la clef RSA d'identifiant 8F9F8F09
    # gpg: Bonne signature de « Cédric Boutillier <boutil at debian.org> »
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at upmc.fr> »
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at polytechnique.org> »
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at gmail.com> »

 .ruby-version                                      |   1 +
 Appraisals                                         |  41 ++++--
 checksums.yaml.gz                                  | Bin 427 -> 268 bytes
 gemfiles/4.0.gemfile.lock                          | 107 --------------
 gemfiles/{3.0.gemfile => minitest_4_x.gemfile}     |   2 +-
 gemfiles/minitest_4_x.gemfile.lock                 |  96 +++++++++++++
 gemfiles/{3.0.gemfile => minitest_5_x.gemfile}     |   2 +-
 gemfiles/minitest_5_x.gemfile.lock                 | 102 ++++++++++++++
 gemfiles/{3.0.gemfile => rails_3_0.gemfile}        |   3 +-
 .../{3.0.gemfile.lock => rails_3_0.gemfile.lock}   |  70 +++++-----
 gemfiles/{3.1.gemfile => rails_3_1.gemfile}        |   3 +-
 .../{3.1.gemfile.lock => rails_3_1.gemfile.lock}   |  84 +++++------
 gemfiles/{3.2.gemfile => rails_3_2.gemfile}        |   3 +-
 .../{3.2.gemfile.lock => rails_3_2.gemfile.lock}   |  91 ++++++------
 gemfiles/{4.0.gemfile => rails_4_0.gemfile}        |   5 +-
 gemfiles/rails_4_0.gemfile.lock                    | 107 ++++++++++++++
 gemfiles/{3.1.gemfile => rails_4_1.gemfile}        |   3 +-
 gemfiles/rails_4_1.gemfile.lock                    | 119 ++++++++++++++++
 gemfiles/{3.0.gemfile => test_unit.gemfile}        |   2 +-
 gemfiles/test_unit.gemfile.lock                    |  95 +++++++++++++
 lib/shoulda/context.rb                             |  22 +--
 lib/shoulda/context/assertions.rb                  |  16 ++-
 lib/shoulda/context/context.rb                     |  52 +++++--
 lib/shoulda/context/test_framework_detection.rb    |  34 +++++
 lib/shoulda/context/version.rb                     |   2 +-
 metadata.yml                                       |  74 +++++-----
 test/shoulda/should_test.rb                        |  12 +-
 test/shoulda/test_framework_detection_test.rb      | 154 +++++++++++++++++++++
 test/test_helper.rb                                |  13 +-
 29 files changed, 1003 insertions(+), 312 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-shoulda-context.git