kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Remove TriggerSchedulePresenter. This will go in another MR.

Browse source
This commit is contained in:
Shinya Maeda 2017-04-05 01:29:10 +09:00
parent f229290ac8
commit 1dbc888e33
3 changed files with 0 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/models/ci/trigger_schedule.rb
View file

@ -2,7 +2,6 @@ module Ci
class TriggerSchedule < ActiveRecord::Base
extend Ci::Model
include Importable
include Presentable
acts_as_paranoid

11
app/presenters/ci/trigger_schedule_presenter.rb
View file

@ -1,11 +0,0 @@
module Ci
class TriggerSchedulePresenter < Gitlab::View::Presenter::Delegated
presents :trigger_schedule
def real_next_run(worker_cron: Settings.cron_jobs['trigger_schedule_worker']['cron'],
worker_time_zone: Time.zone.name)
Gitlab::Ci::CronParser.new(worker_cron, worker_time_zone)
.next_time_from(next_run_at)
end
end
end

64
spec/presenters/ci/trigger_schedule_presenter_spec.rb
View file

@ -1,64 +0,0 @@
require 'spec_helper'
describe Ci::TriggerSchedulePresenter do
let(:trigger_schedule) { create(:ci_trigger_schedule) }
subject(:presenter) do
described_class.new(trigger_schedule)
end
it 'inherits from Gitlab::View::Presenter::Delegated' do
expect(described_class.superclass).to eq(Gitlab::View::Presenter::Delegated)
end
describe '#initialize' do
it 'takes a trigger_schedule and optional params' do
expect { presenter }.not_to raise_error
end
it 'exposes trigger_schedule' do
expect(presenter.trigger_schedule).to eq(trigger_schedule)
end
it 'forwards missing methods to trigger_schedule' do
expect(presenter.ref).to eq('master')
end
end
describe '#real_next_run' do
let(:trigger_schedule) { create(:ci_trigger_schedule, cron: user_cron, cron_time_zone: 'UTC') }
subject { described_class.new(trigger_schedule).real_next_run(arguments) }
context 'when next_run_at > worker_next_time' do
let(:arguments) { { worker_cron: '0 0 1 1 *', worker_time_zone: 'UTC' } } # every 00:00, January 1st
let(:user_cron) { '1 0 1 1 *' } # every 00:01, January 1st
it 'returns nearest worker_next_time from next_run_at' do
is_expected.to eq(Gitlab::Ci::CronParser.new(arguments[:worker_cron], arguments[:worker_time_zone])
.next_time_from(trigger_schedule.next_run_at))
end
end
context 'when worker_next_time > next_run_at' do
let(:arguments) { { worker_cron: '1 0 1 1 *', worker_time_zone: 'UTC' } } # every 00:01, January 1st
let(:user_cron) { '0 0 1 1 *' } # every 00:00, January 1st
it 'returns nearest worker_next_time from next_run_at' do
is_expected.to eq(Gitlab::Ci::CronParser.new(arguments[:worker_cron], arguments[:worker_time_zone])
.next_time_from(trigger_schedule.next_run_at))
end
end
context 'when worker_cron and worker_time_zone are ommited' do
let(:arguments) { {} }
let(:user_cron) { '* * * * *' } # every minutes
it 'returns nearest worker_next_time from next_run_at by server configuration' do
is_expected.to eq(Gitlab::Ci::CronParser.new(Settings.cron_jobs['trigger_schedule_worker']['cron'],
Time.zone.name)
.next_time_from(trigger_schedule.next_run_at))
end
end
end
end