Merge branch 'rs-update-rspec' into 'master'

Update rspec to 3.7

See merge request gitlab-org/gitlab-ce!19449

5 files changed, 14 insertions, 14 deletions

diff --git a/spec/services/projects/fork_service_spec.rb b/spec/services/projects/fork_service_spec.rb
index a93f6f1ddc2..c15f5120b8a 100644
--- a/spec/services/projects/fork_service_spec.rb
+++ b/spec/services/projects/fork_service_spec.rb
@@ -8,7 +8,7 @@ describe Projects::ForkService do
       before do
         @from_user = create(:user)
         @from_namespace = @from_user.namespace
-        avatar = fixture_file_upload(Rails.root + "spec/fixtures/dk.png", "image/png")
+        avatar = fixture_file_upload("spec/fixtures/dk.png", "image/png")
         @from_project = create(:project,
                                :repository,
                                creator_id: @from_user.id,
diff --git a/spec/services/projects/gitlab_projects_import_service_spec.rb b/spec/services/projects/gitlab_projects_import_service_spec.rb
index ee1a886f5d6..0a898e9b89b 100644
--- a/spec/services/projects/gitlab_projects_import_service_spec.rb
+++ b/spec/services/projects/gitlab_projects_import_service_spec.rb
@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Projects::GitlabProjectsImportService do
   set(:namespace) { create(:namespace) }
   let(:path) { 'test-path' }
-  let(:file) { fixture_file_upload(Rails.root + 'spec/fixtures/doc_sample.txt', 'text/plain') }
+  let(:file) { fixture_file_upload('spec/fixtures/doc_sample.txt', 'text/plain') }
   let(:overwrite) { false }
   let(:import_params) { { namespace_id: namespace.id, path: path, file: file, overwrite: overwrite } }
   subject { described_class.new(namespace.owner, import_params) }
diff --git a/spec/services/projects/participants_service_spec.rb b/spec/services/projects/participants_service_spec.rb
index 0d18ceb8ff8..6040f9100f8 100644
--- a/spec/services/projects/participants_service_spec.rb
+++ b/spec/services/projects/participants_service_spec.rb
@@ -4,7 +4,7 @@ describe Projects::ParticipantsService do
   describe '#groups' do
     describe 'avatar_url' do
       let(:project) { create(:project, :public) }
-      let(:group) { create(:group, avatar: fixture_file_upload(Rails.root + 'spec/fixtures/dk.png')) }
+      let(:group) { create(:group, avatar: fixture_file_upload('spec/fixtures/dk.png')) }
       let(:user) { create(:user) }
       let!(:group_member) { create(:group_member, group: group, user: user) }
 
diff --git a/spec/services/projects/update_pages_service_spec.rb b/spec/services/projects/update_pages_service_spec.rb
index 347ac13828c..1bffeee6790 100644
--- a/spec/services/projects/update_pages_service_spec.rb
+++ b/spec/services/projects/update_pages_service_spec.rb
@@ -4,13 +4,13 @@ describe Projects::UpdatePagesService do
   set(:project) { create(:project, :repository) }
   set(:pipeline) { create(:ci_pipeline, project: project, sha: project.commit('HEAD').sha) }
   set(:build) { create(:ci_build, pipeline: pipeline, ref: 'HEAD') }
-  let(:invalid_file) { fixture_file_upload(Rails.root + 'spec/fixtures/dk.png') }
+  let(:invalid_file) { fixture_file_upload('spec/fixtures/dk.png') }
   let(:extension) { 'zip' }
 
-  let(:file) { fixture_file_upload(Rails.root + "spec/fixtures/pages.#{extension}") }
-  let(:empty_file) { fixture_file_upload(Rails.root + "spec/fixtures/pages_empty.#{extension}") }
+  let(:file) { fixture_file_upload("spec/fixtures/pages.#{extension}") }
+  let(:empty_file) { fixture_file_upload("spec/fixtures/pages_empty.#{extension}") }
   let(:metadata) do
-    filename = Rails.root + "spec/fixtures/pages.#{extension}.meta"
+    filename = "spec/fixtures/pages.#{extension}.meta"
     fixture_file_upload(filename) if File.exist?(filename)
   end
 
@@ -196,8 +196,8 @@ describe Projects::UpdatePagesService do
     let(:metadata) { spy('metadata') }
 
     before do
-      file = fixture_file_upload(Rails.root + 'spec/fixtures/pages.zip')
-      metafile = fixture_file_upload(Rails.root + 'spec/fixtures/pages.zip.meta')
+      file = fixture_file_upload('spec/fixtures/pages.zip')
+      metafile = fixture_file_upload('spec/fixtures/pages.zip.meta')
 
       build.update_attributes(legacy_artifacts_file: file)
       build.update_attributes(legacy_artifacts_metadata: metafile)
diff --git a/spec/services/upload_service_spec.rb b/spec/services/upload_service_spec.rb
index 24f3a5c5ff0..9b232a52efa 100644
--- a/spec/services/upload_service_spec.rb
+++ b/spec/services/upload_service_spec.rb
@@ -9,7 +9,7 @@ describe UploadService do
 
     context 'for valid gif file' do
       before do
-        gif = fixture_file_upload(Rails.root + 'spec/fixtures/banana_sample.gif', 'image/gif')
+        gif = fixture_file_upload('spec/fixtures/banana_sample.gif', 'image/gif')
         @link_to_file = upload_file(@project, gif)
       end
 
@@ -21,7 +21,7 @@ describe UploadService do
 
     context 'for valid png file' do
       before do
-        png = fixture_file_upload(Rails.root + 'spec/fixtures/dk.png',
+        png = fixture_file_upload('spec/fixtures/dk.png',
           'image/png')
         @link_to_file = upload_file(@project, png)
       end
@@ -34,7 +34,7 @@ describe UploadService do
 
     context 'for valid jpg file' do
       before do
-        jpg = fixture_file_upload(Rails.root + 'spec/fixtures/rails_sample.jpg', 'image/jpg')
+        jpg = fixture_file_upload('spec/fixtures/rails_sample.jpg', 'image/jpg')
         @link_to_file = upload_file(@project, jpg)
       end
 
@@ -46,7 +46,7 @@ describe UploadService do
 
     context 'for txt file' do
       before do
-        txt = fixture_file_upload(Rails.root + 'spec/fixtures/doc_sample.txt', 'text/plain')
+        txt = fixture_file_upload('spec/fixtures/doc_sample.txt', 'text/plain')
         @link_to_file = upload_file(@project, txt)
       end
 
@@ -58,7 +58,7 @@ describe UploadService do
 
     context 'for too large a file' do
       before do
-        txt = fixture_file_upload(Rails.root + 'spec/fixtures/doc_sample.txt', 'text/plain')
+        txt = fixture_file_upload('spec/fixtures/doc_sample.txt', 'text/plain')
         allow(txt).to receive(:size) { 1000.megabytes.to_i }
         @link_to_file = upload_file(@project, txt)
       end