Merge branch '32004-use-timecop-safe-mode' into 'master'
Enable Timecop safe mode Closes #32004 See merge request !13498
This commit is contained in:
commit
5896d1b1e6
|
@ -15,10 +15,12 @@ describe 'Issue Boards', js: true do
|
||||||
let!(:list) { create(:list, board: board, label: development, position: 0) }
|
let!(:list) { create(:list, board: board, label: development, position: 0) }
|
||||||
let(:card) { find('.board:nth-child(2)').first('.card') }
|
let(:card) { find('.board:nth-child(2)').first('.card') }
|
||||||
|
|
||||||
before do
|
around do |example|
|
||||||
Timecop.freeze
|
Timecop.freeze { example.run }
|
||||||
|
end
|
||||||
|
|
||||||
project.team << [user, :master]
|
before do
|
||||||
|
project.add_master(user)
|
||||||
|
|
||||||
sign_in(user)
|
sign_in(user)
|
||||||
|
|
||||||
|
@ -26,10 +28,6 @@ describe 'Issue Boards', js: true do
|
||||||
wait_for_requests
|
wait_for_requests
|
||||||
end
|
end
|
||||||
|
|
||||||
after do
|
|
||||||
Timecop.return
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'shows sidebar when clicking issue' do
|
it 'shows sidebar when clicking issue' do
|
||||||
click_card(card)
|
click_card(card)
|
||||||
|
|
||||||
|
|
|
@ -5,14 +5,12 @@ feature 'Group milestones', :js do
|
||||||
let!(:project) { create(:project_empty_repo, group: group) }
|
let!(:project) { create(:project_empty_repo, group: group) }
|
||||||
let(:user) { create(:group_member, :master, user: create(:user), group: group ).user }
|
let(:user) { create(:group_member, :master, user: create(:user), group: group ).user }
|
||||||
|
|
||||||
before do
|
around do |example|
|
||||||
Timecop.freeze
|
Timecop.freeze { example.run }
|
||||||
|
|
||||||
sign_in(user)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
after do
|
before do
|
||||||
Timecop.return
|
sign_in(user)
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'create a milestone' do
|
context 'create a milestone' do
|
||||||
|
|
|
@ -175,11 +175,7 @@ describe Gitlab::Git::Storage::CircuitBreaker, clean_gitlab_redis_shared_state:
|
||||||
|
|
||||||
describe '#track_storage_inaccessible' do
|
describe '#track_storage_inaccessible' do
|
||||||
around do |example|
|
around do |example|
|
||||||
Timecop.freeze
|
Timecop.freeze { example.run }
|
||||||
|
|
||||||
example.run
|
|
||||||
|
|
||||||
Timecop.return
|
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'records the failure time in redis' do
|
it 'records the failure time in redis' do
|
||||||
|
|
|
@ -4,10 +4,6 @@ describe Gitlab::Metrics::RequestsRackMiddleware do
|
||||||
let(:app) { double('app') }
|
let(:app) { double('app') }
|
||||||
subject { described_class.new(app) }
|
subject { described_class.new(app) }
|
||||||
|
|
||||||
around do |example|
|
|
||||||
Timecop.freeze { example.run }
|
|
||||||
end
|
|
||||||
|
|
||||||
describe '#call' do
|
describe '#call' do
|
||||||
let(:status) { 100 }
|
let(:status) { 100 }
|
||||||
let(:env) { { 'REQUEST_METHOD' => 'GET' } }
|
let(:env) { { 'REQUEST_METHOD' => 'GET' } }
|
||||||
|
@ -28,16 +24,14 @@ describe Gitlab::Metrics::RequestsRackMiddleware do
|
||||||
subject.call(env)
|
subject.call(env)
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'measures execution time' do
|
RSpec::Matchers.define :a_positive_execution_time do
|
||||||
execution_time = 10
|
match { |actual| actual > 0 }
|
||||||
allow(app).to receive(:call) do |*args|
|
|
||||||
Timecop.freeze(execution_time.seconds)
|
|
||||||
[200, nil, nil]
|
|
||||||
end
|
end
|
||||||
|
|
||||||
expect(described_class).to receive_message_chain(:http_request_duration_seconds, :observe).with({ status: 200, method: 'get' }, execution_time)
|
it 'measures execution time' do
|
||||||
|
expect(described_class).to receive_message_chain(:http_request_duration_seconds, :observe).with({ status: 200, method: 'get' }, a_positive_execution_time)
|
||||||
|
|
||||||
subject.call(env)
|
Timecop.scale(3600) { subject.call(env) }
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -57,18 +57,14 @@ describe Issue do
|
||||||
end
|
end
|
||||||
|
|
||||||
describe '#closed_at' do
|
describe '#closed_at' do
|
||||||
after do
|
|
||||||
Timecop.return
|
|
||||||
end
|
|
||||||
|
|
||||||
let!(:now) { Timecop.freeze(Time.now) }
|
|
||||||
|
|
||||||
it 'sets closed_at to Time.now when issue is closed' do
|
it 'sets closed_at to Time.now when issue is closed' do
|
||||||
issue = create(:issue, state: 'opened')
|
issue = create(:issue, state: 'opened')
|
||||||
|
|
||||||
|
expect(issue.closed_at).to be_nil
|
||||||
|
|
||||||
issue.close
|
issue.close
|
||||||
|
|
||||||
expect(issue.closed_at).to eq(now)
|
expect(issue.closed_at).to be_present
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -181,13 +181,12 @@ describe API::Internal do
|
||||||
|
|
||||||
describe "POST /internal/allowed", :clean_gitlab_redis_shared_state do
|
describe "POST /internal/allowed", :clean_gitlab_redis_shared_state do
|
||||||
context "access granted" do
|
context "access granted" do
|
||||||
before do
|
around do |example|
|
||||||
project.team << [user, :developer]
|
Timecop.freeze { example.run }
|
||||||
Timecop.freeze
|
|
||||||
end
|
end
|
||||||
|
|
||||||
after do
|
before do
|
||||||
Timecop.return
|
project.team << [user, :developer]
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'with env passed as a JSON' do
|
context 'with env passed as a JSON' do
|
||||||
|
|
|
@ -13,12 +13,8 @@ describe AnalyticsBuildEntity do
|
||||||
|
|
||||||
subject { entity.as_json }
|
subject { entity.as_json }
|
||||||
|
|
||||||
before do
|
around do |example|
|
||||||
Timecop.freeze
|
Timecop.freeze { example.run }
|
||||||
end
|
|
||||||
|
|
||||||
after do
|
|
||||||
Timecop.return
|
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'contains the URL' do
|
it 'contains the URL' do
|
||||||
|
|
|
@ -76,6 +76,7 @@ RSpec.configure do |config|
|
||||||
end
|
end
|
||||||
|
|
||||||
config.before(:suite) do
|
config.before(:suite) do
|
||||||
|
Timecop.safe_mode = true
|
||||||
TestEnv.init
|
TestEnv.init
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue