summaryrefslogtreecommitdiffstats
path: root/test/unit/lib
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2012-02-10 22:56:54 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2012-02-10 22:56:54 +0000
commitd90cdb1b1073c38c498caf79d6cac39e19c16992 (patch)
tree6e1e036d47ea5802237defa14f43ae793e1b3f38 /test/unit/lib
parentc5c8cd43c03f28add2ee3dce549f704cd19a224e (diff)
downloadredmine-d90cdb1b1073c38c498caf79d6cac39e19c16992.tar.gz
redmine-d90cdb1b1073c38c498caf79d6cac39e19c16992.zip
scm: git: raise exception if "git log" is error and block is given in lib revision method (#8857)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8837 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'test/unit/lib')
-rw-r--r--test/unit/lib/redmine/scm/adapters/git_adapter_test.rb30
1 files changed, 19 insertions, 11 deletions
diff --git a/test/unit/lib/redmine/scm/adapters/git_adapter_test.rb b/test/unit/lib/redmine/scm/adapters/git_adapter_test.rb
index 51c2718c2..990070fbc 100644
--- a/test/unit/lib/redmine/scm/adapters/git_adapter_test.rb
+++ b/test/unit/lib/redmine/scm/adapters/git_adapter_test.rb
@@ -191,14 +191,16 @@ begin
end
def test_revisions_invalid_rev
- revs1 = []
- @adapter.revisions('',
+ assert_equal [], @adapter.revisions('', '1234abcd', "master")
+ assert_raise Redmine::Scm::Adapters::CommandFailed do
+ revs1 = []
+ @adapter.revisions('',
'1234abcd',
"master",
{:reverse => true}) do |rev|
- revs1 << rev
+ revs1 << rev
+ end
end
- assert_equal [], revs1
end
def test_revisions_includes_master_two_revs
@@ -277,14 +279,20 @@ begin
end
def test_revisions_invalid_rev_excludes
- revs1 = []
- @adapter.revisions('', nil, nil,
- {:reverse => true,
- :includes => ['83ca5fd546063a3c7dc2e568ba3355661a9e2b2c'],
- :excludes => ['0123abcd4567']}) do |rev|
- revs1 << rev
+ assert_equal [],
+ @adapter.revisions('', nil, nil,
+ {:reverse => true,
+ :includes => ['83ca5fd546063a3c7dc2e568ba3355661a9e2b2c'],
+ :excludes => ['0123abcd4567']})
+ assert_raise Redmine::Scm::Adapters::CommandFailed do
+ revs1 = []
+ @adapter.revisions('', nil, nil,
+ {:reverse => true,
+ :includes => ['83ca5fd546063a3c7dc2e568ba3355661a9e2b2c'],
+ :excludes => ['0123abcd4567']}) do |rev|
+ revs1 << rev
+ end
end
- assert_equal [], revs1
end
def test_getting_revisions_with_spaces_in_filename