diff options
author | Micaël Bergeron <mbergeron@gitlab.com> | 2018-03-22 13:00:58 -0400 |
---|---|---|
committer | Micaël Bergeron <mbergeron@gitlab.com> | 2018-03-22 13:00:58 -0400 |
commit | 3b69e41018e48af6aa11512f3809e7d1fa43e7e4 (patch) | |
tree | b255668c405862f5290ee555019372d91db483b0 | |
parent | 9a334b29e022ab8fed868e3b2d8a57b258589930 (diff) | |
download | gitlab-ce-3b69e41018e48af6aa11512f3809e7d1fa43e7e4.tar.gz |
remove EE-only code
-rw-r--r-- | app/models/upload.rb | 2 | ||||
-rw-r--r-- | ee/spec/requests/api/jobs_spec.rb | 72 |
2 files changed, 0 insertions, 74 deletions
diff --git a/app/models/upload.rb b/app/models/upload.rb index e94a81c8770..cf71a7b76fc 100644 --- a/app/models/upload.rb +++ b/app/models/upload.rb @@ -1,6 +1,4 @@ class Upload < ActiveRecord::Base - prepend EE::Upload - # Upper limit for foreground checksum processing CHECKSUM_THRESHOLD = 100.megabytes diff --git a/ee/spec/requests/api/jobs_spec.rb b/ee/spec/requests/api/jobs_spec.rb deleted file mode 100644 index 9f8b502867d..00000000000 --- a/ee/spec/requests/api/jobs_spec.rb +++ /dev/null @@ -1,72 +0,0 @@ -require 'spec_helper' - -describe API::Jobs do - set(:project) do - create(:project, :repository, public_builds: false) - end - - set(:pipeline) do - create(:ci_empty_pipeline, project: project, - sha: project.commit.id, - ref: project.default_branch) - end - - let!(:job) { create(:ci_build, :success, pipeline: pipeline) } - - let(:user) { create(:user) } - let(:api_user) { user } - let(:reporter) { create(:project_member, :reporter, project: project).user } - let(:cross_project_pipeline_enabled) { true } - - before do - stub_licensed_features(cross_project_pipelines: cross_project_pipeline_enabled) - project.add_developer(user) - end - - describe 'GET /projects/:id/jobs/:job_id/artifacts' do - shared_examples 'downloads artifact' do - let(:download_headers) do - { 'Content-Transfer-Encoding' => 'binary', - 'Content-Disposition' => 'attachment; filename=ci_build_artifacts.zip' } - end - - it 'returns specific job artifacts' do - expect(response).to have_gitlab_http_status(200) - expect(response.headers).to include(download_headers) - expect(response.body).to match_file(job.artifacts_file.file.file) - end - end - - context 'authorized by job_token' do - let(:job) { create(:ci_build, :artifacts, pipeline: pipeline, user: api_user) } - - before do - get api("/projects/#{project.id}/jobs/#{job.id}/artifacts"), job_token: job.token - end - - context 'user is developer' do - let(:api_user) { user } - - it_behaves_like 'downloads artifact' - end - - context 'when anonymous user is accessing private artifacts' do - let(:api_user) { nil } - - it 'hides artifacts and rejects request' do - expect(project).to be_private - expect(response).to have_gitlab_http_status(404) - end - end - - context 'feature is disabled for EES' do - let(:api_user) { user } - let(:cross_project_pipeline_enabled) { false } - - it 'disallows access to the artifacts' do - expect(response).to have_gitlab_http_status(404) - end - end - end - end -end |