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

Update rspec to 3.7

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

2 files changed, 5 insertions, 7 deletions

diff --git a/spec/helpers/emails_helper_spec.rb b/spec/helpers/emails_helper_spec.rb
index 2390c1f3e5d..139387e0b24 100644
--- a/spec/helpers/emails_helper_spec.rb
+++ b/spec/helpers/emails_helper_spec.rb
@@ -47,9 +47,7 @@ describe EmailsHelper do
   describe '#header_logo' do
     context 'there is a brand item with a logo' do
       it 'returns the brand header logo' do
-        appearance = create :appearance, header_logo: fixture_file_upload(
-          Rails.root.join('spec/fixtures/dk.png')
-        )
+        appearance = create :appearance, header_logo: fixture_file_upload('spec/fixtures/dk.png')
 
         expect(header_logo).to eq(
           %{<img style="height: 50px" src="/uploads/-/system/appearance/header_logo/#{appearance.id}/dk.png" alt="Dk" />}
diff --git a/spec/helpers/groups_helper_spec.rb b/spec/helpers/groups_helper_spec.rb
index b48c252acd3..6c94bd4e504 100644
--- a/spec/helpers/groups_helper_spec.rb
+++ b/spec/helpers/groups_helper_spec.rb
@@ -4,9 +4,9 @@ describe GroupsHelper do
   include ApplicationHelper
 
   describe 'group_icon' do
-    avatar_file_path = File.join(Rails.root, 'spec', 'fixtures', 'banana_sample.gif')
-
     it 'returns an url for the avatar' do
+      avatar_file_path = File.join('spec', 'fixtures', 'banana_sample.gif')
+
       group = create(:group)
       group.avatar = fixture_file_upload(avatar_file_path)
       group.save!
@@ -17,9 +17,9 @@ describe GroupsHelper do
   end
 
   describe 'group_icon_url' do
-    avatar_file_path = File.join(Rails.root, 'spec', 'fixtures', 'banana_sample.gif')
-
     it 'returns an url for the avatar' do
+      avatar_file_path = File.join('spec', 'fixtures', 'banana_sample.gif')
+
       group = create(:group)
       group.avatar = fixture_file_upload(avatar_file_path)
       group.save!