projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
15529: Prevent local login when LoginCluster is set
[arvados.git]
/
services
/
api
/
test
/
helpers
/
git_test_helper.rb
diff --git
a/services/api/test/helpers/git_test_helper.rb
b/services/api/test/helpers/git_test_helper.rb
index 03189bdfeae50c808a48069338824772513ae541..59debc57605c397435c48c49b70255a5359f873f 100644
(file)
--- a/
services/api/test/helpers/git_test_helper.rb
+++ b/
services/api/test/helpers/git_test_helper.rb
@@
-30,7
+30,7
@@
module GitTestHelper
end
base.teardown do
end
base.teardown do
- FileUtils.remove_entry Commit.cache_dir_base, true
+ FileUtils.remove_entry Commit
sHelper
.cache_dir_base, true
FileUtils.mkdir_p @tmpdir
system("tar", "-xC", @tmpdir.to_s, "-f", "test/test.git.tar")
end
FileUtils.mkdir_p @tmpdir
system("tar", "-xC", @tmpdir.to_s, "-f", "test/test.git.tar")
end
@@
-48,10
+48,10
@@
module GitTestHelper
if fakeurl.is_a? Symbol
fakeurl = 'file://' + repositories(fakeurl).server_path
end
if fakeurl.is_a? Symbol
fakeurl = 'file://' + repositories(fakeurl).server_path
end
- Commit.expects(:fetch_remote_repository).once.with do |gitdir, giturl|
+ Commit
sHelper
.expects(:fetch_remote_repository).once.with do |gitdir, giturl|
if giturl == url
if giturl == url
- Commit.unstub(:fetch_remote_repository)
- Commit.fetch_remote_repository gitdir, fakeurl
+ Commit
sHelper
.unstub(:fetch_remote_repository)
+ Commit
sHelper
.fetch_remote_repository gitdir, fakeurl
true
end
end
true
end
end