Merge branch 'master' into 14946-ruby-2.5

[arvados.git] / 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 6a8a5b44a2dc9e05a3903c2a2492c4477ebbf71e..c5d72c3bfea7ef21cc93a5a8d88db4f564008601 100644 (file)
--- a/services/api/test/unit/commit_test.rb
+++ b/services/api/test/unit/commit_test.rb
@@ -78,7 +78,7 @@ class CommitTest < ActiveSupport::TestCase
 
   test 'tag_in_internal_repository creates and updates tags in internal.git' do
     authorize_with :active
-    gitint = "git --git-dir #{Rails.configuration.git_internal_dir}"
+    gitint = "git --git-dir #{Rails.configuration.Containers.JobsAPI.GitInternalDir}"
     IO.read("|#{gitint} tag -d testtag 2>/dev/null") # "no such tag", fine
     assert_match(/^fatal: /, IO.read("|#{gitint} show testtag 2>&1"))
     refute $?.success?
@@ -88,7 +88,7 @@ class CommitTest < ActiveSupport::TestCase
   end
 
   def with_foo_repository
-    Dir.chdir("#{Rails.configuration.git_repositories_dir}/#{repositories(:foo).uuid}") do
+    Dir.chdir("#{Rails.configuration.Git.Repositories}/#{repositories(:foo).uuid}") do
       must_pipe("git checkout master 2>&1")
       yield
     end
@@ -101,13 +101,13 @@ class CommitTest < ActiveSupport::TestCase
       must_pipe("git checkout -b branch-#{rand(10**10)} 2>&1")
       must_pipe("echo -n #{tag.shellescape} >bar")
       must_pipe("git add bar")
-      must_pipe("git commit -m -")
+      must_pipe("git -c user.email=x@x -c user.name=X commit -m -")
       sha1 = must_pipe("git log -n1 --format=%H").strip
       must_pipe("git rm bar")
-      must_pipe("git commit -m -")
+      must_pipe("git -c user.email=x@x -c user.name=X commit -m -")
     end
     Commit.tag_in_internal_repository 'active/foo', sha1, tag
-    gitint = "git --git-dir #{Rails.configuration.git_internal_dir.shellescape}"
+    gitint = "git --git-dir #{Rails.configuration.Containers.JobsAPI.GitInternalDir.shellescape}"
     assert_match(/^commit /, IO.read("|#{gitint} show #{tag.shellescape}"))
     assert $?.success?
   end
@@ -118,12 +118,12 @@ class CommitTest < ActiveSupport::TestCase
     with_foo_repository do
       must_pipe("echo -n #{tag.shellescape} >bar")
       must_pipe("git add bar")
-      must_pipe("git commit -m -")
+      must_pipe("git -c user.email=x@x -c user.name=X commit -m -")
       sha1 = must_pipe("git log -n1 --format=%H").strip
       must_pipe("git reset --hard HEAD^")
     end
     Commit.tag_in_internal_repository 'active/foo', sha1, tag
-    gitint = "git --git-dir #{Rails.configuration.git_internal_dir.shellescape}"
+    gitint = "git --git-dir #{Rails.configuration.Containers.JobsAPI.GitInternalDir.shellescape}"
     assert_match(/^commit /, IO.read("|#{gitint} show #{tag.shellescape}"))
     assert $?.success?
   end