diff options
author | Ash McKenzie <amckenzie@gitlab.com> | 2019-08-29 17:56:52 +1000 |
---|---|---|
committer | Ash McKenzie <amckenzie@gitlab.com> | 2019-08-30 12:26:18 +1000 |
commit | 19ff9d9899a9f1a69ca4cd9df357c7a9716edcbb (patch) | |
tree | 6a0618c5c08462cddff78b566ff97648ea30750a /spec/uploaders | |
parent | 42484f55c1f3a09f4b01b2b432afd7b314456480 (diff) | |
download | gitlab-ce-19ff9d9899a9f1a69ca4cd9df357c7a9716edcbb.tar.gz |
Replace rails_helper.rb with spec_helper.rb66741-remove-spec-rails_helper-rb
rails_helper.rb's only logic was to require
spec_helper.rb.
Diffstat (limited to 'spec/uploaders')
-rw-r--r-- | spec/uploaders/gitlab_uploader_spec.rb | 2 | ||||
-rw-r--r-- | spec/uploaders/object_storage_spec.rb | 2 | ||||
-rw-r--r-- | spec/uploaders/records_uploads_spec.rb | 2 | ||||
-rw-r--r-- | spec/uploaders/uploader_helper_spec.rb | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/spec/uploaders/gitlab_uploader_spec.rb b/spec/uploaders/gitlab_uploader_spec.rb index 44718ed1212..3bee4875348 100644 --- a/spec/uploaders/gitlab_uploader_spec.rb +++ b/spec/uploaders/gitlab_uploader_spec.rb @@ -1,4 +1,4 @@ -require 'rails_helper' +require 'spec_helper' require 'carrierwave/storage/fog' describe GitlabUploader do diff --git a/spec/uploaders/object_storage_spec.rb b/spec/uploaders/object_storage_spec.rb index 6bad5d49b1c..0cf486c7087 100644 --- a/spec/uploaders/object_storage_spec.rb +++ b/spec/uploaders/object_storage_spec.rb @@ -1,4 +1,4 @@ -require 'rails_helper' +require 'spec_helper' require 'carrierwave/storage/fog' class Implementation < GitlabUploader diff --git a/spec/uploaders/records_uploads_spec.rb b/spec/uploaders/records_uploads_spec.rb index 6134137d2b7..046ad3406d9 100644 --- a/spec/uploaders/records_uploads_spec.rb +++ b/spec/uploaders/records_uploads_spec.rb @@ -1,4 +1,4 @@ -require 'rails_helper' +require 'spec_helper' describe RecordsUploads do let!(:uploader) do diff --git a/spec/uploaders/uploader_helper_spec.rb b/spec/uploaders/uploader_helper_spec.rb index fd6712d4645..7c9ec8ff59c 100644 --- a/spec/uploaders/uploader_helper_spec.rb +++ b/spec/uploaders/uploader_helper_spec.rb @@ -1,4 +1,4 @@ -require 'rails_helper' +require 'spec_helper' describe UploaderHelper do let(:uploader) do |