From: Yugui Date: 2011-01-27T23:29:31+09:00 Subject: [ruby-core:34903] Re: [Backport92-Backport#4200] minitest 2.0.2 on trunk Hi Ryan, I have merged bug fixes in MiniTest. It is harder than what I thought. * I did not import lib/minitest/benchmark.rb because it is a new feature. * I suspect the change in lib/minitest/mock.rb is to merge. I agree that the minitest/mock.rb before 5916 had had a wrong design. But 5916 changes minitest/mock's behavior anyway. * I merged a part of changes for test/minitest/test_mini_mock.rb. I did not merge the rest of the changes which depends on 5916. * I did not import lib/minitest/pride.rb because it seems a new feature. * I did not import lib/minitest/spec.rb because its change consits of: * minor feature change in Module#infect_with_assetions (sorting) * debug print? (Module#infect_with_assertions) * refactoring (relocation of calling #infect_with_assertions) * following a new feature (calling #infact_with_assertions for assert_silent) * feature change (Kernel#describe) * adding rdocs (Module#infect_with_assertions, MiniTest::Spec, ...) I do not merge any rdoc change into ruby_1_9_2 except fixing a terribly confusing description. * MiniTest::Unit * I did not merge 5783 because it only adds new features. * I did not merge 5785 because it only updated the version. I think we should not update the version because I never add new feature into ruby_1_9_2 so minitest in ruby_1_9_2 is not 1.7.0. * I did not merge 5835 because of the same reason. * I merged a part of 5875 because it is a bug. Once I decided not to merge shyouhei's fix because I regarded it as a limitation of minitest 1.6.0 that MiniTest::Skip broke the assersion. It was a wrong decision. * I did not merge 5877 because it just updated the version. * I did not merge 5884 because it changed behavior. * I did not merge 5886 because it is an enhancement and a refactoring. * I did not merge 5889 because it is a fix for a bug in 5886. * I did not merge 5905 because it seemed something related to 5886. * I did not merge 5906 because it updated the version. * I did not merge 5908 because it added a new feature. * I did not merge 5911 because it was a refactoring related to 5908. * I did not merge 5913 because it was a refactoring related to 5908. * I did not merge 5918 because it only affects Ruby 1.8 or eariler. By the way, I think the condition should be RUBY_VERSION >= "1.9". * I did not merge 5922 because it was a refactoring. * I did not merge 5923 because it contained only style changes. * I did not merge 5924 because it was a refactoring. * I did not merge 5926 because it was a refactoring + adding after_tests{ }. * I merged only a part of 5937 which fixed some messages. * I did not merge 5939 because it was a typo. * I did not merge 5944 because there is not README.txt for MiniTest in Ruby's repository. * I did not merge 5945 because it was a rdoc fix. * I did not merge 5948 because I did not merge the latter half of 5937. * I did not merge 5951 because it just updated the version. * I did not merge 6056 becuase it is a minor feature change and only affects on $DEBUG == true * I merged 5907 * I did not merge 6058 because I did not merge 5901. * I did not merge 6059 because I did not merge 5901. * I did not merge 6072 because it was a minor improvement, not a bug. * I did not merge 6079 because it just updated the version. * I did not merge 6093 becuase of the same reason. * I did not merge 6095 because it is for Ruby 1.9.3. -- Yuki Sonoda (Yugui) yugui@yugui.jp http://yugui.jp