提交 f5d3b921 编写于 作者: Z Zeger-Jan van de Weg 提交者: Kamil Trzcinski

Remove Ci::Build#artifacts_file?

上级 bf6126b1
...@@ -6,10 +6,6 @@ module ArtifactMigratable ...@@ -6,10 +6,6 @@ module ArtifactMigratable
job_archive&.file || legacy_artifacts_file job_archive&.file || legacy_artifacts_file
end end
def artifacts_file?
job_archive&.file? || legacy_artifacts_file?
end
def artifacts_metadata def artifacts_metadata
job_metadata&.file || legacy_artifacts_metadata job_metadata&.file || legacy_artifacts_metadata
end end
......
...@@ -58,7 +58,7 @@ module Gitlab ...@@ -58,7 +58,7 @@ module Gitlab
end end
def artifact_upload_ok def artifact_upload_ok
{ TempPath: LegacyArtifactUploader.artifacts_upload_path } { TempPath: JobArtifactUploader.artifacts_upload_path }
end end
def send_git_blob(repository, blob) def send_git_blob(repository, blob)
......
...@@ -39,7 +39,7 @@ describe Projects::UpdatePagesService do ...@@ -39,7 +39,7 @@ describe Projects::UpdatePagesService do
it "doesn't delete artifacts" do it "doesn't delete artifacts" do
expect(execute).to eq(:success) expect(execute).to eq(:success)
expect(build.reload.artifacts_file?).to eq(true) expect(build.reload.artifacts?).to eq(true)
end end
end end
...@@ -47,7 +47,7 @@ describe Projects::UpdatePagesService do ...@@ -47,7 +47,7 @@ describe Projects::UpdatePagesService do
it "does delete artifacts" do it "does delete artifacts" do
expect(execute).to eq(:success) expect(execute).to eq(:success)
expect(build.reload.artifacts_file?).to eq(false) expect(build.reload.artifacts?).to eq(false)
end end
end end
end end
...@@ -110,7 +110,7 @@ describe Projects::UpdatePagesService do ...@@ -110,7 +110,7 @@ describe Projects::UpdatePagesService do
it "doesn't delete artifacts" do it "doesn't delete artifacts" do
expect(execute).to eq(:success) expect(execute).to eq(:success)
expect(build.artifacts_file?).to eq(true) expect(build.artifacts?).to eq(true)
end end
end end
...@@ -118,7 +118,7 @@ describe Projects::UpdatePagesService do ...@@ -118,7 +118,7 @@ describe Projects::UpdatePagesService do
it "does delete artifacts" do it "does delete artifacts" do
expect(execute).to eq(:success) expect(execute).to eq(:success)
expect(build.reload.artifacts_file?).to eq(false) expect(build.reload.artifacts?).to eq(false)
end end
end end
end end
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册