Merge branch 'dstull-fix-around-travel-to' into 'master'

Fix tests being skipped due to around hook

See merge request gitlab-org/gitlab!59052

app/services/groups/group_links/create_service.rb

@@ -2,7 +2,7 @@
 
 module Groups
   module GroupLinks
-    class CreateService < BaseService
+    class CreateService < Groups::BaseService
       def execute(shared_group)
         unless group && shared_group &&
                can?(current_user, :admin_group_member, shared_group) &&

spec/controllers/groups/group_links_controller_spec.rb

@@ -9,16 +9,17 @@ RSpec.describe Groups::GroupLinksController do
   let(:group_member) { create(:user) }
   let!(:project) { create(:project, group: shared_group) }
 
-  around do |example|
-    travel_to DateTime.new(2019, 4, 1) { example.run }
-  end
-
   before do
+    travel_to DateTime.new(2019, 4, 1)
     sign_in(user)
 
     shared_with_group.add_developer(group_member)
   end
 
+  after do
+    travel_back
+  end
+
   shared_examples 'placeholder is passed as `id` parameter' do |action|
     it 'returns a 404' do
       post(

spec/controllers/groups/group_members_controller_spec.rb

@@ -9,8 +9,12 @@ RSpec.describe Groups::GroupMembersController do
   let(:group) { create(:group, :public) }
   let(:membership) { create(:group_member, group: group) }
 
-  around do |example|
-    travel_to DateTime.new(2019, 4, 1) { example.run }
+  before do
+    travel_to DateTime.new(2019, 4, 1)
+  end
+
+  after do
+    travel_back
   end
 
   describe 'GET index' do

spec/controllers/projects/group_links_controller_spec.rb

@@ -8,15 +8,16 @@ RSpec.describe Projects::GroupLinksController do
   let_it_be(:project) { create(:project, :private, group: group2) }
   let_it_be(:user) { create(:user) }
 
-  around do |example|
-    travel_to DateTime.new(2019, 4, 1) { example.run }
-  end
-
   before do
+    travel_to DateTime.new(2019, 4, 1)
     project.add_maintainer(user)
     sign_in(user)
   end
 
+  after do
+    travel_back
+  end
+
   describe '#create' do
     shared_context 'link project to group' do
       before do

spec/controllers/projects/project_members_controller_spec.rb

@@ -7,8 +7,12 @@ RSpec.describe Projects::ProjectMembersController do
   let(:group) { create(:group, :public) }
   let(:project) { create(:project, :public) }
 
-  around do |example|
-    travel_to DateTime.new(2019, 4, 1) { example.run }
+  before do
+    travel_to DateTime.new(2019, 4, 1)
+  end
+
+  after do
+    travel_back
   end
 
   describe 'GET index' do