From 516fa645e6deef0c7f8cf27fc11eb9f8c20f81c0 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Sun, 31 Jan 2021 09:09:05 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- spec/controllers/groups/group_links_controller_spec.rb | 4 ++++ spec/controllers/groups/group_members_controller_spec.rb | 4 ++++ spec/controllers/projects/group_links_controller_spec.rb | 4 ++++ spec/controllers/projects/project_members_controller_spec.rb | 4 ++++ 4 files changed, 16 insertions(+) diff --git a/spec/controllers/groups/group_links_controller_spec.rb b/spec/controllers/groups/group_links_controller_spec.rb index c411d9cfb63..a2f7161ca41 100644 --- a/spec/controllers/groups/group_links_controller_spec.rb +++ b/spec/controllers/groups/group_links_controller_spec.rb @@ -9,6 +9,10 @@ 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 sign_in(user) diff --git a/spec/controllers/groups/group_members_controller_spec.rb b/spec/controllers/groups/group_members_controller_spec.rb index 435c04c7667..ff7a7f55863 100644 --- a/spec/controllers/groups/group_members_controller_spec.rb +++ b/spec/controllers/groups/group_members_controller_spec.rb @@ -9,6 +9,10 @@ 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 } + end + describe 'GET index' do it 'renders index with 200 status code' do get :index, params: { group_id: group } diff --git a/spec/controllers/projects/group_links_controller_spec.rb b/spec/controllers/projects/group_links_controller_spec.rb index 3baadde46dc..084a807e162 100644 --- a/spec/controllers/projects/group_links_controller_spec.rb +++ b/spec/controllers/projects/group_links_controller_spec.rb @@ -8,6 +8,10 @@ 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 project.add_maintainer(user) sign_in(user) diff --git a/spec/controllers/projects/project_members_controller_spec.rb b/spec/controllers/projects/project_members_controller_spec.rb index 12240ad4be0..53a7c2ca069 100644 --- a/spec/controllers/projects/project_members_controller_spec.rb +++ b/spec/controllers/projects/project_members_controller_spec.rb @@ -7,6 +7,10 @@ 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 } + end + describe 'GET index' do it 'has the project_members address with a 200 status code' do get :index, params: { namespace_id: project.namespace, project_id: project }