X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/03d89302f14a4a1c448b32d62679bab14e23fa23..c507b0b072ad62c0087d059aedeaae8bae9b715f:/services/api/test/unit/commit_test.rb diff --git a/services/api/test/unit/commit_test.rb b/services/api/test/unit/commit_test.rb index b57c23b453..a8594169fb 100644 --- a/services/api/test/unit/commit_test.rb +++ b/services/api/test/unit/commit_test.rb @@ -18,7 +18,7 @@ class CommitTest < ActiveSupport::TestCase test 'find_commit_range does not bypass permissions' do authorize_with :inactive assert_raises ArgumentError do - c = Commit.find_commit_range 'foo', nil, 'master', [] + Commit.find_commit_range 'foo', nil, 'master', [] end end @@ -68,10 +68,10 @@ class CommitTest < ActiveSupport::TestCase authorize_with :active gitint = "git --git-dir #{Rails.configuration.git_internal_dir}" IO.read("|#{gitint} tag -d testtag 2>/dev/null") # "no such tag", fine - assert_match /^fatal: /, IO.read("|#{gitint} show testtag 2>&1") + assert_match(/^fatal: /, IO.read("|#{gitint} show testtag 2>&1")) refute $?.success? Commit.tag_in_internal_repository 'active/foo', '31ce37fe365b3dc204300a3e4c396ad333ed0556', 'testtag' - assert_match /^commit 31ce37f/, IO.read("|#{gitint} show testtag") + assert_match(/^commit 31ce37f/, IO.read("|#{gitint} show testtag")) assert $?.success? end @@ -183,34 +183,34 @@ class CommitTest < ActiveSupport::TestCase Dir.mktmpdir do |touchdir| # invalid input to maximum a = Commit.find_commit_range('active/foo', nil, "31ce37fe365b3dc204300a3e4c396ad333ed0556 ; touch #{touchdir}/uh_oh", nil) - assert !File.exists?("#{touchdir}/uh_oh"), "#{touchdir}/uh_oh should not exist, 'maximum' parameter of find_commit_range is exploitable" + assert !File.exist?("#{touchdir}/uh_oh"), "#{touchdir}/uh_oh should not exist, 'maximum' parameter of find_commit_range is exploitable" assert_equal [], a # invalid input to maximum a = Commit.find_commit_range('active/foo', nil, "$(uname>#{touchdir}/uh_oh)", nil) - assert !File.exists?("#{touchdir}/uh_oh"), "#{touchdir}/uh_oh should not exist, 'maximum' parameter of find_commit_range is exploitable" + assert !File.exist?("#{touchdir}/uh_oh"), "#{touchdir}/uh_oh should not exist, 'maximum' parameter of find_commit_range is exploitable" assert_equal [], a # invalid input to minimum a = Commit.find_commit_range('active/foo', "31ce37fe365b3dc204300a3e4c396ad333ed0556 ; touch #{touchdir}/uh_oh", "31ce37fe365b3dc204300a3e4c396ad333ed0556", nil) - assert !File.exists?("#{touchdir}/uh_oh"), "#{touchdir}/uh_oh should not exist, 'minimum' parameter of find_commit_range is exploitable" + assert !File.exist?("#{touchdir}/uh_oh"), "#{touchdir}/uh_oh should not exist, 'minimum' parameter of find_commit_range is exploitable" assert_equal [], a # invalid input to minimum a = Commit.find_commit_range('active/foo', "$(uname>#{touchdir}/uh_oh)", "31ce37fe365b3dc204300a3e4c396ad333ed0556", nil) - assert !File.exists?("#{touchdir}/uh_oh"), "#{touchdir}/uh_oh should not exist, 'minimum' parameter of find_commit_range is exploitable" + assert !File.exist?("#{touchdir}/uh_oh"), "#{touchdir}/uh_oh should not exist, 'minimum' parameter of find_commit_range is exploitable" assert_equal [], a # invalid input to 'excludes' # complains "fatal: bad object 077ba2ad3ea24a929091a9e6ce545c93199b8e57" a = Commit.find_commit_range('active/foo', "31ce37fe365b3dc204300a3e4c396ad333ed0556", "077ba2ad3ea24a929091a9e6ce545c93199b8e57", ["4fe459abe02d9b365932b8f5dc419439ab4e2577 ; touch #{touchdir}/uh_oh"]) - assert !File.exists?("#{touchdir}/uh_oh"), "#{touchdir}/uh_oh should not exist, 'excludes' parameter of find_commit_range is exploitable" + assert !File.exist?("#{touchdir}/uh_oh"), "#{touchdir}/uh_oh should not exist, 'excludes' parameter of find_commit_range is exploitable" assert_equal [], a # invalid input to 'excludes' # complains "fatal: bad object 077ba2ad3ea24a929091a9e6ce545c93199b8e57" a = Commit.find_commit_range('active/foo', "31ce37fe365b3dc204300a3e4c396ad333ed0556", "077ba2ad3ea24a929091a9e6ce545c93199b8e57", ["$(uname>#{touchdir}/uh_oh)"]) - assert !File.exists?("#{touchdir}/uh_oh"), "#{touchdir}/uh_oh should not exist, 'excludes' parameter of find_commit_range is exploitable" + assert !File.exist?("#{touchdir}/uh_oh"), "#{touchdir}/uh_oh should not exist, 'excludes' parameter of find_commit_range is exploitable" assert_equal [], a end end