Commit 6f0b6588 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch '3377-use-artifacts-tests-from-ee-ee' into 'master'

EE: Unify CE and EE tests in spec/controllers/projects/artifacts_controller_spec.rb

See merge request gitlab-org/gitlab-ee!3883
parents e053ad75 2d2ac339
...@@ -150,6 +150,7 @@ describe Projects::ArtifactsController do ...@@ -150,6 +150,7 @@ describe Projects::ArtifactsController do
end end
end end
## EE specific begins
context 'when using remote file storage' do context 'when using remote file storage' do
before do before do
stub_artifacts_object_storage stub_artifacts_object_storage
...@@ -162,6 +163,7 @@ describe Projects::ArtifactsController do ...@@ -162,6 +163,7 @@ describe Projects::ArtifactsController do
let(:archive_path) { 'https://' } let(:archive_path) { 'https://' }
end end
end end
## EE specific ends
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment