diff options
author | Micaël Bergeron <mbergeron@gitlab.com> | 2018-03-22 14:37:47 -0400 |
---|---|---|
committer | Micaël Bergeron <mbergeron@gitlab.com> | 2018-03-22 14:37:47 -0400 |
commit | b08a1cd2c406919491f8a91e51aa0034762df14e (patch) | |
tree | a86a9ffd254deab1374aaad82fb58dcdee997ab0 /spec | |
parent | 764b5fdd162d159bc6d8fb81adf71e32f5901de1 (diff) | |
download | gitlab-ce-b08a1cd2c406919491f8a91e51aa0034762df14e.tar.gz |
fix the failing specs
Diffstat (limited to 'spec')
-rw-r--r-- | spec/requests/api/jobs_spec.rb | 1 | ||||
-rw-r--r-- | spec/support/stub_object_storage.rb | 6 | ||||
-rw-r--r-- | spec/tasks/gitlab/artifacts/migrate_rake_spec.rb | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/spec/requests/api/jobs_spec.rb b/spec/requests/api/jobs_spec.rb index 81335e72350..aa9a9918b8c 100644 --- a/spec/requests/api/jobs_spec.rb +++ b/spec/requests/api/jobs_spec.rb @@ -21,7 +21,6 @@ describe API::Jobs do let(:guest) { create(:project_member, :guest, project: project).user } before do - stub_licensed_features(cross_project_pipelines: true) project.add_developer(user) end diff --git a/spec/support/stub_object_storage.rb b/spec/support/stub_object_storage.rb index 69c59fb0015..3780fbab37c 100644 --- a/spec/support/stub_object_storage.rb +++ b/spec/support/stub_object_storage.rb @@ -1,8 +1,12 @@ module StubConfiguration - def stub_object_storage_uploader(config:, uploader:, remote_directory:, enabled: true, background_upload: false) + def stub_object_storage_uploader(config:, uploader:, remote_directory:, + enabled: true, + proxy_download: false, + background_upload: false) Fog.mock! allow(config).to receive(:enabled) { enabled } + allow(config).to receive(:proxy_download) { proxy_download } allow(config).to receive(:background_upload) { background_upload } return unless enabled diff --git a/spec/tasks/gitlab/artifacts/migrate_rake_spec.rb b/spec/tasks/gitlab/artifacts/migrate_rake_spec.rb index 570c7fa7503..8544fb62b5a 100644 --- a/spec/tasks/gitlab/artifacts/migrate_rake_spec.rb +++ b/spec/tasks/gitlab/artifacts/migrate_rake_spec.rb @@ -2,7 +2,7 @@ require 'rake_helper' describe 'gitlab:artifacts namespace rake task' do before(:context) do - Rake.application.rake_require 'tasks/gitlab/artifacts' + Rake.application.rake_require 'tasks/gitlab/artifacts/migrate' end let(:object_storage_enabled) { false } |